提交: 2d0e5e5fdeb786c91b55560b92067a3830adc7f7 - frameworks-base (git)

frameworks/base

Commit MetaInfo

• 修订版: 2d0e5e5fdeb786c91b55560b92067a3830adc7f7 (tree)
• 时间: 2014-08-27 19:18:37
• 作者: Daniel Leung <daniel.leung@inte...>
• Commiter: Chih-Wei Huang

Log Message

Add power off button to quick settings dropdown box

Add an option to power off the device in the quick settings
drop-down dialog. It is necessary for devices which the power
button does not function as Android expected. For example,
the hardware only sends button down event but no button up
event, or there is not long press event emitted what-so-ever.
Clicking on this button asks user for confirmation, and fires
the shutdown intent.

Issue: AXIA-1271
Change-Id: I12c3af70d39d45a2974f8fca03eb332e68017e15
Original-Change-Id: Iba14b10d12e788f9df6038e20aa98384838531e0
Original-Change-Id: Ic973ebf43b79b436a9e872613b8572a7c77ce0c3
Signed-off-by: Daniel Leung <[e-mail]>
Signed-off-by: Anton Cherkashyn <[e-mail]>

更改概述

• modified: packages/SystemUI/AndroidManifest.xml
• add: packages/SystemUI/res/layout/quick_settings_tile_poweroff.xml
• modified: packages/SystemUI/res/values/strings.xml
• modified: packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
• modified: packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java

差异

--- a/packages/SystemUI/AndroidManifest.xml
+++ b/packages/SystemUI/AndroidManifest.xml
@@ -41,6 +41,7 @@
     <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
     <uses-permission android:name="android.permission.MASTER_CLEAR" />
     <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.SHUTDOWN" />
 
     <!-- ActivityManager -->
     <uses-permission android:name="android.permission.GET_TASKS" />

--- /dev/null
+++ b/packages/SystemUI/res/layout/quick_settings_tile_poweroff.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/TextAppearance.QuickSettings.TileView"
+    android:id="@+id/poweroff_tileview"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:gravity="center"
+    android:drawableTop="@android:drawable/ic_lock_power_off"
+    />
\ No newline at end of file

--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -496,6 +496,8 @@
     <string name="quick_settings_brightness_dialog_title">Brightness</string>
     <!-- QuickSettings: Brightness dialog auto brightness button [CHAR LIMIT=NONE] -->
     <string name="quick_settings_brightness_dialog_auto_brightness_label">AUTO</string>
+    <!-- QuickSettings: Power Off [CHAR LIMIT=NONE] -->
+    <string name="quick_settings_poweroff_label">Power Off</string>
 
 
     <!-- Glyph to be overlaid atop the battery when the level is extremely low. Do not translate. -->

--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
@@ -647,6 +647,25 @@ class QuickSettings {
             }
         });
         parent.addView(locationTile);
+
+        // Power off
+        QuickSettingsTileView powerOffTile = (QuickSettingsTileView)
+                inflater.inflate(R.layout.quick_settings_tile, parent, false);
+        powerOffTile.setContent(R.layout.quick_settings_tile_poweroff, inflater);
+        powerOffTile.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                  onClickPowerOff();
+            }
+        });
+        mModel.addPowerOffTile(powerOffTile, new QuickSettingsModel.RefreshCallback() {
+            @Override
+            public void refreshView(QuickSettingsTileView view, State state) {
+                TextView tv = (TextView) view.findViewById(R.id.poweroff_tileview);
+                tv.setText(state.label);
+            }
+        });
+        parent.addView(powerOffTile);
     }
 
     private void addTemporaryTiles(final ViewGroup parent, final LayoutInflater inflater) {
@@ -918,4 +937,31 @@ class QuickSettings {
             }
         }
     }
+
+    // Power off
+    // ----------------------------
+    private void onClickPowerOff() {
+        if (mBar != null) {
+            mBar.collapseAllPanels(true);
+        }
+
+        // Create dialog to get user confirmation
+        final AlertDialog dialog = new AlertDialog.Builder(mContext)
+                    .setTitle(com.android.internal.R.string.power_off)
+                    .setMessage(com.android.internal.R.string.shutdown_confirm_question)
+                    .setPositiveButton(com.android.internal.R.string.yes,
+                        new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int which) {
+                            // Send request to start ShutdownActivity
+                            Intent intent = new Intent(Intent.ACTION_REQUEST_SHUTDOWN);
+                            intent.putExtra(Intent.EXTRA_KEY_CONFIRM, false);
+                            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                            mContext.startActivity(intent);
+                        }
+                    })
+                    .setNegativeButton(com.android.internal.R.string.no, null)
+                    .create();
+        dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG);
+        dialog.show();
+    }
 }

--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java
@@ -301,6 +301,10 @@ class QuickSettingsModel implements BluetoothStateChangeCallback,
 
     private RotationLockController mRotationLockController;
 
+    private QuickSettingsTileView mPowerOffTile;
+    private RefreshCallback mPowerOffCallback;
+    private State mPowerOffState = new State();
+
     public QuickSettingsModel(Context context) {
         mContext = context;
         mHandler = new Handler();
@@ -865,4 +869,16 @@ class QuickSettingsModel implements BluetoothStateChangeCallback,
         mSslCaCertWarningState.label = r.getString(R.string.ssl_ca_cert_warning);
         mSslCaCertWarningCallback.refreshView(mSslCaCertWarningTile, mSslCaCertWarningState);
     }
+
+    // Power off
+    void addPowerOffTile(QuickSettingsTileView view, RefreshCallback cb) {
+        mPowerOffTile = view;
+        mPowerOffCallback = cb;
+        refreshPowerOffTile();
+    }
+    void refreshPowerOffTile() {
+        Resources r = mContext.getResources();
+        mPowerOffState.label = r.getString(R.string.quick_settings_poweroff_label);
+        mPowerOffCallback.refreshView(mPowerOffTile, mPowerOffState);
+    }
 }