From 63b1ab12f614cefbff8b2c72fac82434fd8c8de9 Mon Sep 17 00:00:00 2001
From: Nathan Harold <nharold@google.com>
Date: Wed, 2 Jan 2019 20:39:06 -0800
Subject: [PATCH 1/2] Fix BandMode Dialog Crash on Open due to Style

This sidesteps an error saying that the radio
BandMode activity must inherit from an AppCompat
style. Instead the window is now full-screen and
matches the theme of the RadioInfo menu.

Bug: 117571514
Test: manual - open the activity without a crash and
      verify that the new style change is effective.
Change-Id: I6e49d731e039709db43dfa6531723781e9e48640
---
 AndroidManifest.xml                    | 3 +--
 res/layout/band_mode.xml               | 2 +-
 src/com/android/settings/BandMode.java | 5 -----
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 17f83035463..6532f193677 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2172,9 +2172,8 @@
             </intent-filter>
         </activity>
 
-        <!-- TODO: Is this needed? -->
         <activity android:name="BandMode"
-                  android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"
+                  android:label="@string/band_mode_title"
                   android:process="com.android.phone">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/res/layout/band_mode.xml b/res/layout/band_mode.xml
index ddbc7ae8951..b43dd1d70a4 100644
--- a/res/layout/band_mode.xml
+++ b/res/layout/band_mode.xml
@@ -19,7 +19,7 @@
               android:padding="4dip"
               android:gravity="center_horizontal"
               android:layout_width="match_parent"
-              android:layout_height="match_parent">
+              android:layout_height="wrap_content">
 
     <ListView android:id="@+id/band"
               android:layout_width="match_parent"
diff --git a/src/com/android/settings/BandMode.java b/src/com/android/settings/BandMode.java
index b1302952429..e172a5c6fd7 100644
--- a/src/com/android/settings/BandMode.java
+++ b/src/com/android/settings/BandMode.java
@@ -73,13 +73,8 @@ public class BandMode extends Activity {
         super.onCreate(icicle);
 
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
-
         setContentView(R.layout.band_mode);
 
-        setTitle(getString(R.string.band_mode_title));
-        getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT,
-                                    WindowManager.LayoutParams.WRAP_CONTENT);
-
         mPhone = PhoneFactory.getDefaultPhone();
 
         mBandList = (ListView) findViewById(R.id.band);

From 0b6402ab3aeffab97f65a725687669493f9313c7 Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Tue, 8 Jan 2019 09:43:22 -0500
Subject: [PATCH 2/2] Charging sounds toggle now includes vibration

Add text to indicate the charging sounds toggle also
includes vibration

Test: manual, builds
Bug: 29737261
Change-Id: I55e35ea63b8e80aa5573ef676fdde4b28bc0f654
---
 res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index cbdedf0cbde..7e628e61974 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7127,8 +7127,8 @@
     <!-- Sound: Other sounds: Title for the option enabling touch sounds for screen locking sounds. [CHAR LIMIT=30] -->
     <string name="screen_locking_sounds_title">Screen locking sounds</string>
 
-    <!-- Sound: Other sounds: Title for the option enabling charging sounds. [CHAR LIMIT=30] -->
-    <string name="charging_sounds_title">Charging sounds</string>
+    <!-- Sound: Other sounds: Title for the option enabling charging sounds and vibration. [CHAR LIMIT=30] -->
+    <string name="charging_sounds_title">Charging sounds and vibration</string>
 
     <!-- Sound: Other sounds: Title for the option enabling docking sounds. [CHAR LIMIT=30] -->
     <string name="docking_sounds_title">Docking sounds</string>