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

Commit 3a2b9035 authored by satok's avatar satok Committed by Android (Google) Code Review
Browse files

Merge "Add Debug Settings Activity" into gingerbread

parents 89711080 bf96661d

java/AndroidManifest.xml

+6 −0
Original line number Diff line number Diff line
@@ -26,6 +26,12 @@ 
            </intent-filter>

        </activity>



        <activity android:name="LatinIMEDebugSettings" android:label="@string/english_ime_debug_settings">

            <intent-filter>

                <action android:name="android.intent.action.MAIN"/>

            </intent-filter>

        </activity>



        <activity android:name="InputLanguageSelection"

                android:label="@string/language_selection_title">

            <intent-filter>

java/res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -372,4 +372,8 @@ 


    <string name="subtype_mode_keyboard">keyboard</string>

    <string name="subtype_mode_voice">voice</string>



    <!-- Title for Latin keyboard debug settings activity / dialog -->

    <string name="english_ime_debug_settings" translatable="false">Android keyboard Debug settings</string>

    <string name="prefs_debug_mode" translatable="false">Debug Mode</string>

</resources>

java/res/xml/prefs.xml

+0 −16
Original line number Diff line number Diff line
@@ -51,14 +51,6 @@ 
            android:defaultValue="true"

            />



    <!-- <CheckBoxPreference

            android:key="enable_logging"

            android:title="@string/prefs_enable_log"

            android:summary="@string/prefs_description_log"

            android:persistent="true"

            android:defaultValue="false"

            />-->



    <ListPreference

            android:key="settings_key"

            android:title="@string/prefs_settings_key"
@@ -77,14 +69,6 @@ 
            android:defaultValue="@string/voice_mode_main"

            />



    <!-- <ListPreference

            android:key="keyboard_layout"

            android:title="@string/keyboard_layout"

            android:persistent="true"

            android:entryValues="@array/keyboard_layout_modes_values"

            android:entries="@array/keyboard_layout_modes"

            android:defaultValue="4"

            />-->



    <PreferenceScreen

            android:title="@string/language_selection_title"

java/res/xml/prefs_for_debug.xml

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

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

        android:title="@string/prefs_debug_mode"

        android:key="english_ime_debug_settings">



    <CheckBoxPreference

            android:key="enable_logging"

            android:title="@string/prefs_enable_log"

            android:summary="@string/prefs_description_log"

            android:persistent="true"

            android:defaultValue="false"

            />



    <ListPreference

            android:key="pref_keyboard_layout_20100902"

            android:title="@string/keyboard_layout"

            android:persistent="true"

            android:entryValues="@array/keyboard_layout_modes_values"

            android:entries="@array/keyboard_layout_modes"

            android:defaultValue="4"

            />



    <CheckBoxPreference

            android:key="debug_mode"

            android:title="@string/prefs_debug_mode"

            android:persistent="true"

            android:defaultValue="false"

            />



</PreferenceScreen>

java/src/com/android/inputmethod/latin/LatinIME.java

+6 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import android.os.Debug; 
import android.os.Handler;

import android.os.Message;

import android.os.SystemClock;

import android.preference.PreferenceActivity;

import android.preference.PreferenceManager;

import android.speech.SpeechRecognizer;

import android.text.ClipboardManager;
@@ -2399,7 +2400,11 @@ public class LatinIME extends InputMethodService 
        launchSettings(LatinIMESettings.class);

    }



    protected void launchSettings(Class<LatinIMESettings> settingsClass) {

    public void launchDebugSettings() {

        launchSettings(LatinIMEDebugSettings.class);

    }



    protected void launchSettings (Class<? extends PreferenceActivity> settingsClass) {

        handleClose();

        Intent intent = new Intent();

        intent.setClass(LatinIME.this, settingsClass);