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

Commit 724bc479 authored by Kurt Partridge's avatar Kurt Partridge
Browse files

add research log ui control 

- lets users flag a particular time in the research log
- lets users delete the log for this session

also makes the UsabilityLog setting control whether the ResearchLog logs or not.

multi-project commit with I89067e7d3b8daca7179333f1dbe82224c26920fe

Bug: 6188932
Change-Id: I89864ef3ab53b0efe1ea8d75247be08712f0c399
parent f739119f

java/res/values/strings.xml

+16 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
    <string name="english_ime_settings">Android keyboard settings</string>

    <!-- Title for Latin keyboard input options dialog [CHAR LIMIT=25] -->

    <string name="english_ime_input_options">Input options</string>

    <!-- Title for Latin keyboard research log dialog, which contains special commands for users that contribute data for research. [CHAR LIMIT=25] -->

    <string name="english_ime_research_log">Research Log Commands</string>



    <!-- Name of Android spell checker service -->

    <string name="spell_checker_service_name">Android spell checker</string>
@@ -233,6 +235,20 @@ 
    <!-- Title for input language selection screen -->

    <string name="language_selection_title">Input languages</string>



    <!-- Title for dialog option that lets user mark a particular time in the log for later review by experts [CHAR LIMIT=25] -->

    <string name="note_timestamp_for_researchlog">Note timestamp in log</string>

    <!-- Toast notification message that the time has been marked for later review. [CHAR LIMIT=25] -->

    <string name="notify_recorded_timestamp">Recorded timestamp</string>



    <!-- Title for dialog option to let users cancel logging and delete log for this session [CHAR LIMIT=25] -->

    <string name="do_not_log_this_session">Do not log this session</string>

    <!-- Toast notification that the system is processing the request to delete the log for this session [CHAR LIMIT=25] -->

    <string name="notify_session_log_deleting">Deleting session log</string>

    <!-- Toast notification that the system has successfully deleted the log for this session [CHAR LIMIT=25] -->

    <string name="notify_session_log_deleted">Session log deleted</string>

    <!-- Toast notification that the system has failed to delete the log for this session [CHAR LIMIT=25] -->

    <string name="notify_session_log_not_deleted">Session log NOT deleted</string>



    <!-- Preference for input language selection -->

    <string name="select_language">Input languages</string>

java/res/xml/key_styles_common.xml

+2 −17
Original line number Diff line number Diff line
@@ -22,23 +22,8 @@ 
    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"

>

    <!-- Base key style for the key which may have settings or tab key as popup key. -->

    <switch>

        <case

            latin:clobberSettingsKey="true"

        >

            <key-style

                latin:styleName="f1MoreKeysStyle"

                latin:backgroundType="functional" />

        </case>

        <!-- clobberSettingsKey="false" -->

        <default>

            <key-style

                latin:styleName="f1MoreKeysStyle"

                latin:keyLabelFlags="hasPopupHint"

                latin:moreKeys="!text/settings_as_more_key"

                latin:backgroundType="functional" />

        </default>

    </switch>

    <include

        latin:keyboardLayout="@xml/key_styles_f1" />

    <!-- Functional key styles -->

    <switch>

        <case

java/res/xml/key_styles_f1.xml

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

<!--

/*

**

** Copyright 2012, 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.

*/

-->



<merge

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

>

    <!-- Base key style for the key which may have settings or tab key as popup key. -->

    <!-- Kept as a separate file for cleaner overriding by an overlay.  -->

    <switch>

        <case

            latin:clobberSettingsKey="true"

        >

            <key-style

                latin:styleName="f1MoreKeysStyle"

                latin:backgroundType="functional" />

        </case>

        <!-- clobberSettingsKey="false" -->

        <default>

            <key-style

                latin:styleName="f1MoreKeysStyle"

                latin:keyLabelFlags="hasPopupHint"

                latin:moreKeys="!text/settings_as_more_key"

                latin:backgroundType="functional" />

        </default>

    </switch>

</merge>

java/src/com/android/inputmethod/keyboard/Keyboard.java

+4 −2
Original line number Diff line number Diff line
@@ -89,7 +89,8 @@ public class Keyboard { 
    private static final int MINIMUM_LETTER_CODE = CODE_TAB;



    /** Special keys code. Must be negative.

     * These should be aligned with values/keycodes.xml

     * These should be aligned with KeyboardCodesSet.ID_TO_NAME[],

     * KeyboardCodesSet.DEFAULT[] and KeyboardCodesSet.RTL[]

     */

    public static final int CODE_SHIFT = -1;

    public static final int CODE_SWITCH_ALPHA_SYMBOL = -2;
@@ -101,8 +102,9 @@ public class Keyboard { 
    public static final int CODE_ACTION_NEXT = -8;

    public static final int CODE_ACTION_PREVIOUS = -9;

    public static final int CODE_LANGUAGE_SWITCH = -10;

    public static final int CODE_RESEARCH = -11;

    // Code value representing the code is not specified.

    public static final int CODE_UNSPECIFIED = -11;

    public static final int CODE_UNSPECIFIED = -12;



    public final KeyboardId mId;

    public final int mThemeId;

java/src/com/android/inputmethod/keyboard/internal/KeyboardCodesSet.java

+3 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ public class KeyboardCodesSet { 
        "key_action_next",

        "key_action_previous",

        "key_language_switch",

        "key_research",

        "key_unspecified",

        "key_left_parenthesis",

        "key_right_parenthesis",
@@ -86,6 +87,7 @@ public class KeyboardCodesSet { 
        Keyboard.CODE_ACTION_NEXT,

        Keyboard.CODE_ACTION_PREVIOUS,

        Keyboard.CODE_LANGUAGE_SWITCH,

        Keyboard.CODE_RESEARCH,

        Keyboard.CODE_UNSPECIFIED,

        CODE_LEFT_PARENTHESIS,

        CODE_RIGHT_PARENTHESIS,
@@ -112,6 +114,7 @@ public class KeyboardCodesSet { 
        DEFAULT[11],

        DEFAULT[12],

        DEFAULT[13],

        DEFAULT[14],

        CODE_RIGHT_PARENTHESIS,

        CODE_LEFT_PARENTHESIS,

        CODE_GREATER_THAN_SIGN,