Merge changes I0fde4f80,Iea1cff48 into pi-dev am: 0ae4204f54

am: 4663e6e52a

Change-Id: I4cff256a0707543d8fd782ba7b3889c5d181ddff

res/xml/display_settings.xml

@@ -83,6 +83,7 @@
         android:key="font_size"
         android:title="@string/title_font_size"
         android:fragment="com.android.settings.accessibility.ToggleFontSizePreferenceFragment"
+        settings:controller="com.android.settings.display.FontSizePreferenceController"
         settings:keywords="@string/keywords_display_font_size" />
 
     <com.android.settings.display.ScreenZoomPreference

res/xml/time_zone_prefs.xml

@@ -16,6 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="time_zone_settings_screen"
     android:title="@string/date_time_set_timezone">
 
@@ -29,7 +30,9 @@
             android:key="region_zone"
             android:title="@string/date_time_set_timezone_title"
             android:summary="@string/summary_placeholder" />
-        <com.android.settingslib.widget.FooterPreference/>
+        <com.android.settingslib.widget.FooterPreference
+            android:key="footer_preference"
+            settings:controller="com.android.settings.datetime.timezone.TimeZoneInfoPreferenceController" />
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -37,6 +40,6 @@
         <com.android.settingslib.RestrictedPreference
             android:key="fixed_offset"
             android:title="@string/date_time_select_fixed_offset_time_zones"
-            android:summary="@string/summary_placeholder"/>
+            android:summary="@string/summary_placeholder" />
     </PreferenceCategory>
 </PreferenceScreen>