device: update config for FriendlyELEC boards

Signed-off-by: hmz007 <hmz007@gmail.com>
Change-Id: Ib4724539dde93e5e1f6f1d64f956faa7109fcf77

device/friendlyelec/nanopi3/input/Vendor_1949_Product_0401.idc

@@ -0,0 +1,18 @@
+# Copyright (C) 2021 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Amazon Fire TV remote
+keyboard.layout = Vendor_1949_Product_0401
+keyboard.doNotWakeByDefault = 1
+audio.mic = 1

device/friendlyelec/nanopi3/input/Vendor_1949_Product_0410.idc

@@ -0,0 +1,18 @@
+# Copyright (C) 2021 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Amazon Fire TV remote
+keyboard.layout = Vendor_1949_Product_0401
+keyboard.doNotWakeByDefault = 1
+audio.mic = 1

device/friendlyelec/nanopi3/input/Vendor_2717_Product_32b8.idc

@@ -0,0 +1,24 @@
+# Copyright (C) 2021 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# Input Device Configuration file for Bluetooth Remote.
+#
+#
+
+# Basic Parameters
+keyboard.layout = Vendor_2717_Product_32b8
+keyboard.doNotWakeByDefault = 0
+# audio.mic = 1
+

device/friendlyelec/nanopi3/input/Vendor_2717_Product_32b8.kl

@@ -0,0 +1,43 @@
+# Copyright (C) 2021 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# Key Layout file for Bluetooth Remote.
+#
+
+key 103   DPAD_UP
+key 108   DPAD_DOWN
+key 105   DPAD_LEFT
+key 106   DPAD_RIGHT
+key 96    DPAD_CENTER
+
+key 102   HOME
+key 158   BACK
+key 127   MENU
+key 116   POWER
+
+key 168   MEDIA_REWIND
+key 208   MEDIA_FAST_FORWARD
+key 164   MEDIA_PLAY_PAUSE
+key 217   ASSIST
+
+key 113   VOLUME_MUTE
+key 114   VOLUME_DOWN
+key 115   VOLUME_UP
+
+# custom keys
+# key 28    ENTER
+# key 63    F5
+key usage 0x00070028    DPAD_CENTER
+key usage 0x0007003e    F12

device/friendlyelec/nanopi3/input/keyboards.mk

@@ -0,0 +1,20 @@
+# Copyright (C) 2021 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+BOARD_INPUTCFG_DIR := device/friendlyelec/nanopi3/input
+
+PRODUCT_COPY_FILES += \
+    $(call find-copy-subdir-files,*.kl,$(BOARD_INPUTCFG_DIR),system/usr/keylayout) \
+    $(call find-copy-subdir-files,*.idc,$(BOARD_INPUTCFG_DIR),system/usr/idc)
+

device/friendlyelec/nanopi3/media_profiles_default.xml

@@ -38,13 +38,13 @@
 
         <EncoderProfile quality="high" fileFormat="mp4" duration="30">
             <Video codec="h264"
-                   bitRate="9000000"
-                   width="1280"
-                   height="720"
+                   bitRate="72000000"
+                   width="3840"
+                   height="2160"
                    frameRate="30" />
             <Audio codec="aac"
                    bitRate="96000"
-                   sampleRate="44100"
+                   sampleRate="48000"
                    channels="1" />
         </EncoderProfile>
 
@@ -68,7 +68,7 @@
                    frameRate="30" />
             <Audio codec="aac"
                    bitRate="61000"
-                   sampleRate="44100"
+                   sampleRate="48000"
                    channels="1" />
         </EncoderProfile>
 
@@ -81,7 +81,7 @@
                    frameRate="30" />
             <Audio codec="aac"
                    bitRate="61000"
-                   sampleRate="44100"
+                   sampleRate="48000"
                    channels="1" />
         </EncoderProfile>
         -->
@@ -96,7 +96,7 @@
                    frameRate="30" />
             <Audio codec="aac"
                    bitRate="61000"
