Merge "Move bubble settings to their own page"

diff --combined AndroidManifest.xml
index 51f6681,7b2935b..651ef48
--- 1/AndroidManifest.xml
--- 2/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@@ -2455,6 -2455,18 +2455,18 @@@
          </activity>
  
          <activity
+             android:name="Settings$AppBubbleNotificationSettingsActivity"
+             android:label="@string/bubbles_app_toggle_title"
+             android:parentActivityName="Settings$NotificationAppListActivity">
+             <intent-filter android:priority="1">
+                 <action android:name="android.settings.APP_NOTIFICATION_BUBBLE_SETTINGS" />
+                 <category android:name="android.intent.category.DEFAULT" />
+             </intent-filter>
+             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                        android:value="com.android.settings.notification.AppBubbleNotificationSettings" />
+         </activity>
+ 
+         <activity
              android:name="Settings$SoundSettingsActivity"
              android:label="@string/sound_settings"
              android:icon="@drawable/ic_homepage_sound"
@@@ -2566,7 -2578,7 +2578,7 @@@
  
          <receiver android:name=".sim.SimSelectNotification">
              <intent-filter>
 -                <action android:name="android.intent.action.PRIMARY_SUBSCRIPTION_LIST_CHANGED"/>
 +                <action android:name="android.telephony.action.PRIMARY_SUBSCRIPTION_LIST_CHANGED"/>
              </intent-filter>
          </receiver>
  

diff --combined res/values/strings.xml
index c56fae7,b96398f..b27e9d0
--- 1/res/values/strings.xml
--- 2/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -2284,8 -2284,6 +2284,8 @@@
      </plurals>
      <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
      <string name="wifi_advanced_titlebar">Advanced Wi\u2011Fi</string>
 +    <!-- Wi-Fi settings screen, advanced, title of the item to show the Wi-Fi device's SSID. [CHAR LIMIT=20] -->
 +    <string name="wifi_advanced_ssid_title">SSID</string>
      <!-- Wi-Fi settings screen, advanced, title of the item to show the Wi-Fi device's MAC address. -->
      <string name="wifi_advanced_mac_address_title">MAC address</string>
      <!-- Title of the screen to adjust IP settings -->
@@@ -7791,9 -7789,9 +7791,9 @@@
      <string name="notification_badging_title">Allow notification dots</string>
  
      <!-- Configure Notifications: Title for the notification bubbles option. [CHAR LIMIT=60] -->
-     <string name="notification_bubbles_title">Allow bubbles</string>
+     <string name="notification_bubbles_title">Bubbles</string>
      <!-- Configure Notifications: Summary for the notification bubbles option. [CHAR LIMIT=NONE] -->
-     <string name="notification_bubbles_summary">Allow apps to show some notifications as bubbles</string>
+     <string name="notification_bubbles_summary">Quickly access app content from anywhere using floating shortcuts</string>
      <!-- Feature education for bubbles. [CHAR LIMIT=NONE] -->
      <string name="bubbles_feature_education">Some notifications and other content can appear as bubbles on the screen. To open a bubble, tap it. To dismiss it, drag it down the screen.</string>
      <!-- Title for the toggle shown on the app-level bubbles page  [CHAR LIMIT=60] -->
@@@ -11032,7 -11030,4 +11032,7 @@@
      <string name="automatic_system_heap_dump_title">Automatically capture system heap dumps</string>
      <!-- Summary of toggle for whether to enable automatic heap dumps for the system server or not. [CHAR LIMIT=NONE] -->
      <string name="automatic_system_heap_dump_summary">Automatically capture a heap dump for Android System when it uses too much memory</string>
 +
 +    <!-- Button label to disconnect a Wi-Fi network. [CHAR LIMIT=40] -->
 +    <string name="wifi_disconnect_button_text">Disconnect</string>
  </resources>