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

Commit ba0e497a authored by Baligh Uddin's avatar Baligh Uddin
Browse files

Merge commit '525bbec9' into jb-mr2-dev

parents 559616fb 525bbec9

java/res/values-pl/strings-appname.xml

+6 −3
Original line number Diff line number Diff line
@@ -21,7 +21,10 @@ 
<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="english_ime_name" msgid="178705338187710493">"Klawiatura Android"</string>

    <string name="spell_checker_service_name" msgid="6268342166872202903">"Sprawdzanie pisowni w Androidzie"</string>

    <string name="english_ime_settings" msgid="7470027018752707691">"Ustawienia klawiatury Android"</string>

    <string name="android_spell_checker_settings" msgid="8397842018475560441">"Ustawienia sprawdzania pisowni"</string>

    <!-- no translation found for spell_checker_service_name (6268342166872202903) -->

    <skip />

    <!-- no translation found for english_ime_settings (7470027018752707691) -->

    <skip />

    <!-- no translation found for android_spell_checker_settings (8397842018475560441) -->

    <skip />

</resources>

java/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -308,6 +308,8 @@ 
      - operation[CHAR LIMIT=100] -->

    <!-- TODO: remove translatable=false attribute once text is stable -->

    <string name="research_feedback_demonstration_instructions" translatable="false">Please demonstrate the issue you are writing about.\n\nWhen finished, select the \"Bug?\" button again."</string>

    <!-- Title of a preference to send feedback. [CHAR LIMIT=30]-->

    <string name="send_feedback">Send feedback</string>

    <!-- Temporary notification of recording failure [CHAR LIMIT=100] -->

    <!-- TODO: remove translatable=false attribute once text is stable -->

    <string name="research_feedback_recording_failure" translatable="false">Recording cancelled due to timeout</string>

java/res/xml/prefs.xml

+3 −0
Original line number Diff line number Diff line
@@ -176,6 +176,9 @@ 
                android:key="pref_show_setup_wizard_icon"

                android:title="@string/show_setup_wizard_icon" />

        </PreferenceScreen>

        <PreferenceScreen

            android:key="send_feedback"

            android:title="@string/send_feedback" />

        <PreferenceScreen

            android:key="debug_settings"

            android:title="Debug settings"

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

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ public final class DebugSettings extends PreferenceFragment 
        if (usabilityStudyPref instanceof CheckBoxPreference) {

            final CheckBoxPreference checkbox = (CheckBoxPreference)usabilityStudyPref;

            checkbox.setChecked(prefs.getBoolean(PREF_USABILITY_STUDY_MODE,

                    ResearchLogger.DEFAULT_USABILITY_STUDY_MODE));

                    LatinImeLogger.getUsabilityStudyMode(prefs)));

            checkbox.setSummary(R.string.settings_warning_researcher_mode);

        }

        final Preference statisticsLoggingPref = findPreference(PREF_STATISTICS_LOGGING);

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

0 → 100644
+28 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013 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;



public class FeedbackUtils {

    public static boolean isFeedbackFormSupported() {

        return false;

    }



    public static void showFeedbackForm(Context context) {

    }

}