-                   sampleRate="44100"
+                   sampleRate="48000"
                    channels="1" />
         </EncoderProfile>
 
@@ -110,22 +110,7 @@
                    frameRate="30" />
             <Audio codec="aac"
                    bitRate="61000"
-                   sampleRate="44100"
-                   channels="1" />
-        </EncoderProfile>
-        -->
-
-        <!--  If your sensor driver don't support 480p stream, Please turn off this element -->
-        <!--
-        <EncoderProfile quality="480p" fileFormat="mp4" duration="30">
-            <Video codec="h264"
-                   bitRate="3000000"
-                   width="800"
-                   height="600"
-                   frameRate="30" />
-            <Audio codec="aac"
-                   bitRate="61000"
-                   sampleRate="44100"
+                   sampleRate="48000"
                    channels="1" />
         </EncoderProfile>
         -->
@@ -140,7 +125,7 @@
                    frameRate="30" />
             <Audio codec="aac"
                    bitRate="61000"
-                   sampleRate="44100"
+                   sampleRate="48000"
                    channels="1" />
         </EncoderProfile>
         -->
@@ -148,26 +133,39 @@
         <!--  If your sensor driver don't support 720p stream, Please turn off this element -->
         <EncoderProfile quality="720p" fileFormat="mp4" duration="30">
             <Video codec="h264"
-                   bitRate="9000000"
+                   bitRate="12000000"
                    width="1280"
                    height="720"
                    frameRate="30" />
             <Audio codec="aac"
                    bitRate="96000"
-                   sampleRate="44100"
+                   sampleRate="48000"
                    channels="1" />
         </EncoderProfile>
 
         <!--  If your sensor driver don't support 1080p stream, Please turn off this element -->
         <EncoderProfile quality="1080p" fileFormat="mp4" duration="30">
             <Video codec="h264"
-                   bitRate="22000000"
+                   bitRate="33000000"
                    width="1920"
                    height="1080"
+                   frameRate="60" />
+            <Audio codec="aac"
+                   bitRate="96000"
+                   sampleRate="48000"
+                   channels="1" />
+        </EncoderProfile>
+
+        <!--  If your sensor driver don't support 2160p stream, Please turn off this element -->
+        <EncoderProfile quality="2160p" fileFormat="mp4" duration="30">
+            <Video codec="h264"
+                   bitRate="72000000"
+                   width="3840"
+                   height="2160"
                    frameRate="30" />
             <Audio codec="aac"
                    bitRate="96000"
-                   sampleRate="44100"
+                   sampleRate="48000"
                    channels="1" />
         </EncoderProfile>
 
@@ -192,7 +190,7 @@
                    frameRate="30" />
             <Audio codec="aac"
                    bitRate="61000"
-                   sampleRate="44100"
+                   sampleRate="48000"
                    channels="1" />
         </EncoderProfile>
 
@@ -205,7 +203,7 @@
                    frameRate="30" />
             <Audio codec="aac"
                    bitRate="61000"
-                   sampleRate="44100"
+                   sampleRate="48000"
                    channels="1" />
         </EncoderProfile>
         -->
@@ -220,7 +218,7 @@
                    frameRate="30" />
             <Audio codec="aac"
                    bitRate="61000"
-                   sampleRate="44100"
+                   sampleRate="48000"
                    channels="1" />
         </EncoderProfile>
 
@@ -234,38 +232,7 @@
                    frameRate="30" />
             <Audio codec="aac"
                    bitRate="61000"
