Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a715d7f6 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Use fragment for keyboard theme settings 

Bug: 11866784
Change-Id: Ic50b6eb1bd8f2b823e2c9dfad04d8615bc910936
parent 6c39db9f

java/res/layout/radio_button_preference_widget.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 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.

-->



<RadioButton

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/radio_button"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:clickable="false"

    android:focusable="false" />

java/res/xml/prefs.xml

+3 −5
Original line number Diff line number Diff line
@@ -22,12 +22,10 @@ 
        android:fragment="com.android.inputmethod.latin.settings.InputSettingsFragment"

        android:title="@string/settings_screen_input"

        android:key="screen_input" />

    <ListPreference

        android:key="pref_keyboard_theme"

    <PreferenceScreen

        android:fragment="com.android.inputmethod.latin.settings.ThemeSettingsFragment"

        android:title="@string/keyboard_theme"

        android:entryValues="@array/keyboard_theme_ids"

        android:entries="@array/keyboard_theme_names"

        android:persistent="true" />

        android:key="screen_theme" />

    <PreferenceScreen

        android:fragment="com.android.inputmethod.latin.settings.MultiLingualSettingsFragment"

        android:title="@string/settings_screen_multi_lingual"

java/res/xml/prefs_screen_theme.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 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.

-->



<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"

    android:title="@string/keyboard_theme"

    android:key="screen_theme">

    <!-- Keyboard theme list will be populated programmatically here. -->

</PreferenceScreen>

java/src/com/android/inputmethod/latin/settings/GestureSettingsFragment.java

+0 −5
Original line number Diff line number Diff line
@@ -36,9 +36,4 @@ public final class GestureSettingsFragment extends SubScreenFragment { 
        super.onCreate(icicle);

        addPreferencesFromResource(R.xml.prefs_screen_gesture);

    }



    @Override

    public void onSharedPreferenceChanged(final SharedPreferences prefs, final String key) {

        // Nothing to do here.

    }

}

java/src/com/android/inputmethod/latin/settings/MultiLingualSettingsFragment.java

+0 −5
Original line number Diff line number Diff line
@@ -63,11 +63,6 @@ public final class MultiLingualSettingsFragment extends SubScreenFragment { 
        updateCustomInputStylesSummary();

    }



    @Override

    public void onSharedPreferenceChanged(final SharedPreferences prefs, final String key) {

        // Nothing to do here.

    }



    private void updateCustomInputStylesSummary() {

        final SharedPreferences prefs = getSharedPreferences();

        final Resources res = getResources();