From e83576c5503596480d57ff9991df4ad99d26cfc4 Mon Sep 17 00:00:00 2001
From: Andrew Lee <anwlee@google.com>
Date: Thu, 26 Feb 2015 14:26:16 -0800
Subject: Convert GeneralSettings to SoundSettings.

Rather than create a new fragment for "Sounds and vibration", reuse
the existing general settings fragment.

The other settings which used to reside general settings have been
moved into their own top-level settings fragments.

+ Rename layout file and fragment.
+ Tweak string names.
- Delete category heading; no longer necessary.

Bug: 19372734
Change-Id: I5690df7ecbd49da5d5af94889e6b68e053ce25ba
---
 res/values/strings.xml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'res/values/strings.xml')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index ab8fd2754..1e7a48b2d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -694,12 +694,9 @@
          [CHAR LIMIT=40] -->
     <string name="display_options_title">Display options</string>
 
-    <!-- Label for the general dialer settings section [CHAR LIMIT=30]-->
-    <string name="general_settings_label">General</string>
-
-    <!-- Title for the category "sounds", which is shown above sounds and vibration related
-         settings. [CHAR LIMIT=30] -->
-    <string name="sounds_and_vibrate_category_title">Sounds and vibrate</string>
+    <!-- Title for the "Sounds and vibration" settings control settings related to ringtones,
+         dialpad tones, and vibration for incoming calls. [CHAR LIMIT=40] -->
+    <string name="sounds_and_vibration_title">Sounds and vibration</string>
 
     <!-- Setting option name to pick ringtone (a list dialog comes up). [CHAR LIMIT=30] -->
     <string name="ringtone_title">Phone ringtone</string>
-- 
cgit v1.2.3