Snap for 4826885 from 3b068527aeef25b143c53c7c78929501dc725634 to pi-release
Change-Id: I72a936e7d7b4d647fe8df3925f821c9a7cf6a33f
diff --git a/Settings/res/values-ca/strings.xml b/Settings/res/values-ca/strings.xml
index 61f874e..9d2eae8 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 18cb15a..1474a53 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 ec01065..543c501 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 @@
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();
