PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add SettingsMultiSelectListPreference style" into pi-dev

Browse Source 
am: 106825383a

Change-Id: I6a796081208050d58a42a32ec69a2bd20cee1fcf
This commit is contained in:
Yoshinori Hirano
2018-03-07 04:19:47 +00:00
committed by android-build-merger
parent 9f6608a729 106825383a
commit fd8527901e
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/values/styles_preference.xml
View File

@@ -40,4 +40,9 @@
<item name="android:layout">@layout/two_state_button</item> <item name="android:layout">@layout/two_state_button</item>
</style> </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> </resources>

1
res/xml/apn_editor.xml
View File

@@ -157,6 +157,7 @@
android:entries="@array/bearer_entries" android:entries="@array/bearer_entries"
android:entryValues="@array/bearer_values" android:entryValues="@array/bearer_values"
android:persistent="false" android:persistent="false"
style="@style/SettingsMultiSelectListPreference"
/> />
<ListPreference <ListPreference
android:title="@string/mvno_type" android:title="@string/mvno_type"