-                   sampleRate="44100"
-                   channels="1" />
-        </EncoderProfile>
-        -->
-
-        <!--  If your sensor driver don't support 480p stream, Please turn off this element  -->
-        <!--
-        <EncoderProfile quality="timelapse480p" fileFormat="mp4" duration="30">
-            <Video codec="h264"
-                   bitRate="3000000"
-                   width="800"
-                   height="600"
-                   frameRate="30" />
-            <Audio codec="aac"
-                   bitRate="61000"
-                   sampleRate="44100"
-                   channels="1" />
-        </EncoderProfile>
-        -->
-
-        <!--  If your sensor driver don't support 720p and 480p stream, Please fill this element according as
-              your sensor max resolution for preview(Not Capture resolution)  -->
-        <!--
-        <EncoderProfile quality="timelapse480p" fileFormat="mp4" duration="30">
-            <Video codec="h264"
-                   bitRate="3000000"
-                   width="800"
-                   height="600"
-                   frameRate="30" />
-            <Audio codec="aac"
-                   bitRate="61000"
-                   sampleRate="44100"
+                   sampleRate="48000"
                    channels="1" />
         </EncoderProfile>
         -->
@@ -281,7 +248,7 @@
                    frameRate="30" />
             <Audio codec="aac"
                    bitRate="61000"
-                   sampleRate="44100"
+                   sampleRate="48000"
                    channels="1" />
         </EncoderProfile>
         -->
@@ -295,20 +262,20 @@
                    frameRate="30" />
             <Audio codec="aac"
                    bitRate="96000"
-                   sampleRate="44100"
+                   sampleRate="48000"
                    channels="1" />
         </EncoderProfile>
 
         <!--  If your sensor driver don't support 1080p stream, Please turn off this element -->
         <EncoderProfile quality="timelapse1080p" fileFormat="mp4" duration="30">
             <Video codec="h264"
-                   bitRate="12000000"
+                   bitRate="17000000"
                    width="1920"
                    height="1080"
                    frameRate="30" />
             <Audio codec="aac"
                    bitRate="96000"
-                   sampleRate="44100"
+                   sampleRate="48000"
                    channels="1" />
         </EncoderProfile>
 
@@ -338,13 +305,13 @@
 
         <EncoderProfile quality="high" fileFormat="mp4" duration="30">
             <Video codec="h264"
-                   bitRate="9000000"
-                   width="1280"
-                   height="720"
+                   bitRate="72000000"
+                   width="3840"
+                   height="2160"
                    frameRate="30" />
             <Audio codec="aac"
                    bitRate="96000"
-                   sampleRate="44100"
+                   sampleRate="48000"
                    channels="1" />
         </EncoderProfile>
 
@@ -368,7 +335,7 @@
                    frameRate="30" />
             <Audio codec="aac"
                    bitRate="61000"
-                   sampleRate="44100"
+                   sampleRate="48000"
                    channels="1" />
         </EncoderProfile>
 
@@ -381,7 +348,7 @@
                    frameRate="30" />
             <Audio codec="aac"
                    bitRate="61000"
-                   sampleRate="44100"
+                   sampleRate="48000"
                    channels="1" />
         </EncoderProfile>
         -->
@@ -396,7 +363,7 @@
                    frameRate="30" />
             <Audio codec="aac"
                    bitRate="61000"
-                   sampleRate="44100"
+                   sampleRate="48000"
                    channels="1" />
         </EncoderProfile>
 
@@ -410,22 +377,7 @@
                    frameRate="30" />
             <Audio codec="aac"
                    bitRate="61000"
-                   sampleRate="44100"
-                   channels="1" />
-        </EncoderProfile>
-        -->
-
-        <!--  If your sensor driver don't support 480p stream, Please turn off this element -->
-        <!--
-        <EncoderProfile quality="480p" fileFormat="mp4" duration="30">
-            <Video codec="h264"
-                   bitRate="3000000"
-                   width="800"
-                   height="600"
-                   frameRate="30" />
-            <Audio codec="aac"
-                   bitRate="61000"
-                   sampleRate="44100"
+                   sampleRate="48000"
                    channels="1" />
         </EncoderProfile>
         -->
@@ -433,30 +385,41 @@
         <!--  If your sensor driver don't support 720p stream, Please turn off this element -->
         <EncoderProfile quality="720p" fileFormat="mp4" duration="30">
             <Video codec="h264"
-                   bitRate="9000000"
+                   bitRate="12000000"
                    width="1280"
                    height="720"
                    frameRate="30" />
             <Audio codec="aac"
                    bitRate="96000"
