Mm6.0

core/java/android/app/ActivityThread.java

@@ -4444,7 +4444,7 @@ private void updateDefaultDensity() {
                     + DisplayMetrics.DENSITY_DEVICE + " to "
                     + mCurDefaultDisplayDpi);
             DisplayMetrics.DENSITY_DEVICE = mCurDefaultDisplayDpi;
-            Bitmap.setDefaultDensity(DisplayMetrics.DENSITY_DEFAULT);
+            Bitmap.setDefaultDensity(DisplayMetrics.DENSITY_DEVICE);
         }
     }
 

core/java/android/content/res/Resources.java

@@ -1968,8 +1968,13 @@ public void updateConfiguration(Configuration config,
                 mConfiguration.setLayoutDirection(mConfiguration.locale);
             }
             if (mConfiguration.densityDpi != Configuration.DENSITY_DPI_UNDEFINED) {
-                mMetrics.densityDpi = mConfiguration.densityDpi;
-                mMetrics.density = mConfiguration.densityDpi * DisplayMetrics.DENSITY_DEFAULT_SCALE;
+                if (DisplayMetrics.DENSITY_DEVICE_DEFAULT == mCompatibilityInfo.applicationDensity
+                        && (config != null
+                        && config.densityDpi == DisplayMetrics.DENSITY_DEVICE_DEFAULT)) {
+                    mMetrics.setDensity(DisplayMetrics.DENSITY_PREFERRED);
+                } else {
+                    mMetrics.setDensity(mConfiguration.densityDpi);
+                }
             }
             mMetrics.scaledDensity = mMetrics.density * mConfiguration.fontScale;
 
@@ -2391,7 +2396,7 @@ public final void startPreloading() {
             }
             sPreloaded = true;
             mPreloading = true;
-            sPreloadedDensity = DisplayMetrics.DENSITY_DEVICE;
+            sPreloadedDensity = DisplayMetrics.DENSITY_PREFERRED;
             mConfiguration.densityDpi = sPreloadedDensity;
             updateConfiguration(null, null);
         }

core/java/android/preference/Preference.java

@@ -1377,10 +1377,18 @@ public void setDefaultValue(Object defaultValue) {
         mDefaultValue = defaultValue;
     }
 
