commit 8378efc6af0d5fee9ad5094d3a0eb4a4f938b76f
author Treehugger Robot <treehugger-gerrit@google.com> Sat Feb 24 23:28:45 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Feb 24 23:28:45 2018 +0000
tree 06dd7d541d8a9efe0d24066f96c8cb7de218fd3d
parent ad84c9552df72f64c4e7ffd36ce81b050f5ba1cb
parent d3bb6c645992b3440159c3b72a69b6370714d776

Merge "Add SettingsMultiSelectListPreference style DO NOT MERGE"

res/values/styles_preference.xml

diff --git a/res/values/styles_preference.xml b/res/values/styles_preference.xml
index 056d55a..99ccdfc 100644
--- a/res/values/styles_preference.xml
+++ b/res/values/styles_preference.xml
@@ -36,4 +36,9 @@
         <item name="android:widgetLayout">@layout/preference_widget_sync_toggle</item>
     </style>
 
+    <style name="SettingsMultiSelectListPreference" parent="Preference.SettingsBase">
+        <item name="android:positiveButtonText">@android:string/ok</item>
+        <item name="android:negativeButtonText">@android:string/cancel</item>
+    </style>
+
 </resources>
\ No newline at end of file

res/xml/apn_editor.xml

diff --git a/res/xml/apn_editor.xml b/res/xml/apn_editor.xml
index b1e332b..742a436 100644
--- a/res/xml/apn_editor.xml
+++ b/res/xml/apn_editor.xml
@@ -157,6 +157,7 @@
         android:entries="@array/bearer_entries"
         android:entryValues="@array/bearer_values"
         android:persistent="false"
+        style="@style/SettingsMultiSelectListPreference"
         />
     <ListPreference
         android:title="@string/mvno_type"