-                   sampleRate="44100"
+                   sampleRate="48000"
                    channels="1" />
         </EncoderProfile>
 
         <!--  If your sensor driver don't support 1080p stream, Please turn off this element -->
-        <!--
         <EncoderProfile quality="1080p" fileFormat="mp4" duration="30">
             <Video codec="h264"
-                   bitRate="12000000"
+                   bitRate="33000000"
                    width="1920"
                    height="1080"
+                   frameRate="60" />
+            <Audio codec="aac"
+                   bitRate="96000"
+                   sampleRate="48000"
+                   channels="1" />
+        </EncoderProfile>
+
+        <!--  If your sensor driver don't support 2160p stream, Please turn off this element -->
+        <EncoderProfile quality="2160p" fileFormat="mp4" duration="30">
+            <Video codec="h264"
+                   bitRate="72000000"
+                   width="3840"
+                   height="2160"
                    frameRate="30" />
             <Audio codec="aac"
                    bitRate="96000"
-                   sampleRate="44100"
+                   sampleRate="48000"
                    channels="1" />
         </EncoderProfile>
-        -->
 
         <EncoderProfile quality="timelapseqcif" fileFormat="mp4" duration="30">
             <Video codec="h264"
@@ -478,7 +441,7 @@
                    frameRate="30" />
             <Audio codec="aac"
                    bitRate="61000"
-                   sampleRate="44100"
+                   sampleRate="48000"
                    channels="1" />
         </EncoderProfile>
 
@@ -491,7 +454,7 @@
                    frameRate="30" />
             <Audio codec="aac"
                    bitRate="61000"
-                   sampleRate="44100"
+                   sampleRate="48000"
                    channels="1" />
         </EncoderProfile>
         -->
@@ -506,7 +469,7 @@
                    frameRate="30" />
             <Audio codec="aac"
                    bitRate="61000"
-                   sampleRate="44100"
+                   sampleRate="48000"
                    channels="1" />
         </EncoderProfile>
 
@@ -520,23 +483,7 @@
                    frameRate="30" />
             <Audio codec="aac"
                    bitRate="61000"
-                   sampleRate="44100"
-                   channels="1" />
-        </EncoderProfile>
-        -->
-
-        <!--  If your sensor driver don't support 720p and 480p stream, Please fill this element according as
-              your sensor max resolution for preview(Not Capture resolution)  -->
-        <!--
-        <EncoderProfile quality="timelapse480p" fileFormat="mp4" duration="30">
-            <Video codec="h264"
-                   bitRate="1200000"
-                   width="800"
-                   height="600"
-                   frameRate="30" />
-            <Audio codec="aac"
-                   bitRate="61000"
-                   sampleRate="44100"
+                   sampleRate="48000"
                    channels="1" />
         </EncoderProfile>
         -->
@@ -547,27 +494,25 @@
                    bitRate="9000000"
                    width="1280"
                    height="720"
-                   frameRate="8" />
+                   frameRate="30" />
             <Audio codec="aac"
                    bitRate="96000"
-                   sampleRate="44100"
+                   sampleRate="48000"
                    channels="1" />
         </EncoderProfile>
 
         <!--  If your sensor driver don't support 1080p stream, Please turn off this element -->
-        <!--
         <EncoderProfile quality="timelapse1080p" fileFormat="mp4" duration="30">
             <Video codec="h264"
-                   bitRate="12000000"
+                   bitRate="17000000"
                    width="1920"
                    height="1080"
                    frameRate="30" />
             <Audio codec="aac"
                    bitRate="96000"
-                   sampleRate="44100"
+                   sampleRate="48000"
                    channels="1" />
         </EncoderProfile>
-        -->
 
         <ImageEncoding quality="95" />
         <ImageEncoding quality="80" />
@@ -584,10 +529,16 @@
          In other words, the applications won't be able to use the codec
          or query the capabilities of the codec at all if it is disabled
     -->
