diff options
| author | Eric Erfanian <erfanian@google.com> | 2018-07-10 15:58:11 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2018-07-10 15:58:11 -0700 |
| commit | 4184746b2d18477ecf0216cf84846c08af516e70 (patch) | |
| tree | 2a593b4258e1d6002275d94dd0066df4f4420ef0 /java/com/android/dialer/app | |
| parent | e0dbd9f9074559d73e93aeacc3ba27f65e820670 (diff) | |
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
Diffstat (limited to 'java/com/android/dialer/app')
| -rw-r--r-- | java/com/android/dialer/app/res/xml/display_options_settings.xml | 4 |
1 files changed, 2 insertions, 2 deletions
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> |