Snap for 4826885 from 3b068527aeef25b143c53c7c78929501dc725634 to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-cts-release

Change-Id: I72a936e7d7b4d647fe8df3925f821c9a7cf6a33f

3 files changed, 6 insertions, 1 deletions

diff --git a/Settings/res/values-ca/strings.xml b/Settings/res/values-ca/strings.xml
index 61f874e77..9d2eae8ed 100644
--- a/Settings/res/values-ca/strings.xml
+++ b/Settings/res/values-ca/strings.xml
@@ -269,7 +269,7 @@
     <string name="wifi_gateway_description" msgid="4773751224452216231">"Introdueix una adreça IP vàlida o deixa el camp en blanc.\nExemple: <xliff:g id="ID_1">192.168.1.1</xliff:g>"</string>
     <string name="wifi_network_prefix_length_description" msgid="4849589333293194414">"Introdueix una longitud de prefix de xarxa vàlida.\nExemple: <xliff:g id="ID_1">24</xliff:g>"</string>
     <string name="proxy_error_invalid_host" msgid="3660415920668138953">"El nom d\'amfitrió no és vàlid."</string>
-    <string name="proxy_error_invalid_exclusion_list" msgid="4921547051724987804">"La llista d\'exclusió no és vàlida. Introdueix una llista de dominis exclosos separats per comes."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4921547051724987804">"La llista d\'exclusions no és vàlida. Introdueix una llista de dominis exclosos separats per comes."</string>
     <string name="proxy_error_empty_port" msgid="6835658067776408062">"El camp de port no pot ser buit."</string>
     <string name="proxy_error_empty_host_set_port" msgid="4428793978424303244">"Si el camp d\'amfitrió és buit, deixa el camp de port buit."</string>
     <string name="proxy_error_invalid_port" msgid="1434922103959603993">"El port no és vàlid."</string>
diff --git a/Settings/res/xml/development_prefs.xml b/Settings/res/xml/development_prefs.xml
index 18cb15aad..1474a53e6 100644
--- a/Settings/res/xml/development_prefs.xml
+++ b/Settings/res/xml/development_prefs.xml
@@ -231,6 +231,10 @@
     <PreferenceCategory android:key="debug_hw_drawing_category"
                         android:layout="@layout/preference_category_compact_layout"
                         android:title="@string/debug_hw_drawing_category">
+        <SwitchPreference
+            android:key="force_hw_ui"
+            android:title="@string/force_hw_ui"
+            android:summary="@string/force_hw_ui_summary"/>
 
         <SwitchPreference
             android:key="show_hw_screen_udpates"
diff --git a/Settings/src/com/android/tv/settings/system/LocationFragment.java b/Settings/src/com/android/tv/settings/system/LocationFragment.java
index ec010654c..543c50125 100644
--- a/Settings/src/com/android/tv/settings/system/LocationFragment.java
+++ b/Settings/src/com/android/tv/settings/system/LocationFragment.java
@@ -107,6 +107,7 @@ public class LocationFragment extends SettingsPreferenceFragment implements
         final PreferenceCategory recentRequests = new PreferenceCategory(themedContext);
         screen.addPreference(recentRequests);
         recentRequests.setTitle(R.string.location_category_recent_location_requests);
+        recentRequests.setLayoutResource(R.layout.preference_category_compact_layout);
 
         List<RecentLocationApps.Request> recentLocationRequests =
                 new RecentLocationApps(themedContext).getAppList();