+    <VideoEncoderCap name="hevc" enabled="true"
+        minBitRate="64000" maxBitRate="72000000"
+        minFrameWidth="176" maxFrameWidth="3840"
+        minFrameHeight="144" maxFrameHeight="2160"
+        minFrameRate="15" maxFrameRate="30" />
+
     <VideoEncoderCap name="h264" enabled="true"
-        minBitRate="64000" maxBitRate="18000000"
-        minFrameWidth="176" maxFrameWidth="1920"
-        minFrameHeight="144" maxFrameHeight="1080"
+        minBitRate="64000" maxBitRate="72000000"
+        minFrameWidth="176" maxFrameWidth="7680"
+        minFrameHeight="144" maxFrameHeight="4320"
         minFrameRate="1" maxFrameRate="30" />
 
     <VideoEncoderCap name="h263" enabled="true"
@@ -604,7 +555,7 @@
 
     <AudioEncoderCap name="aac" enabled="true"
         minBitRate="8192" maxBitRate="96000"
-        minSampleRate="8000" maxSampleRate="44100"
+        minSampleRate="8000" maxSampleRate="48000"
         minChannels="1" maxChannels="1" />
 
     <AudioEncoderCap name="amrwb" enabled="true"

device/rockchip/common/device.mk

@@ -868,7 +868,7 @@ endif
 
 #only box and atv using our audio policy(write by rockchip)
 ifneq ($(filter atv box, $(strip $(TARGET_BOARD_PLATFORM_PRODUCT))), )
-USE_CUSTOM_AUDIO_POLICY := 1
+USE_CUSTOM_AUDIO_POLICY ?= 1
 PRODUCT_PACKAGES += \
     libaudiopolicymanagercustom
 endif

device/rockchip/rk356x/nanopi5/device.mk

@@ -61,8 +61,16 @@ PRODUCT_MANUFACTURER := FriendlyELEC (www.friendlyelec.com)
 PRODUCT_AAPT_CONFIG := normal large xlarge tvdpi hdpi xhdpi
 PRODUCT_AAPT_PREF_CONFIG := hdpi
 
+TARGET_BOARD_SUPPORT_4K_UI ?= false
+ifeq ($(TARGET_BOARD_SUPPORT_4K_UI),true)
+PRODUCT_PROPERTY_OVERRIDES += persist.vendor.framebuffer.main=3840x2160@60
+PRODUCT_PROPERTY_OVERRIDES += ro.sf.lcd_density=350
+else
+PRODUCT_PROPERTY_OVERRIDES += persist.vendor.framebuffer.main=1920x1080@60
+PRODUCT_PROPERTY_OVERRIDES += ro.sf.lcd_density=240
+endif
+
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.sf.lcd_density=240 \
     persist.demo.hdmirotates=true \
     ro.vendor.user_rotation=true \
     ro.boot.log_battery=false
@@ -109,6 +117,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 PRODUCT_USB_CAMERA_CONFIG := device/rockchip/rk356x/nanopi5/external_camera_config.xml
 
+include device/friendlyelec/nanopi3/input/keyboards.mk
+
 # vendor apps
 $(call inherit-product-if-exists, vendor/friendlyelec/apps/device-partial.mk)
 

device/rockchip/rk356x/nanopi5/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml

@@ -27,7 +27,7 @@
     <bool name="def_bluetooth_on">false</bool>
 
     <!-- 0 == never, 1 == only when plugged in, 2 == always -->
-    <integer name="def_wifi_sleep_policy">0</integer>
+    <integer name="def_wifi_sleep_policy">2</integer>
 
     <!-- Disable the lockscreen -->
     <bool name="def_lockscreen_disabled">true</bool>
@@ -48,4 +48,10 @@
     <fraction name="def_window_animation_scale">50%</fraction>
     <fraction name="def_window_transition_scale">50%</fraction>
 
+    <!-- Default for Settings.Secure.USER_SETUP_COMPLETE -->
+    <bool name="def_user_setup_complete">true</bool>
+
+    <!-- Default for Settings.Secure.TV_USER_SETUP_COMPLETE -->
+    <bool name="def_tv_user_setup_complete">true</bool>
+
 </resources>

