Add display.qservice
am: 185c300434
Change-Id: I6cca2721d71a3ebfcbbe479bf349c261e3653b5c
diff --git a/overlay/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png b/overlay/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png
index 8ed1509..f830df0 100644
--- a/overlay/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png
+++ b/overlay/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png
Binary files differ
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 6c84b87..1b3ff56 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -37,8 +37,14 @@
Any other values will have surprising consequences. -->
<integer name="config_defaultUiModeType">4</integer>
- <!-- Override long press on home: launch assist intent. -->
- <integer name="config_longPressOnHomeBehavior">2</integer>
+ <!-- Control the behavior when the user long presses the home button.
+ 0 - Nothing
+ 1 - Launch all apps intent
+ 2 - Launch assist intent
+ This needs to match the constants in
+ policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+ -->
+ <integer name="config_longPressOnHomeBehavior">1</integer>
<!-- Override configuration check for dpad so that we always appear to have one -->
<bool name="config_hasPermanentDpad">true</bool>
diff --git a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
index 40021f7..7dd68c6 100644
--- a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -22,9 +22,6 @@
<!-- Disable the lockscreen -->
<bool name="def_lockscreen_disabled">true</bool>
- <!-- No setup wizard -->
- <bool name="def_device_provisioned">true</bool>
-
<!-- Keep screen on at all times by default -->
<bool name="def_stay_on_while_plugged_in">true</bool>
diff --git a/permissions/tv_core_hardware.xml b/permissions/tv_core_hardware.xml
index d6b9c0b..03d4c2f 100644
--- a/permissions/tv_core_hardware.xml
+++ b/permissions/tv_core_hardware.xml
@@ -31,6 +31,9 @@
<feature name="android.software.leanback_only" />
<feature name="android.software.live_tv" />
<feature name="android.software.picture_in_picture" />
+ <feature name="android.software.activities_on_secondary_displays" />
<feature name="android.software.voice_recognizers" />
+ <feature name="android.software.cts" />
+
</permissions>
diff --git a/products/atv_base.mk b/products/atv_base.mk
index db8bc44..404da59 100644
--- a/products/atv_base.mk
+++ b/products/atv_base.mk
@@ -84,7 +84,6 @@
SystemUI \
librs_jni \
audio.primary.default \
- audio_policy.default \
clatd \
clatd.conf \
local_time.default \
@@ -115,7 +114,18 @@
# To enable access to /dev/dvb*
BOARD_SEPOLICY_DIRS += device/google/atv/sepolicy
-$(call inherit-product-if-exists, frameworks/base/data/sounds/AllAudio.mk)
+# This property defines the tutorial content for this device
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.tutorials_content.android=android8
+
+# Content for ATV Tutorials / Post-Setup Tour
+PRODUCT_COPY_FILES += \
+ device/google/atv/tutorial-library-google.zip.etag:system/media/tutorial-library-google.zip.etag
+
+PRODUCT_COPY_FILES += \
+ device/google/atv/tutorial-library-google.zip:system/media/tutorial-library-google.zip
+
+$(call inherit-product-if-exists, frameworks/base/data/sounds/AudioTv.mk)
$(call inherit-product-if-exists, external/svox/pico/lang/all_pico_languages.mk)
$(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)
$(call inherit-product-if-exists, external/google-fonts/dancing-script/fonts.mk)
diff --git a/products/sdk_atv_armv7.mk b/products/sdk_atv_armv7.mk
index 45b3d65..2243f4e 100644
--- a/products/sdk_atv_armv7.mk
+++ b/products/sdk_atv_armv7.mk
@@ -70,4 +70,4 @@
# Overrides
PRODUCT_NAME := sdk_atv_armv7
PRODUCT_DEVICE := generic
-PRODUCT_BRAND := generic
+PRODUCT_BRAND := google
diff --git a/products/sdk_atv_x86.mk b/products/sdk_atv_x86.mk
index aa4fb7e..1b6f3f7 100644
--- a/products/sdk_atv_x86.mk
+++ b/products/sdk_atv_x86.mk
@@ -20,4 +20,4 @@
# Overrides
PRODUCT_NAME := sdk_atv_x86
PRODUCT_DEVICE := generic_x86
-PRODUCT_BRAND := generic_x86
+PRODUCT_BRAND := google
diff --git a/sdk/devices.xml b/sdk/devices.xml
index 898e7b2..6b5e34f 100644
--- a/sdk/devices.xml
+++ b/sdk/devices.xml
@@ -5,6 +5,7 @@
<d:device>
<d:name>Android TV (1080p)</d:name>
+ <d:id>tv_1080p</d:id>
<d:manufacturer>Google</d:manufacturer>
<d:hardware>
<d:screen>
@@ -48,6 +49,7 @@
</d:abi>
<d:dock/>
<d:power-type>plugged-in</d:power-type>
+ <d:skin>tv_1080p</d:skin>
</d:hardware>
<d:software>
<d:api-level>20-</d:api-level>
@@ -74,6 +76,7 @@
<d:device>
<d:name>Android TV (720p)</d:name>
+ <d:id>tv_720p</d:id>
<d:manufacturer>Google</d:manufacturer>
<d:hardware>
<d:screen>
@@ -117,6 +120,7 @@
</d:abi>
<d:dock/>
<d:power-type>plugged-in</d:power-type>
+ <d:skin>tv_720p</d:skin>
</d:hardware>
<d:software>
<d:api-level>20-</d:api-level>
diff --git a/sepolicy/system_service.te b/sepolicy/system_service.te
index f6783d7..0d85c35 100644
--- a/sepolicy/system_service.te
+++ b/sepolicy/system_service.te
@@ -1,3 +1,4 @@
# Access devices.
allow system_server dvb_device:chr_file rw_file_perms;
+allow system_server dvb_device:dir { search read open };
allow system_server uhid_device:chr_file { write open ioctl };
diff --git a/tutorial-library-google.zip b/tutorial-library-google.zip
new file mode 100644
index 0000000..fc1e2e9
--- /dev/null
+++ b/tutorial-library-google.zip
Binary files differ
diff --git a/tutorial-library-google.zip.etag b/tutorial-library-google.zip.etag
new file mode 100644
index 0000000..38ee55a
--- /dev/null
+++ b/tutorial-library-google.zip.etag
@@ -0,0 +1 @@
+5e9e9a8c7faeca0d6ed5dbfd62772b99
