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

Commit ef750bca authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge tag 'android-5.1.1_r1' of... 

Merge tag 'android-5.1.1_r1' of https://android.googlesource.com/platform/frameworks/base into cm-12.1

Android 5.1.1 release 1

Change-Id: I8fc77b035286a4e21663b1dc1be774291e138035
parents 973e858a 51c23674

core/java/android/view/accessibility/AccessibilityNodeInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -721,7 +721,7 @@ public class AccessibilityNodeInfo implements Parcelable { 
     * @return Whether the refresh succeeded.

     */

    public boolean refresh() {

        return refresh(false);

        return refresh(true);

    }



    /**

data/fonts/fallback_fonts.xml

+8 −10
Original line number Diff line number Diff line
@@ -333,11 +333,6 @@ 
            <file>NotoSansTagbanwa-Regular.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file>NotoSansTaiLe-Regular.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file>NotoSansTaiTham-Regular.ttf</file>
@@ -408,10 +403,13 @@ 
            <file lang="ja">MTLmr3m.ttf</file>

        </fileset>

    </family>

    <!-- Note: complex scripts (i.e. those requiring shaping in Harfbuzz) have

         a cumulative limit of 64k glyphs. Thus, if they are placed after the

         large fonts such as DroidSansFallback, they are likely to render

         incorrectly. Please use caution when putting fonts toward the end of

         the list.

    <!--

        Noto Sans Tai Le is intentionally kept last, to make sure it doesn't override

        the East Asian punctuation for Chinese.

    -->

    <family>

        <fileset>

            <file>NotoSansTaiLe-Regular.ttf</file>

        </fileset>

    </family>

</familyset>

data/fonts/fonts.xml

+7 −3
Original line number Diff line number Diff line
@@ -287,9 +287,6 @@ 
    <family>

        <font weight="400" style="normal">NotoSansTagbanwa-Regular.ttf</font>

    </family>

    <family>

        <font weight="400" style="normal">NotoSansTaiLe-Regular.ttf</font>

    </family>

    <family>

        <font weight="400" style="normal">NotoSansTaiTham-Regular.ttf</font>

    </family>
@@ -332,4 +329,11 @@ 
    <family lang="ja">

        <font weight="400" style="normal">MTLmr3m.ttf</font>

    </family>

    <!--

        Noto Sans Tai Le is intentionally kept last, to make sure it doesn't override

        the East Asian punctuation for Chinese.

    -->

    <family>

        <font weight="400" style="normal">NotoSansTaiLe-Regular.ttf</font>

    </family>

</familyset>

packages/SystemUI/src/com/android/systemui/statusbar/NotificationTemplateViewWrapper.java

+2 −1
Original line number Diff line number Diff line
@@ -79,7 +79,8 @@ public class NotificationTemplateViewWrapper extends NotificationViewWrapper { 


        // If the icon already has a color filter, we assume that we already forced the icon to be

        // white when we created the notification.

        mIconForceGraysaleWhenDark = mIcon != null && mIcon.getDrawable().getColorFilter() != null;

        final Drawable iconDrawable = mIcon != null ? mIcon.getDrawable() : null;

        mIconForceGraysaleWhenDark = iconDrawable != null && iconDrawable.getColorFilter() != null;

    }



    private ImageView resolveIcon(ImageView largeIcon, ImageView rightIcon) {

policy/src/com/android/internal/policy/impl/PhoneFallbackEventHandler.java

+60 −35
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ import android.media.session.MediaSessionLegacyHelper; 
import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.UserHandle;

import android.provider.Settings;

import android.telephony.TelephonyManager;

import android.util.Log;

import android.util.Slog;

import android.view.View;

import android.view.HapticFeedbackConstants;

import android.view.FallbackEventHandler;
@@ -117,6 +117,7 @@ public class PhoneFallbackEventHandler implements FallbackEventHandler { 
                    dispatcher.startTracking(event, this);

                } else if (event.isLongPress() && dispatcher.isTracking(event)) {

                    dispatcher.performedLongPress(event);

                    if (isUserSetupComplete()) {

                        mView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);

                        // launch the VoiceDialer

                        Intent intent = new Intent(Intent.ACTION_VOICE_COMMAND);
@@ -127,6 +128,10 @@ public class PhoneFallbackEventHandler implements FallbackEventHandler { 
                        } catch (ActivityNotFoundException e) {

                            startCallActivity();

                        }

                    } else {

                        Log.i(TAG, "Not starting call activity because user "

                                + "setup is in progress.");

                    }

                }

                return true;

            }
@@ -139,6 +144,7 @@ public class PhoneFallbackEventHandler implements FallbackEventHandler { 
                    dispatcher.startTracking(event, this);

                } else if (event.isLongPress() && dispatcher.isTracking(event)) {

                    dispatcher.performedLongPress(event);

                    if (isUserSetupComplete()) {

                        mView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);

                        sendCloseSystemWindows();

                        // Broadcast an intent that the Camera button was longpressed
@@ -146,6 +152,10 @@ public class PhoneFallbackEventHandler implements FallbackEventHandler { 
                        intent.putExtra(Intent.EXTRA_KEY_EVENT, event);

                        mContext.sendOrderedBroadcastAsUser(intent, UserHandle.CURRENT_OR_SELF,

                                null, null, null, 0, null, null);

                    } else {

                        Log.i(TAG, "Not dispatching CAMERA long press because user "

                                + "setup is in progress.");

                    }

                }

                return true;

            }
@@ -160,6 +170,7 @@ public class PhoneFallbackEventHandler implements FallbackEventHandler { 
                    Configuration config = mContext.getResources().getConfiguration();

                    if (config.keyboard == Configuration.KEYBOARD_NOKEYS

                            || config.hardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_YES) {

                        if (isUserSetupComplete()) {

                            // launch the search activity

                            Intent intent = new Intent(Intent.ACTION_SEARCH_LONG_PRESS);

                            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -176,6 +187,10 @@ public class PhoneFallbackEventHandler implements FallbackEventHandler { 
                            } catch (ActivityNotFoundException e) {

                                // Ignore

                            }

                        } else {

                            Log.i(TAG, "Not dispatching SEARCH long press because user "

                                    + "setup is in progress.");

                        }

                    }

                }

                break;
@@ -186,7 +201,7 @@ public class PhoneFallbackEventHandler implements FallbackEventHandler { 


    boolean onKeyUp(int keyCode, KeyEvent event) {

        if (DEBUG) {

            Slog.d(TAG, "up " + keyCode);

            Log.d(TAG, "up " + keyCode);

        }

        final KeyEvent.DispatcherState dispatcher = mView.getKeyDispatcherState();

        if (dispatcher != null) {
@@ -234,7 +249,12 @@ public class PhoneFallbackEventHandler implements FallbackEventHandler { 
                    break;

                }

                if (event.isTracking() && !event.isCanceled()) {

                    if (isUserSetupComplete()) {

                        startCallActivity();

                    } else {

                        Log.i(TAG, "Not starting call activity because user "

                                + "setup is in progress.");

                    }

                }

                return true;

            }
@@ -249,7 +269,7 @@ public class PhoneFallbackEventHandler implements FallbackEventHandler { 
        try {

            mContext.startActivity(intent);

        } catch (ActivityNotFoundException e) {

            Slog.w(TAG, "No activity found for android.intent.action.CALL_BUTTON.");

            Log.w(TAG, "No activity found for android.intent.action.CALL_BUTTON.");

        }

    }
@@ -289,5 +309,10 @@ public class PhoneFallbackEventHandler implements FallbackEventHandler { 
    private void handleMediaKeyEvent(KeyEvent keyEvent) {

        MediaSessionLegacyHelper.getHelper(mContext).sendMediaButtonEvent(keyEvent, false);

    }



    private boolean isUserSetupComplete() {

        return Settings.Secure.getInt(mContext.getContentResolver(),

                Settings.Secure.USER_SETUP_COMPLETE, 0) != 0;

    }

}