device/rockchip/rk356x/nanopi5_box/device.mk

@@ -73,8 +73,6 @@ BOARD_WITH_RKTOOLBOX := false
 PRODUCT_USE_PREBUILT_GTVS := no
 BUILD_WITH_GOOGLE_FRP := false
 
-BOARD_WITH_SPECIAL_PARTITIONS := baseparameter:1M,logo:16M
-
 # Get the long list of APNs
 PRODUCT_COPY_FILES += vendor/rockchip/common/phone/etc/apns-full-conf.xml:system/etc/apns-conf.xml
 PRODUCT_COPY_FILES += vendor/rockchip/common/phone/etc/spn-conf.xml:system/etc/spn-conf.xml
@@ -105,6 +103,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
     ro.com.google.clientidbase=android-rockchip-tv
 
 # copy input keylayout and device config
+include device/friendlyelec/nanopi3/input/keyboards.mk
 keylayout_files := $(shell ls device/rockchip/rk356x/nanopi5_box/remote_config )
 PRODUCT_COPY_FILES += \
     $(foreach file, $(keylayout_files), device/rockchip/rk356x/nanopi5_box/remote_config/$(file):$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/$(file))
@@ -140,7 +139,7 @@ endif
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.wifi.sleep.power.down=true \
     persist.wifi.sleep.delay.ms=0 \
-    persist.bt.power.down=true
+    persist.bt.power.down=false
 
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.vendor.rk_sdk=1 \

device/rockchip/rk356x/nanopi5_box/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml

@@ -24,10 +24,10 @@
     <!-- Default screen brightness, translate to 85 in kernel -->
     <integer name="def_screen_brightness">120</integer>
 
-    <bool name="def_bluetooth_on">false</bool>
+    <!-- <bool name="def_bluetooth_on">false</bool> -->
 
     <!-- 0 == never, 1 == only when plugged in, 2 == always -->
-    <integer name="def_wifi_sleep_policy">0</integer>
+    <integer name="def_wifi_sleep_policy">2</integer>
 
     <!-- Disable the lockscreen -->
     <bool name="def_lockscreen_disabled">true</bool>
@@ -51,4 +51,10 @@
     <fraction name="def_window_animation_scale">50%</fraction>
     <fraction name="def_window_transition_scale">50%</fraction>
 
+    <!-- Default for Settings.Secure.USER_SETUP_COMPLETE -->
+    <bool name="def_user_setup_complete">true</bool>
+
+    <!-- Default for Settings.Secure.TV_USER_SETUP_COMPLETE -->
+    <bool name="def_tv_user_setup_complete">true</bool>
+
 </resources>

device/rockchip/rk356x/nanopi5_box/remote_config/fd8b0030_pwm.kl

@@ -11,7 +11,7 @@ key 164   MEDIA_PLAY_PAUSE
 key 232   DPAD_CENTER
 key 108   DPAD_DOWN
 key 103   DPAD_UP
-key 102   HOME
+key 172   HOME
 key 105   DPAD_LEFT
 key 106   DPAD_RIGHT
 key 115   VOLUME_UP

device/rockchip/rk3588/device.mk

@@ -79,23 +79,23 @@ endif
 # add Rockchip properties here
 #
 PRODUCT_PROPERTY_OVERRIDES += \
