Redesign settings for tablets
1. Move AppCompatPreferenceActivity from Dialer to ContactsCommon
2. Move ContactsPreferenceActivity from Contacts to ContactsCommon,
make it extend AppCompatPreferenceActivity and avoid building
headers (by not overriding onBuildHeaders)
3. Move the "About" PreferenceScreen to preference_about.xml and
add AboutPreferenceFragment so that we could switch between two
fragments.
2. Add "back button" to LicenseActivity.
Here's how it looks:
https://docs.google.com/a/google.com/presentation/d/1A5n2o8epBCrizZvbOyelvjoHz-s5-IRlJd-KqWAMBao/edit?usp=sharing
Bug: 25629359
Bug: 26469731
Change-Id: If88722a62e41d1a2f4f70939b2d52d697e204628
diff --git a/res-common/values/strings.xml b/res-common/values/strings.xml
index ef7dbc7..0ced780 100644
--- a/res-common/values/strings.xml
+++ b/res-common/values/strings.xml
@@ -678,6 +678,9 @@
<!-- Label of the "About" setting -->
<string name="setting_about">About Contacts</string>
+ <!-- Title of the settings activity [CHAR LIMIT=64] -->
+ <string name="activity_title_settings">Settings</string>
+
<!-- Action that shares visible contacts -->
<string name="share_visible_contacts">Share visible contacts</string>
diff --git a/res-common/xml/preference_about.xml b/res-common/xml/preference_about.xml
new file mode 100644
index 0000000..005485c
--- /dev/null
+++ b/res-common/xml/preference_about.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+ <Preference
+ android:icon="@null"
+ android:key="@string/pref_build_version_key"
+ android:title="@string/about_build_version"/>
+
+ <Preference
+ android:icon="@null"
+ android:key="@string/pref_open_source_licenses_key"
+ android:title="@string/about_open_source_licenses"
+ android:summary="@string/about_open_source_licenses_summary"/>
+
+ <Preference
+ android:icon="@null"
+ android:key="@string/pref_privacy_policy_key"
+ android:title="@string/about_privacy_policy">
+ <intent android:action="android.intent.action.VIEW"
+ android:data="http://www.google.com/policies/privacy" />
+ </Preference>
+
+ <Preference
+ android:icon="@null"
+ android:key="@string/pref_terms_of_service_key"
+ android:title="@string/about_terms_of_service">
+ <intent android:action="android.intent.action.VIEW"
+ android:data="http://www.google.com/policies/terms" />
+ </Preference>
+</PreferenceScreen>
diff --git a/res-common/xml/preference_display_options.xml b/res-common/xml/preference_display_options.xml
index 9e7a594..6e23d47 100644
--- a/res-common/xml/preference_display_options.xml
+++ b/res-common/xml/preference_display_options.xml
@@ -39,35 +39,8 @@
android:title="@string/sync_contact_metadata_title"
android:dialogTitle="@string/sync_contact_metadata_dialog_title" />
- <PreferenceScreen
+ <Preference
android:icon="@null"
android:key="about"
- android:title="@string/setting_about">
- <Preference
- android:icon="@null"
- android:key="@string/pref_build_version_key"
- android:title="@string/about_build_version"/>
-
- <Preference
- android:icon="@null"
- android:key="@string/pref_open_source_licenses_key"
- android:title="@string/about_open_source_licenses"
- android:summary="@string/about_open_source_licenses_summary"/>
-
- <Preference
- android:icon="@null"
- android:key="@string/pref_privacy_policy_key"
- android:title="@string/about_privacy_policy">
- <intent android:action="android.intent.action.VIEW"
- android:data="http://www.google.com/policies/privacy" />
- </Preference>
-
- <Preference
- android:icon="@null"
- android:key="@string/pref_terms_of_service_key"
- android:title="@string/about_terms_of_service">
- <intent android:action="android.intent.action.VIEW"
- android:data="http://www.google.com/policies/terms" />
- </Preference>
- </PreferenceScreen>
+ android:title="@string/setting_about"/>
</PreferenceScreen>