From d3bb6c645992b3440159c3b72a69b6370714d776 Mon Sep 17 00:00:00 2001
From: Yoshinori Hirano <Yoshinori.Hirano@sony.com>
Date: Mon, 30 Oct 2017 14:38:57 +0900
Subject: [PATCH] Add SettingsMultiSelectListPreference style DO NOT MERGE

There is no OK and CANCEL button when changing APN Bearer.
To fix this issue, OK and CANCEL button should be added to
SettingsMultiSelectListPreference style.

Fixes: 66928311
Test: manual - Add a new APN and tap Bearer

Change-Id: I2b5719a7c1fdb721b15308e0eef7db3e6398e097
---
 res/values/styles_preference.xml | 5 +++++
 res/xml/apn_editor.xml           | 1 +
 2 files changed, 6 insertions(+)

diff --git a/res/values/styles_preference.xml b/res/values/styles_preference.xml
index 056d55a0997..99ccdfcdde2 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
diff --git a/res/xml/apn_editor.xml b/res/xml/apn_editor.xml
index b1e332bd7c4..742a436019e 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"