-                ro.ril.ecclist=112,911 \
-                ro.opengles.version=196610 \
-                wifi.interface=wlan0 \
-                ro.audio.monitorOrientation=true \
-                debug.nfc.fw_download=false \
-                debug.nfc.se=false \
-                sys.wallpaper.rgb565=0 \
-                sf.power.control=2073600 \
-                sys.rkadb.root=0 \
-                ro.sf.fakerotation=false \
-                ro.tether.denied=false \
-                sys.resolution.changed=false \
-                ro.default.size=100 \
-                ro.product.usbfactory=rockchip_usb \
-                wifi.supplicant_scan_interval=15 \
-                ro.factory.tool=0 \
-                ro.kernel.android.checkjni=0 \
-                ro.build.shutdown_timeout=6 \
-                persist.enable_task_snapshots=false \
-                ro.vendor.frameratelock=true
+    ro.ril.ecclist=112,911 \
+    ro.opengles.version=196610 \
+    wifi.interface=wlan0 \
+    ro.audio.monitorOrientation=true \
+    debug.nfc.fw_download=false \
+    debug.nfc.se=false \
+    sys.wallpaper.rgb565=0 \
+    sf.power.control=2073600 \
+    sys.rkadb.root=0 \
+    ro.sf.fakerotation=false \
+    ro.tether.denied=false \
+    sys.resolution.changed=false \
+    ro.default.size=100 \
+    ro.product.usbfactory=rockchip_usb \
+    wifi.supplicant_scan_interval=15 \
+    ro.factory.tool=0 \
+    ro.kernel.android.checkjni=0 \
+    ro.build.shutdown_timeout=6 \
+    persist.enable_task_snapshots=false \
+    ro.vendor.frameratelock=true

device/rockchip/rk3588/nanopi6/BoardConfig.mk

@@ -28,7 +28,7 @@ BOARD_HS_ETHERNET := true
 PRODUCT_HAVE_PCIE_ETHERNET := true
 
 BOARD_HDMI_IN_SUPPORT := true
-# CAMERA_SUPPORT_HDMI := true
+CAMERA_SUPPORT_HDMI := true
 
 # Wifi.
 WIFI_DRIVER_FW_PATH_PARAM := "/dev/null"

device/rockchip/rk3588/nanopi6/device.mk

@@ -36,6 +36,7 @@ include device/rockchip/common/build/rockchip/DynamicPartitions.mk
 include device/rockchip/common/BoardConfig.mk
 
 PRODUCT_COPY_FILES += \
+    device/rockchip/rk3588/nanopi6/camera3_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/camera/camera3_profiles.xml \
     device/rockchip/rk3588/nanopi6/init.rk3588.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.rk3588.rc
 
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -62,8 +63,17 @@ PRODUCT_AAPT_PREF_CONFIG := hdpi
 
 DEVICE_PACKAGE_OVERLAYS := device/rockchip/rk3588/nanopi6/overlay
 
+TARGET_BOARD_SUPPORT_4K_UI ?= false
+ifeq ($(TARGET_BOARD_SUPPORT_4K_UI),true)
+PRODUCT_PROPERTY_OVERRIDES += persist.vendor.framebuffer.main=3840x2160@60
+PRODUCT_PROPERTY_OVERRIDES += ro.sf.lcd_density=350
+else
+PRODUCT_PROPERTY_OVERRIDES += persist.vendor.framebuffer.main=1920x1080@60
+PRODUCT_PROPERTY_OVERRIDES += ro.sf.lcd_density=240
+endif
+
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.sf.lcd_density=240 \
+    vendor.hwc.compose_policy=1 \
     persist.demo.hdmirotates=true \
     ro.vendor.user_rotation=true \
     ro.boot.log_battery=false
@@ -110,6 +120,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 PRODUCT_USB_CAMERA_CONFIG := device/rockchip/rk3588/nanopi6/external_camera_config.xml
 
+include device/friendlyelec/nanopi3/input/keyboards.mk
+
 # vendor apps
 $(call inherit-product-if-exists, vendor/friendlyelec/apps/device-partial.mk)
 

device/rockchip/rk3588/nanopi6/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml

@@ -27,7 +27,7 @@
     <bool name="def_bluetooth_on">false</bool>
 
     <!-- 0 == never, 1 == only when plugged in, 2 == always -->
-    <integer name="def_wifi_sleep_policy">0</integer>
+    <integer name="def_wifi_sleep_policy">2</integer>
 
     <!-- Disable the lockscreen -->
     <bool name="def_lockscreen_disabled">true</bool>
