Commit 9346076c authored by SnowCatPDA's avatar SnowCatPDA
Browse files

UPDATE Reboot menu

parent 54705b17

X5PRO/kernel/framework/GlobalActions.java

+5 −21
Original line number Diff line number Diff line
@@ -93,8 +93,6 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac 
    /* Valid settings for global actions keys.

     * see config.xml config_globalActionList */

    private static final String GLOBAL_ACTION_KEY_POWER = "power";

    private static final String GLOBAL_ACTION_KEY_REBOOT = "reboot";

    private static final String GLOBAL_ACTION_KEY_RECOVERY = "recovery";

    private static final String GLOBAL_ACTION_KEY_AIRPLANE = "airplane";

    private static final String GLOBAL_ACTION_KEY_BUGREPORT = "bugreport";

    private static final String GLOBAL_ACTION_KEY_SILENT = "silent";
@@ -275,10 +273,7 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac 
            }

            if (GLOBAL_ACTION_KEY_POWER.equals(actionKey)) {

                mItems.add(new PowerAction());

            }else if (GLOBAL_ACTION_KEY_REBOOT.equals(actionKey)) {

		mItems.add(new RebootAction());

            }else if (GLOBAL_ACTION_KEY_RECOVERY.equals(actionKey)) {

//                mItems.add(new RecoveryAction());

            } else if (GLOBAL_ACTION_KEY_AIRPLANE.equals(actionKey)) {

                mItems.add(mAirplaneModeOn);

            } else if (GLOBAL_ACTION_KEY_BUGREPORT.equals(actionKey)) {
@@ -375,22 +370,14 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac 


 private final class RebootAction extends SinglePressAction implements LongPressAction {

        private RebootAction() {

//            super(com.android.internal.R.drawable.ic_lock_reboot,

//                    R.string.global_action_reboot);

            super(com.android.internal.R.drawable.ic_lock_power_off,

                "Reboot");

            super(com.android.internal.R.drawable.ic_lock_reboot,"Reboot");

        }



        @Override

        public boolean onLongPress() {

            UserManager um = (UserManager) mContext.getSystemService(Context.USER_SERVICE);

//            if (!um.hasUserRestriction(UserManager.DISALLOW_SAFE_BOOT)) {

		com.android.server.power.ShutdownThread.reboot(mContext, 

			android.os.PowerManager.REBOOT_RECOVERY, false);

//                mWindowManagerFuncs.rebootSafeMode(true);

		return true;

 //           }

 //           return false;

        }



        @Override
@@ -406,11 +393,8 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac 
        @Override

        public void onPress() {

              com.android.server.power.ShutdownThread.reboot(mContext, null, false);

//	      ShutdownThread.reboot(mContext, "Reboot", false);

//            mWindowManagerFuncs.reboot(false);

        }

    }



    private Action getBugReportAction() {

        return new SinglePressAction(com.android.internal.R.drawable.ic_lock_bugreport,

                R.string.bugreport_title) {