+    /**
+     * Returns whether the preference can be found in persistent storage
+     * @hide
+     */
+    protected boolean isPersisted() {
+        return getSharedPreferences().contains(mKey);
+    }
+
     private void dispatchSetInitialValue() {
         // By now, we know if we are persistent.
         final boolean shouldPersist = shouldPersist();
-        if (!shouldPersist || !getSharedPreferences().contains(mKey)) {
+        if (!shouldPersist || !isPersisted()) {
             if (mDefaultValue != null) {
                 onSetInitialValue(false, mDefaultValue);
             }

core/java/android/util/DisplayMetrics.java

@@ -16,6 +16,7 @@
 
 package android.util;
 
+import android.graphics.Bitmap;
 import android.os.SystemProperties;
 
 
@@ -138,7 +139,20 @@ public class DisplayMetrics {
      * density for a display in {@link #densityDpi}.
      */
     @Deprecated
-    public static int DENSITY_DEVICE = getDeviceDensity();
+    public static int DENSITY_DEVICE;
+
+    /** @hide */
+    public static int DENSITY_PREFERRED;
+
+    /** @hide */
+    public static int DENSITY_DEVICE_DEFAULT;
+
+    static {
+        DENSITY_DEVICE = SystemProperties.getInt("qemu.sf.lcd_density", SystemProperties
+            .getInt("ro.sf.lcd_density", DENSITY_DEFAULT));
+        DENSITY_DEVICE_DEFAULT = DENSITY_DEVICE;
+        DENSITY_PREFERRED = SystemProperties.getInt("persist.sys.lcd_density", DENSITY_DEVICE);
+    }
 
     /**
      * The absolute width of the display in pixels.
@@ -229,6 +243,24 @@ public class DisplayMetrics {
      */
     public float noncompatYdpi;
 
+    /** @hide */
+    public void setDensity(int inDensity) {
+        density = inDensity / (float) DENSITY_DEFAULT;
+        densityDpi = inDensity;
+        scaledDensity = density;
+        xdpi = inDensity;
+        ydpi = inDensity;
+
+        noncompatDensity = density;
+        noncompatDensityDpi = densityDpi;
+        noncompatScaledDensity = scaledDensity;
+        noncompatXdpi = xdpi;
+        noncompatYdpi = ydpi;
+
+        DENSITY_DEVICE = inDensity;
+        Bitmap.setDefaultDensity(inDensity);
+    }
+
     public DisplayMetrics() {
     }
 
@@ -319,13 +351,4 @@ public String toString() {
             ", height=" + heightPixels + ", scaledDensity=" + scaledDensity +
             ", xdpi=" + xdpi + ", ydpi=" + ydpi + "}";
     }
-
-    private static int getDeviceDensity() {
-        // qemu.sf.lcd_density can be used to override ro.sf.lcd_density
-        // when running in the emulator, allowing for dynamic configurations.
-        // The reason for this is that ro.sf.lcd_density is write-once and is
-        // set by the init process when it parses build.prop before anything else.
-        return SystemProperties.getInt("qemu.sf.lcd_density",
-                SystemProperties.getInt("ro.sf.lcd_density", DENSITY_DEFAULT));
-    }
 }

core/java/android/view/Display.java

@@ -778,6 +778,9 @@ public void getMetrics(DisplayMetrics outMetrics) {
         synchronized (this) {
             updateDisplayInfoLocked();
             mDisplayInfo.getAppMetrics(outMetrics, mDisplayAdjustments);
+            if (getDisplayId() == DEFAULT_DISPLAY) {
+                outMetrics.densityDpi = DisplayMetrics.DENSITY_DEVICE_DEFAULT;
+            }
         }
     }
 

core/java/android/view/DisplayInfo.java

@@ -564,6 +564,11 @@ private void getMetricsWithSize(DisplayMetrics outMetrics, CompatibilityInfo com
 
         if (!compatInfo.equals(CompatibilityInfo.DEFAULT_COMPATIBILITY_INFO)) {
             compatInfo.applyToDisplayMetrics(outMetrics);
+        } else if (type == Display.TYPE_BUILT_IN
+                && (flags & Display.FLAG_PRESENTATION) == 0) {
+            outMetrics.setDensity(DisplayMetrics.DENSITY_PREFERRED);
+        } else {
+            outMetrics.setDensity(logicalDensityDpi);
         }
     }
 

core/java/android/view/IWindowManager.aidl

@@ -271,4 +271,11 @@ interface IWindowManager
      * @return The frame statistics or null if the window does not exist.
      */
     WindowContentFrameStats getWindowContentFrameStats(IBinder token);
+
+    /**
+     * Toggle global menu
+     *
+     * @hide
+     */
+    void toggleGlobalMenu();
 }

core/java/android/view/WindowManagerPolicy.java

@@ -1311,4 +1311,11 @@ public boolean rotationHasCompatibleMetricsLw(@ActivityInfo.ScreenOrientation in
      * @param fadeoutDuration the duration of the exit animation, in milliseconds
      */
     public void startKeyguardExitAnimation(long startTime, long fadeoutDuration);
+
+    /**
+     * Toggle global menu
+     *
+     * @hide
+     */
+    public void toggleGlobalMenu();
 }

core/java/android/widget/Toast.java

@@ -21,9 +21,11 @@
 import android.app.INotificationManager;
 import android.app.ITransientNotification;
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.PixelFormat;
+import android.graphics.drawable.Drawable;
 import android.os.Handler;
 import android.os.RemoteException;
 import android.os.ServiceManager;
@@ -400,6 +402,17 @@ public void handleShow() {
                 if (context == null) {
                     context = mView.getContext();
                 }
+
+                ImageView appIcon = (ImageView) mView.findViewById(android.R.id.icon);
+                if (appIcon != null) {
+                    PackageManager pm = context.getPackageManager();
+                    try {
+                        Drawable icon = pm.getApplicationIcon(packageName);
+                        appIcon.setImageDrawable(icon);
+                    } catch (PackageManager.NameNotFoundException e) {
+                        // Empty
+                    }
+                }
                 mWM = (WindowManager)context.getSystemService(Context.WINDOW_SERVICE);
                 // We can resolve the Gravity here by using the Locale for getting
                 // the layout direction

core/java/com/android/internal/statusbar/IStatusBar.aidl

@@ -16,6 +16,7 @@
 
 package com.android.internal.statusbar;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.service.notification.StatusBarNotification;
 
@@ -76,5 +77,13 @@ oneway interface IStatusBar
      * @param source the identifier for the gesture, see {@link StatusBarManager}
      */
     void onCameraLaunchGestureDetected(int source);
+
+    /**
+     * SlimActions additions
+     */
+    void showCustomIntentAfterKeyguard(inout Intent intent);
+    void toggleScreenshot();
+    void toggleLastApp();
+    void toggleKillApp();
 }
 

core/java/com/android/internal/statusbar/IStatusBarService.aidl

@@ -16,6 +16,7 @@
 
 package com.android.internal.statusbar;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.service.notification.StatusBarNotification;
 
@@ -90,4 +91,12 @@ interface IStatusBarService
     void appTransitionStarting(long statusBarAnimationsStartTime, long statusBarAnimationsDuration);
 
     void startAssist(in Bundle args);
+
+    /**
+     * SlimActions additions
+     */
+    void showCustomIntentAfterKeyguard(inout Intent intent);
+    void toggleScreenshot();
+    void toggleLastApp();
+    void toggleKillApp();
 }

core/res/res/layout/transient_notification.xml

@@ -18,24 +18,35 @@
 */
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="?android:attr/toastFrameBackground">
+    android:clipChildren="false">
 
     <TextView
         android:id="@android:id/message"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_weight="1"
         android:layout_gravity="center_horizontal"
+        android:layout_marginTop="-16dp"
+        android:layout_marginStart="-16dp"
+        android:layout_toRightOf="@android:id/icon"
+        android:layout_below="@android:id/icon"
         android:textAppearance="@style/TextAppearance.Toast"
         android:textColor="@color/bright_foreground_dark"
         android:shadowColor="#BB000000"
         android:shadowRadius="2.75"
+        android:background="?android:attr/toastFrameBackground"
         />
 
-</LinearLayout>
+    <ImageView
+        android:id="@android:id/icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentStart="true"/>
+
+</RelativeLayout>
 
 

core/res/res/values-zh-rHK/strings.xml

@@ -1517,8 +1517,4 @@
       <item quantity="other">已選取 <xliff:g id="COUNT_1">%1$d</xliff:g> 個項目</item>
       <item quantity="one">已選取 <xliff:g id="COUNT_0">%1$d</xliff:g> 個項目</item>
     </plurals>
-    <!-- Carrier Name -->
-    <string name="China_Mobile">中國移動</string>
-    <string name="China_Unicom">中國聯通</string>
-    <string name="China_Telecom">中國電信</string>
 </resources>