@@ -48,4 +48,10 @@
     <fraction name="def_window_animation_scale">50%</fraction>
     <fraction name="def_window_transition_scale">50%</fraction>
 
+    <!-- Default for Settings.Secure.USER_SETUP_COMPLETE -->
+    <bool name="def_user_setup_complete">true</bool>
+
+    <!-- Default for Settings.Secure.TV_USER_SETUP_COMPLETE -->
+    <bool name="def_tv_user_setup_complete">true</bool>
+
 </resources>

device/rockchip/rk3588/nanopi6_box/device.mk

@@ -73,8 +73,6 @@ BOARD_WITH_RKTOOLBOX := false
 PRODUCT_USE_PREBUILT_GTVS := no
 BUILD_WITH_GOOGLE_FRP := false
 
-BOARD_WITH_SPECIAL_PARTITIONS := baseparameter:1M,logo:16M
-
 # Get the long list of APNs
 PRODUCT_COPY_FILES += vendor/rockchip/common/phone/etc/apns-full-conf.xml:system/etc/apns-conf.xml
 PRODUCT_COPY_FILES += vendor/rockchip/common/phone/etc/spn-conf.xml:system/etc/spn-conf.xml
@@ -105,6 +103,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
     ro.com.google.clientidbase=android-rockchip-tv
 
 # copy input keylayout and device config
+include device/friendlyelec/nanopi3/input/keyboards.mk
 keylayout_files := $(shell ls device/rockchip/rk3588/nanopi6_box/remote_config )
 PRODUCT_COPY_FILES += \
     $(foreach file, $(keylayout_files), device/rockchip/rk3588/nanopi6_box/remote_config/$(file):$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/$(file))
@@ -140,14 +139,16 @@ endif
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.wifi.sleep.power.down=true \
     persist.wifi.sleep.delay.ms=0 \
-    persist.bt.power.down=true
+    persist.bt.power.down=false
 
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.vendor.rk_sdk=1 \
+    ro.vendor.rk_multiaudio=true \
     ro.config.media_vol_default=10 \
     persist.sys.show_color_option=false \
     ro.audio.monitorOrientation=true \
     ro.vendor.nrdp.modelgroup=NEXUSPLAYERFUGU \
+    vendor.hwc.compose_policy=1 \
     vendor.hwc.device.primary=HDMI-A,TV
 
 TARGET_BOARD_SUPPORT_4K_UI ?= false

device/rockchip/rk3588/nanopi6_box/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml

@@ -24,10 +24,10 @@
     <!-- Default screen brightness, translate to 85 in kernel -->
     <integer name="def_screen_brightness">120</integer>
 
-    <bool name="def_bluetooth_on">false</bool>
+    <!-- <bool name="def_bluetooth_on">false</bool> -->
 
     <!-- 0 == never, 1 == only when plugged in, 2 == always -->
-    <integer name="def_wifi_sleep_policy">0</integer>
+    <integer name="def_wifi_sleep_policy">2</integer>
 
     <!-- Disable the lockscreen -->
     <bool name="def_lockscreen_disabled">true</bool>
@@ -51,4 +51,10 @@
     <fraction name="def_window_animation_scale">50%</fraction>
     <fraction name="def_window_transition_scale">50%</fraction>
 
+    <!-- Default for Settings.Secure.USER_SETUP_COMPLETE -->
+    <bool name="def_user_setup_complete">true</bool>
+
+    <!-- Default for Settings.Secure.TV_USER_SETUP_COMPLETE -->
+    <bool name="def_tv_user_setup_complete">true</bool>
+
 </resources>

device/rockchip/rk3588/nanopi6_box/remote_config/fd8b0030_pwm.kl

@@ -11,7 +11,7 @@ key 164   MEDIA_PLAY_PAUSE
 key 232   DPAD_CENTER
 key 108   DPAD_DOWN
 key 103   DPAD_UP
-key 102   HOME
+key 172   HOME
 key 105   DPAD_LEFT
 key 106   DPAD_RIGHT
 key 115   VOLUME_UP