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

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

Remove device checking of Emoji physical key 

This CL also adds a settings option to enable/disable an Emoji-ALT
physical key.

Bug: 18122464
Change-Id: Iee1d97efec979a902b0492071d5e511ca1792ff0
parent 53b01038

java-overridable/src/com/android/inputmethod/latin/SpecialKeyDetector.java

deleted100644 → 0
+0 −43
Original line number Diff line number Diff line 
/*

 * 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.

 */



package com.android.inputmethod.latin;



import android.content.Context;

import android.view.KeyEvent;



final class SpecialKeyDetector {

    /**

     * Special physical key detector

     * @param context a context of this detector.

     */

    public SpecialKeyDetector(final Context context) {

    }



    /**

     * Record a down key event.

     * @param keyEvent a down key event.

     */

    public void onKeyDown(final KeyEvent keyEvent) {

    }



    /**

     * Record an up key event.

     * @param keyEvent an up key event.

     */

    public void onKeyUp(final KeyEvent keyEvent) {

    }

}

java/res/values/donottranslate-debug-settings.xml

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
    <string name="english_ime_debug_settings">Android Keyboard Debug settings</string>

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

    <string name="prefs_force_non_distinct_multitouch">Force non-distinct multitouch</string>

    <string name="prefs_force_physical_keyboard_special_key">Force physical keyboard special key</string>

    <string name="prefs_should_show_lxx_suggestion_ui">Show LXX suggestion UI</string>

    <!-- Option to enable sliding key input indicator. The user can see a rubber band-like effect during sliding key input. [CHAR LIMIT=30]-->

    <string name="sliding_key_input_preview">Show slide indicator</string>

java/res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -363,6 +363,12 @@ mobile devices. [CHAR LIMIT=25] --> 
    <string name="prefs_keypress_sound_volume_settings">Keypress sound volume</string>

    <!-- Title of the settings for key long press delay [CHAR LIMIT=35] -->

    <string name="prefs_key_longpress_timeout_settings">Key long press delay</string>

    <!-- TODO: Let's finalize title of the settings and remove translatable="false" -->

    <!-- Title of the settings for enabling Emoji palette triggered by the Alt key on physical keyboards [CHAR LIMIT=35] -->

    <string name="prefs_enable_emoji_alt_physical_key" translatable="false">Emoji for physical keyboard</string>

    <!-- TODO: Let's finalize title of the settings and remove translatable="false" -->

    <!-- Description of the settings for enabling Emoji palette triggered by the Alt key on physical keyboards [CHAR LIMIT=64] -->

    <string name="prefs_enable_emoji_alt_physical_key_summary" translatable="false">Physical Alt key shows the emoji palette</string>



    <!-- Title of the button to revert to the default value of the device in the settings dialog [CHAR LIMIT=15] -->

    <string name="button_default">Default</string>

java/res/xml/prefs_screen_advanced.xml

+6 −0
Original line number Diff line number Diff line
@@ -37,6 +37,12 @@ 
        latin:minValue="@integer/config_min_longpress_timeout"

        latin:maxValue="@integer/config_max_longpress_timeout"

        latin:stepValue="@integer/config_longpress_timeout_step" />

    <CheckBoxPreference

        android:key="pref_enable_emoji_alt_physical_key"

        android:title="@string/prefs_enable_emoji_alt_physical_key"

        android:summary="@string/prefs_enable_emoji_alt_physical_key_summary"

        android:defaultValue="true"

        android:persistent="true" />

    <!-- The settings for showing setup wizard application icon shouldn't be persistent and

         the default value is added programmatically. -->

    <CheckBoxPreference

java/res/xml/prefs_screen_debug.xml

+0 −5
Original line number Diff line number Diff line
@@ -30,11 +30,6 @@ 
        android:title="@string/prefs_force_non_distinct_multitouch"

        android:defaultValue="false"

        android:persistent="true" />

    <CheckBoxPreference

        android:key="force_physical_keyboard_special_key"

        android:title="@string/prefs_force_physical_keyboard_special_key"

        android:defaultValue="false"

        android:persistent="true" />

    <CheckBoxPreference

        android:key="pref_should_show_lxx_suggestion_ui"

        android:title="@string/prefs_should_show_lxx_suggestion_ui"