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

Commit e857632a authored by John Spurlock's avatar John Spurlock Committed by Android (Google) Code Review
Browse files

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

parents fa716c7b 960779d3

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

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

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

                context.getContentResolver(),

                Settings.Secure.SCREENSAVER_ACTIVATE_ON_DOCK, 1);

                Settings.Secure.SCREENSAVER_ACTIVATE_ON_DOCK, 0);



            if (!activateOnDock) return;

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

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


    // Enable launching of applications when entering the dock.

    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_ENABLE_LOCATION_UPDATES = 1;