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

Commit d582c38b authored by Jean Chalard's avatar Jean Chalard Committed by Android (Google) Code Review
Browse files

Merge "Remove a couple Eclipse and Android Lint warnings"

parents a2118718 2da88665

java/res/values-sw600dp/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
-->



<resources>

    <!-- Device form factor. This value must be aligned with {@link KeyboardId.DEVICE_FORM_FACTOR_TABLET7} -->

    <!-- Device form factor. This value must be aligned with {@link KeyboardId.FORM_FACTOR_TABLET7} -->

    <integer name="config_device_form_factor">1</integer>

    <bool name="config_enable_show_voice_key_option">false</bool>

    <bool name="config_enable_show_popup_on_keypress_option">false</bool>

java/res/values-sw768dp/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
-->



<resources>

    <!-- Device form factor. This value must be aligned with {@link KeyboardId.DEVICE_FORM_FACTOR_TABLET10} -->

    <!-- Device form factor. This value must be aligned with {@link KeyboardId.FORM_FACTOR_TABLET10} -->

    <integer name="config_device_form_factor">2</integer>

    <bool name="config_enable_show_voice_key_option">false</bool>

    <bool name="config_enable_show_popup_on_keypress_option">false</bool>

java/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
-->



<resources>

    <!-- Device form factor. This value must be aligned with {@link KeyboardId.DEVICE_FORM_FACTOR_PHONE} -->

    <!-- Device form factor. This value must be aligned with {@link KeyboardId.FORM_FACTOR_PHONE} -->

    <integer name="config_device_form_factor">0</integer>

    <bool name="config_use_fullscreen_mode">false</bool>

    <bool name="config_enable_show_voice_key_option">true</bool>

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

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.inputmethod.latin;



import android.annotation.SuppressLint;

import android.content.Context;

import android.content.SharedPreferences;

import android.content.pm.PackageInfo;

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

+1 −1
Original line number Diff line number Diff line
@@ -1085,7 +1085,7 @@ public final class LatinIME extends InputMethodService implements KeyboardAction 
    public boolean onEvaluateFullscreenMode() {

        // Reread resource value here, because this method is called by framework anytime as needed.

        final boolean isFullscreenModeAllowed =

                mCurrentSettings.isFullscreenModeAllowed(getResources());

                SettingsValues.isFullscreenModeAllowed(getResources());

        if (super.onEvaluateFullscreenMode() && isFullscreenModeAllowed) {

            // TODO: Remove this hack. Actually we should not really assume NO_EXTRACT_UI

            // implies NO_FULLSCREEN. However, the framework mistakenly does.  i.e. NO_EXTRACT_UI