From 4184746b2d18477ecf0216cf84846c08af516e70 Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Tue, 10 Jul 2018 15:58:11 -0700
Subject: Use ContactDisplayPreferencesStub when device is locked.

PreferenceManager.getDefaultSharedPreferences() can only be called when the device is unlocked. The module will lazily construct the impl.

Fix defaults for contact display preferences.

If the settings are accessed before the preferences are populated the wrong default value will be used.

Test: make
Bug: 111275389, 111051362
Change-Id: I29e34d61d529c91065aa3ef952d125d83cdee982
---
 java/com/android/dialer/app/res/xml/display_options_settings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'java/com/android/dialer/app')

diff --git a/java/com/android/dialer/app/res/xml/display_options_settings.xml b/java/com/android/dialer/app/res/xml/display_options_settings.xml
index 60301dbe8..f15412279 100644
--- a/java/com/android/dialer/app/res/xml/display_options_settings.xml
+++ b/java/com/android/dialer/app/res/xml/display_options_settings.xml
@@ -25,7 +25,7 @@
       android:entries="@array/contact_sort_order_entries"
       android:entryValues="@array/contact_sort_order_values"
       android:title="@string/display_options_sort_list_by"
-      android:defaultValue="1"/>
+      android:defaultValue="@string/display_options_sort_by_given_name_value"/>
 
   <ListPreference
       android:dialogTitle="@string/display_options_view_names_as"
@@ -34,6 +34,6 @@
       android:entries="@array/contact_display_order_entries"
       android:entryValues="@array/contact_display_order_values"
       android:title="@string/display_options_view_names_as"
-      android:defaultValue="1"/>
+      android:defaultValue="@string/display_options_view_given_name_first_value"/>
 
 </PreferenceScreen>
-- 
cgit v1.2.3