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

Commit 60dbc3c0 authored by John Spurlock's avatar John Spurlock Committed by Android Git Automerger
Browse files

am e857632a: Merge "Dock: Renable desk-dock apps" into jb-dev 

* commit 'e857632a':
  Dock: Renable desk-dock apps
parents 6e43ee67 e857632a

packages/SystemUI/src/com/android/systemui/DreamsDockLauncher.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -59,7 +59,7 @@ public class DreamsDockLauncher extends Activity { 
        public void onReceive(Context context, Intent intent) {

        public void onReceive(Context context, Intent intent) {

            final boolean activateOnDock = 0 != Settings.Secure.getInt(

            final boolean activateOnDock = 0 != Settings.Secure.getInt(

                context.getContentResolver(),

                context.getContentResolver(),

                Settings.Secure.SCREENSAVER_ACTIVATE_ON_DOCK, 1);

                Settings.Secure.SCREENSAVER_ACTIVATE_ON_DOCK, 0);





            if (!activateOnDock) return;

            if (!activateOnDock) return;

services/java/com/android/server/UiModeManagerService.java

+12 −12
Original line number Original line Diff line number Diff line
@@ -65,7 +65,7 @@ class UiModeManagerService extends IUiModeManager.Stub { 




    // Enable launching of applications when entering the dock.

    // Enable launching of applications when entering the dock.

    private static final boolean ENABLE_LAUNCH_CAR_DOCK_APP = true;

    private static final boolean ENABLE_LAUNCH_CAR_DOCK_APP = true;

    private static final boolean ENABLE_LAUNCH_DESK_DOCK_APP = false;

    private static final boolean ENABLE_LAUNCH_DESK_DOCK_APP = true;





    private static final int MSG_UPDATE_TWILIGHT = 0;

    private static final int MSG_UPDATE_TWILIGHT = 0;

    private static final int MSG_ENABLE_LOCATION_UPDATES = 1;

    private static final int MSG_ENABLE_LOCATION_UPDATES = 1;