From 97670b46b3958cec0d07cfc17133fdda313ddf3e Mon Sep 17 00:00:00 2001
From: Nancy Chen <nancychen@google.com>
Date: Tue, 11 Nov 2014 12:17:05 -0800
Subject: Remove summary/secondary text from settings.

Per settings design guildelines, we should not be using the second line
to describe the contents of a setting with subscreen navigation (this
second line is now used for just status). Remove these second lines from
the dialer settings UI.

Bug: 17446974
Change-Id: Idbeace64c088805a19a77b1438dd66a618387848
---
 res/values/strings.xml                                      | 11 +----------
 src/com/android/dialer/settings/DialerSettingsActivity.java |  3 ---
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2a45efab8..317e578af 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -671,9 +671,6 @@
     <!-- Label for the general dialer settings section [CHAR LIMIT=30]-->
     <string name="general_settings_label">General</string>
 
-    <!-- Label for the general dialer settings section description [CHAR LIMIT=80]-->
-    <string name="general_settings_description">Contact display, sounds, and quick responses</string>
-
     <!-- Title for "Contact display options" category, which is shown above options which
          manipulate how contacts are shown. [CHAR LIMIT=40] -->
     <string name="contact_display_options_category_title">Contact display options</string>
@@ -701,12 +698,6 @@
     <!-- Label for the call settings section [CHAR LIMIT=30] -->
     <string name="call_settings_label">Calls</string>
 
-    <!-- Label for the call settings section description [CHAR LIMIT=80] -->
-    <string name="call_settings_description">Voicemail, call waiting, and others</string>
-
     <!-- Label for the phone account settings [CHAR LIMIT=30] -->
-    <string name="phone_account_settings_label">Phone account settings</string>
-
-    <!-- Label for the phone account settings description [CHAR LIMIT=80] -->
-    <string name="phone_account_settings_description">Manage SIM and call settings</string>
+    <string name="phone_account_settings_label">Calling accounts</string>
 </resources>
diff --git a/src/com/android/dialer/settings/DialerSettingsActivity.java b/src/com/android/dialer/settings/DialerSettingsActivity.java
index 252506642..de07128ca 100644
--- a/src/com/android/dialer/settings/DialerSettingsActivity.java
+++ b/src/com/android/dialer/settings/DialerSettingsActivity.java
@@ -44,7 +44,6 @@ public class DialerSettingsActivity extends PreferenceActivity {
     public void onBuildHeaders(List<Header> target) {
         final Header generalSettingsHeader = new Header();
         generalSettingsHeader.titleRes = R.string.general_settings_label;
-        generalSettingsHeader.summaryRes = R.string.general_settings_description;
         generalSettingsHeader.fragment = GeneralSettingsFragment.class.getName();
         target.add(generalSettingsHeader);
 
@@ -59,7 +58,6 @@ public class DialerSettingsActivity extends PreferenceActivity {
                 callSettingsIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
 
                 callSettingsHeader.titleRes = R.string.call_settings_label;
-                callSettingsHeader.summaryRes = R.string.call_settings_description;
                 callSettingsHeader.intent = callSettingsIntent;
                 target.add(callSettingsHeader);
             } else {
@@ -69,7 +67,6 @@ public class DialerSettingsActivity extends PreferenceActivity {
                 phoneAccountSettingsIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
 
                 phoneAccountSettingsHeader.titleRes = R.string.phone_account_settings_label;
-                phoneAccountSettingsHeader.summaryRes = R.string.phone_account_settings_description;
                 phoneAccountSettingsHeader.intent = phoneAccountSettingsIntent;
                 target.add(phoneAccountSettingsHeader);
             }
-- 
cgit v1.2.3