nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 032bac3e: Merge "Fix crash while settings custom input style" 

* commit '032bac3ebbf37adbe879bd9dea2364571e3c91d6':
  Fix crash while settings custom input style
main
Tadashi G. Takaoka 2014-11-28 03:01:03 +00:00 committed by Android Git Automerger
parent 041a7291a7 032bac3ebb
commit 4ea7092aa3
3 changed files with 60 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
java/res/layout/additional_subtype_dialog.xml
View File

@ -38,7 +38,6 @@
android:text="@string/subtype_locale" />
<Spinner
android:id="@+id/subtype_locale_spinner"
android:spinnerMode="dialog"
android:layout_width="0dp"
android:layout_weight="70"
android:layout_height="wrap_content"
@ -47,7 +46,8 @@
android:layout_marginTop="8dip"
android:layout_gravity="fill_horizontal|center_vertical"
android:gravity="start|left"
android:prompt="@string/subtype_locale" />
android:prompt="@string/subtype_locale"
style="@style/additionalSubtypeSpinnerStyle" />
</LinearLayout>
<LinearLayout
android:orientation="horizontal"
@ -63,7 +63,6 @@
android:text="@string/keyboard_layout_set" />
<Spinner
android:id="@+id/keyboard_layout_set_spinner"
android:spinnerMode="dialog"
android:layout_width="0dp"
android:layout_weight="70"
android:layout_height="wrap_content"
@ -72,6 +71,7 @@
android:layout_marginTop="8dip"
android:layout_gravity="fill_horizontal|center_vertical"
android:gravity="start|left"
android:prompt="@string/keyboard_layout_set" />
android:prompt="@string/keyboard_layout_set"
style="@style/additionalSubtypeSpinnerStyle" />
</LinearLayout>
</LinearLayout>

28
java/res/values-v19/spinner-style.xml Normal file
View File

@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2014, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Until KitKat (API 19), {@link android.widget.Spinner} of dialog mode in a Dialog can't
handle orientation change correctly. Using dropdown mode avoids the issue.
This file overrides values/spinner-style.xml on KitKat and newer device. -->
<style name="additionalSubtypeSpinnerStyle">
<item name="android:spinnerMode">dialog</item>
</style>
</resources>

28
java/res/values/spinner-style.xml Normal file
View File

@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2014, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Until KitKat (API 19), {@link android.widget.Spinner} of dialog mode in a Dialog can't
handle orientation change correctly. Using dropdown mode avoids the issue.
This file is overrode by values-v19/spinner-style.xml on KitKat and newer device. -->
<style name="additionalSubtypeSpinnerStyle">
<item name="android:spinnerMode">dropdown</item>
</style>
</resources>