From 3b9a3cc02ecb025f8b1f322015c7d1fb46222f9e Mon Sep 17 00:00:00 2001
From: Justin Koh <justinkoh@google.com>
Date: Mon, 21 Apr 2014 17:50:40 -0700
Subject: [PATCH] Update GlobalActions for watches.

Update GlobalActions for watches: only have power off and settings, due to
limited real estate.

Change-Id: Ie3cbbb287f8c71c8c16a00637c83da6921d56e2e
---
 core/res/res/drawable-hdpi/ic_settings.png    | Bin 0 -> 1805 bytes
 core/res/res/drawable-mdpi/ic_settings.png    | Bin 0 -> 1261 bytes
 core/res/res/drawable-xhdpi/ic_settings.png   | Bin 0 -> 2569 bytes
 core/res/res/drawable-xxhdpi/ic_settings.png  | Bin 0 -> 3220 bytes
 core/res/res/values-watch/config.xml          |  30 +++
 core/res/res/values/config.xml                |  18 ++
 core/res/res/values/strings.xml               |   3 +
 core/res/res/values/symbols.xml               |   3 +
 .../internal/policy/impl/GlobalActions.java   | 223 +++++++++++-------
 9 files changed, 192 insertions(+), 85 deletions(-)
 create mode 100644 core/res/res/drawable-hdpi/ic_settings.png
 create mode 100644 core/res/res/drawable-mdpi/ic_settings.png
 create mode 100644 core/res/res/drawable-xhdpi/ic_settings.png
 create mode 100644 core/res/res/drawable-xxhdpi/ic_settings.png
 create mode 100644 core/res/res/values-watch/config.xml

diff --git a/core/res/res/drawable-hdpi/ic_settings.png b/core/res/res/drawable-hdpi/ic_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..cfa539f5404428e43aa109ff6d3e2914ece53511
GIT binary patch
literal 1805
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

literal 0
HcmV?d00001

diff --git a/core/res/res/drawable-mdpi/ic_settings.png b/core/res/res/drawable-mdpi/ic_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..e6237eb1298ed27ac08582736637e6f205a36089
GIT binary patch
literal 1261
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%G}U;vjb?
zhIQv;UV>C6dj$D1FjT2AFf_C<F#G}vHN0S8C^cYUc$L7wU^Rn*LA+qju0R{01Y44~
zy9>jA5L~c#`DCC7XMsm#F_88EW4Dvpb_@*6dp%toLn02ZoqoQ1YN*6<`{(CmJq>dv
z&k)se3<^pJ>Tz}q%w6Owka)o^CgSv#U&@;fX1-k18>o<bi$&2zl~Y)aW$Ov+FfBfz
zNhXzZcitC!|NW!g_cPk}w2L1U+%G=&`Em8U`On4FBqlxD%n*F_<AKRRr*0S>UoOLc
zrNB_F<6TRa(@C=jnF+V5S09LcP{W&Yw@pQ*^l!D#*&UjhNAJh~%F&8UHR2BG$u*B;
zwK~vqow@Df2L2u5KiD-Une<6pmEU+DRk3j=s|}k?qQTM6Y9ACn^!!}LyXb~etfy@B
z3RwqHAH%RU9NIS-WHvPgT=6Zs_bpC-!4##>>m_Pd>c-}m<Xn5+*x#_eA-{q3L23fu
z4*4IlKlonE%vb-Qvw?dD(;nuUwAF7|<CyJO{ZwVA1i3M^oHu7$-l*<-gK-^WbVIz(
zA9L;M8w~#zoNTyz;CR{P^#{rlHmA-ne)C6qSKd*NzBtcz*{kL<PixmdSIM37W#JOl
z_q;Z$FT0lT`xrmp8=8J{)AjdT)4aGQ%$>AO?cv0v&y(IwF45y$=l<qz&Ml9tQ&~Pu
zTEf0&bqYh_@4uo&kuSqMxnJf)UgGp@xACvgchH%k&dld6$Dy6VaFZ*4hGNTJt(SjO
zrp{YZTgdId=eqZH+oU+vr=KTwZRLJtVUf``Z%OPVJrzgeWi!j_%KyrW@uZ5Mx&8T9
z1(R)5Y0}~L#7<Y!r=?~;e|}yvC+pZf@y@!iOP-$f-nT*`t0FqQG;gXfhwndoU{SE<
zG5*G%VRHPZb2)z4UCd|xS0ea({WIB>ExO5jt!AxRzSXc~6SvSs+ii!O4;*#bZ+|)T
zpva!ho&SV<r|vnoVd7OW`D2b<FCKq;_>;4_V3{h1_+GmR)?ZRj4WF;R64`Ikv!%|K
zJ&8?V#XX->i}}{LD|TgB6s%gO=~CGJc9P!m+is>d%f4zJ4Oe~3p?yVf#q5ilW;%bE
zQ~a~+Y{tp-oswU#nrxAdlMlPvbL-YewFmAA{nxM0<=mZl>*H>dwcFOp+IwB@lTW{K
zXz|kdrDD31Z+(0#r=ri0&#2xwzhQp^^MSyG)l+M|gI6$=F`SpYB6N23%j^f54_qIJ
zGTXa;RmeQuB6G8}$7i+X@rTi&_vbH}qBHf3pKf{XNhza}D^I?MFl{-Qt{?jEt+Ye@
zrFkqS_8!IkiH`#BW^^y<=5%4XG4oc{RMrgU3zF;&wW6kfrOqmw{%}5)dD(~6f7Yqj
zf;T5eG$t;yar%5;q03X=f;nbcUBSJVMZ!!cYLs)o<{fvr6T0i#yXd{r0sonQzX<s`
zC37(^Fh{GFxJHzuB$lLFB^RXvDF!10Lt|Y-16@P&5JPh-BO@y#16>1iD+7a<<tsoX
z4MIb1eoAIqC2kEfv;;t9h9t;_;QX|b^2DN42FH~Aq*MjZ+{E<Mpwz^a%EFVWpkjx?
M)78&qol`;+09ybX{{R30

literal 0
HcmV?d00001

diff --git a/core/res/res/drawable-xhdpi/ic_settings.png b/core/res/res/drawable-xhdpi/ic_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..208089d12589fa1266406ab281864c6af75886ac
GIT binary patch
literal 2569
zcmZ`*c{J1w8~u$fYe<%{WgR5h#?oZp2l0}n>=QF+vX7X?GL|H=G+86-*w?aC3}xT*
zM$PaJN!jTYO_qH6{`>y;&U5Z_&%MvN=lS<O{>#dggH@0f000iSnUU=o>-_;U)7h@}
z4f^Md7`*jw=mWsZG`3>|<CzA9*qRyu^%KHtXF|-=%=QKVJb(ZIJ{|xL&n)~Z0E8+5
zz`6$jz;Xb9KQO=3M(garbjQNf2sr&SMQ<veojELlX17Dm*zCVB8Aj^>0P`ofk-l9x
zc`I)x&CQ;BQ1>U6uko+Wti&m`znm0&xH6k7Ga1qoB?P6EmmWd{BN5@HHlDE`{uWT{
zKh=vYU8;DQ$i%~%W76z=kC&HDnZu;65>q3-5PQ<0ThO35VY#!p_GU6<=YC;m@{2ED
z=f4$%puUdfs(Pa)u#4>ZF{fzRgd2JnjBUhNit?tP?64vmWLdFPMBh*&V|wqV#EkO=
zI$5(OGDwH@9)knm4Qdeg?YHq@(quShY3J7zI4tNEtMXjQlNPa4r6o#9aYV+#3`Mo{
z21iC?Y&?>n6#L1Gz5{bYNd@~Nf>#DEtlsYE9kII9sZAieXP;T@_Vlmx7yibV&-npY
zTYuikaZ-YU1ZKJ))fL-qK#s^*D9^{wtR(hloT=5hkN2hQ74gn+2Wm_4C7Q!81lrkd
zach(s%O)lk`t>@YlVN`>F>Esz0&byf;#_7%3i1c`iAW_w^5yH-UOZ`~WLec-M}oZG
z38T}XH|b1V1RUmC4n+ewb^+g=?3SQpcdxYQuw#A@Rb1i4?W0+a2wsE)%t6=i<2Al_
z_j538@^fYnjNbFXHO!p2vyH=N;fFCqU&<U#?dXIXSM4z{A_u2t|0ox9`dyoe=^|Q4
zOvV)nKxs;blB7vIXFOyQm;_yqslb1Wp~NVVF6Uh<Y&iwG@ImOd!Y{u-S7fS=c!>(T
z3#4BT-!u<E?u^^5U|r7eyq4&+H|})DbTqCq>tbv_kNztWd0l>#SLYpv3bfW6Z|McO
zwGxo3K%p``PfFV{CZLPxN`Od@qe2I3k8KBVIF3NY)aKS%x*mErp~K<zck{9V1I@?_
z?QAsB-J}n7=lntSOm3X{Xlfd8%2dGA3hHUwDJ6-JvQt`@Qx^})dBVeUzgQgi4^El0
z^$D&&zZjiUH+p&X;h~JQD>B?fD$?owHt1xTO!bR2VIOps-eP~QUh|;qGjv<ych`+A
z{j2!;Obv6Gf8s`>NuRU5;NVZPhr}3J4E1X893P^M@UlNp=i?oTRCwprRHV*EPdZdo
zpn<-DB8b{bhG=?+x5f_BeyBur#|dZtz`n(1O$)qBV_W^E&P44OWFvW>wvu*>dQVN>
zSMDE~s84C`uIaP~FAFm6g}&9Uwyim2={<U5?bjkUR#G$nUB~DF!7U3@w*Sk(<En}P
zwL<E|X4pZ?cju;>pQPwqynIUeOat9qr=NO(1KsYHXDKoI;A!jRHUu4A_ntfo-s|Qe
zs0;nWW-nO9wnagqpUs3sn5Hlhx(VOY<Jd4YWI==R1w*QwZ#1K_<D@phO=c}3vl>kK
zrMLaG**q>1Z%^2+<1&~>WC@LH!?3yiQJl9a0|f|wh6O$s$+a>ip{GMA^d9_3+qHMd
z6>LRyThI&b3k&$U#r}wrRzOU<o!79>{kH>r^z-63NxToIKLIl&5EyGJ<$8Djx+?1R
zYegSBna}mb{FDX9xRCjEM|p*0mqm)y3rV#-CW=p=NNz@0CB`lotyoqT5|p#j{lv>a
zwsxmSCBGi&k136llGeaNm%Fl1Gx0;UEhkrZc}4*5{4Y`e7=W2@I5Yp<DD({dp(rLE
zW}UyOA<XTa_T_x^6nT@~6APkg4)bn@7e+ykSj9G0Ek&5A1v33~JIsDs>YC@ZP?4}W
zfvTdl?h{YqP`w2>S}#e4VUuMmn&r5qigb>(h%N>{+P4$wpqteqhwq`ssg_glY$1xi
zs69i1y$MbtLdfC@e+qv@sdW1IhzhPy+&Cyc;OQ_uiMa2_`^-BMvh}#{p$b9Es6%UF
z|FA?>(AQ;|=mTN6v}qfc(S}BR7g}LZjek_PX*<z3O~SK%rSm8|OQxbC9mw<{YGW+{
z*UD^kk`&s?e+Z)SwijNRz8X94Y2xEf`)cWC4&&5BFgV8w^{SE9E!zPe6P!KmpzUM%
zW3EFLJ}%6Ym=>aNzEF$&lSNhVOcUuE@py?v@?(7Q)IiGOIO$V@D(jx_(Mi_S3EjxE
z)d7P_q*MsRWPCW$YS1<~KL5A(bC~`OaPRzxscP6wC#U+xisAEe9b3~Wg^t3Dpm!>8
z-3g*_?ixQk_NbpV!NtOj&@9exAOxZ<X3Ia!_%(L4NREFSR)f`yux1=DUux{>kzHFa
zvae%QDp8TV*rZl1HVYMhWu5$t>wCAN?8AR${Hvk7dUFiBmEtv{omW;eaw@(@5!L7X
zpmVX^y6ny8s|h7k_LJXp@M-5rOTUyN#fMulx%vjThML=F@~oZaH||&ZsaG1X)z7Wr
zl!85lEu2BL>06HP>FJqq&&NLC1WY}bi@S%7<{N@>bt%TrMN_-EY4j^kTe{k!c%=I7
zh@>WUYzMJtK;Vx`ak-OAJ}9;bxp`lLb{0IsVXg8(wmFU)QJgl&x$b4SKJX!oFu87*
zHmItA$JFg}FETA&A~lg3Vnhz2J~n^8NouR?5qlYj5oukIeYZmNKugNFr{@6bAWlMT
zV;E?T&Jh&Ac~94>Gehldl}q{%v{zy6ZW&q@eQs<KR)$v4kqkxmP<g@b-)@@E`OSWq
zaw_(^*Ct!`Rxw$tP{n6EE9acTbj4&gyZLY0TSQfRaqYj1$6Z1lo~WT&$Hn{f+9jY-
zUwsnyClAw$5gWHqeL-Ib>=K&oxBa%qI|2)ac3)hCqxyCaCH_@oCPR#IBukr%GPQTF
z?A@12)&?DqAi>ip>xmibtuFV*%@xe1tFaADt&<1(y#C0csv43zo1`uQhA{s;zDsJl
zHW>40>!&3T*-dvdItQ9C=Kos%J%S@aYw2a+Mmtl&eeO>oM+bYxBd-xXh8G$r{>UZ(
zCC6G6J78s=S&!4=KFrt$cj|ENbMhPnD2G)<qv>Hdy*7GMVO;=@zf~d4u-^)1-Pl8_
zW6%NBO1g%Kh>KM1<2{LaD-G$dM;|4XtYWD%uE6)`xN&fkPDA-A$3P{A6<^fx@)yEU
z^b%N;zQLBJs1f5Yur7ac)|CKhjPWgu7XpKXc?KiT2vAW{R#i||Qc%{gQ`Uf~sK8W|
z6qGbzN=j>Cl|TL`;1}TKi^Bf@K+a{ZKYa@P=flka6ebK2j0E((0`4Hi;C={iq%9KR
Ug$)`;{;6aD+}O&f-oPXFKYQ)7FaQ7m

literal 0
HcmV?d00001

diff --git a/core/res/res/drawable-xxhdpi/ic_settings.png b/core/res/res/drawable-xxhdpi/ic_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..452942e6148122341c526b28ef1eba4c02075335
GIT binary patch
literal 3220
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

literal 0
HcmV?d00001

diff --git a/core/res/res/values-watch/config.xml b/core/res/res/values-watch/config.xml
new file mode 100644
index 0000000000000..4c4d0ce297b3e
--- /dev/null
+++ b/core/res/res/values-watch/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2014, 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.
+*/
+-->
+
+<!-- These resources are around just to allow their values to be customized
+     for watch products.  Do not translate. -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- Only show power and settings items due to smaller real estate. -->
+    <string-array translatable="false" name="config_globalActionsList">
+        <item>power</item>
+        <item>settings</item>
+    </string-array>
+
+</resources>
\ No newline at end of file
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index bc60608047859..cafa0a5855ab1 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -1420,4 +1420,22 @@
     <!-- default window inset isRound property -->
     <bool name="config_windowIsRound">false</bool>
 
+    <!-- Defines the default set of global actions. Actions may still be disabled or hidden based
+         on the current state of the device.
+         Each item must be one of the following strings:
+         "power" = Power off
+         "settings" = An action to launch settings
+         "airplane" = Airplane mode toggle
+         "bugreport" = Take bug report, if available
+         "silent" = silent mode
+         "users" = list of users
+         -->
+    <string-array translatable="false" name="config_globalActionsList">
+        <item>power</item>
+        <item>airplane</item>
+        <item>bugreport</item>
+        <item>silent</item>
+        <item>users</item>
+    </string-array>
+
 </resources>
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 5c848f3c7a0c2..b4a03f735a87d 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -399,6 +399,9 @@
     <!-- status message in phone options dialog for when airplane mode is off -->
     <string name="global_actions_airplane_mode_off_status">Airplane mode is OFF</string>
 
+    <!-- label for item that launches settings in phone options dialog [CHAR LIMIT=15]-->
+    <string name="global_action_settings">Settings</string>
+
     <!-- Text to use when the number in a notification info is too large
          (greater than status_bar_notification_info_maxnum, defined in
          values/config.xml) and must be truncated. May need to be localized
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index aa8db0134759d..bb823573a7da4 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -988,6 +988,7 @@
   <java-symbol type="array" name="config_operatorConsideredNonRoaming" />
   <java-symbol type="array" name="config_sameNamedOperatorConsideredRoaming" />
   <java-symbol type="array" name="config_callBarringMMI" />
+  <java-symbol type="array" name="config_globalActionsList" />
 
   <java-symbol type="drawable" name="default_wallpaper" />
   <java-symbol type="drawable" name="indicator_input_error" />
@@ -1389,6 +1390,7 @@
   <java-symbol type="string" name="global_actions_airplane_mode_on_status" />
   <java-symbol type="string" name="global_actions_toggle_airplane_mode" />
   <java-symbol type="string" name="global_action_bug_report" />
+  <java-symbol type="string" name="global_action_settings" />
   <java-symbol type="string" name="global_action_silent_mode_off_status" />
   <java-symbol type="string" name="global_action_silent_mode_on_status" />
   <java-symbol type="string" name="global_action_toggle_silent_mode" />
@@ -1461,6 +1463,7 @@
   <java-symbol type="color" name="input_method_navigation_guard" />
   <java-symbol type="drawable" name="ic_notification_ime_default" />
   <java-symbol type="drawable" name="ic_menu_refresh" />
+  <java-symbol type="drawable" name="ic_settings" />
   <java-symbol type="drawable" name="stat_notify_car_mode" />
   <java-symbol type="drawable" name="stat_notify_disabled" />
   <java-symbol type="drawable" name="stat_notify_disk_full" />
diff --git a/policy/src/com/android/internal/policy/impl/GlobalActions.java b/policy/src/com/android/internal/policy/impl/GlobalActions.java
index 7c0735bbfe023..98b5a5afbece5 100644
--- a/policy/src/com/android/internal/policy/impl/GlobalActions.java
+++ b/policy/src/com/android/internal/policy/impl/GlobalActions.java
@@ -51,6 +51,7 @@ import android.service.dreams.IDreamManager;
 import android.telephony.PhoneStateListener;
 import android.telephony.ServiceState;
 import android.telephony.TelephonyManager;
+import android.util.ArraySet;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.InputDevice;
@@ -83,6 +84,15 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
 
     private static final boolean SHOW_SILENT_TOGGLE = true;
 
+    /* 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_AIRPLANE = "airplane";
+    private static final String GLOBAL_ACTION_KEY_BUGREPORT = "bugreport";
+    private static final String GLOBAL_ACTION_KEY_SILENT = "silent";
+    private static final String GLOBAL_ACTION_KEY_USERS = "users";
+    private static final String GLOBAL_ACTION_KEY_SETTINGS = "settings";
+
     private final Context mContext;
     private final WindowManagerFuncs mWindowManagerFuncs;
     private final AudioManager mAudioManager;
@@ -234,92 +244,36 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
         onAirplaneModeChanged();
 
         mItems = new ArrayList<Action>();
+        String[] defaultActions = mContext.getResources().getStringArray(
+                com.android.internal.R.array.config_globalActionsList);
 
-        // first: power off
-        mItems.add(
-            new SinglePressAction(
-                    com.android.internal.R.drawable.ic_lock_power_off,
-                    R.string.global_action_power_off) {
-
-                public void onPress() {
-                    // shutdown by making sure radio and power are handled accordingly.
-                    mWindowManagerFuncs.shutdown(true);
-                }
-
-                public boolean onLongPress() {
-                    mWindowManagerFuncs.rebootSafeMode(true);
-                    return true;
-                }
-
-                public boolean showDuringKeyguard() {
-                    return true;
-                }
-
-                public boolean showBeforeProvisioning() {
-                    return true;
-                }
-            });
-
-        // next: airplane mode
-        mItems.add(mAirplaneModeOn);
-
-        // next: bug report, if enabled
-        if (Settings.Global.getInt(mContext.getContentResolver(),
-                Settings.Global.BUGREPORT_IN_POWER_MENU, 0) != 0 && isCurrentUserOwner()) {
-            mItems.add(
-                new SinglePressAction(com.android.internal.R.drawable.stat_sys_adb,
-                        R.string.global_action_bug_report) {
-
-                    public void onPress() {
-                        AlertDialog.Builder builder = new AlertDialog.Builder(mContext);
-                        builder.setTitle(com.android.internal.R.string.bugreport_title);
-                        builder.setMessage(com.android.internal.R.string.bugreport_message);
-                        builder.setNegativeButton(com.android.internal.R.string.cancel, null);
-                        builder.setPositiveButton(com.android.internal.R.string.report,
-                                new DialogInterface.OnClickListener() {
-                                    @Override
-                                    public void onClick(DialogInterface dialog, int which) {
-                                        // Add a little delay before executing, to give the
-                                        // dialog a chance to go away before it takes a
-                                        // screenshot.
-                                        mHandler.postDelayed(new Runnable() {
-                                            @Override public void run() {
-                                                try {
-                                                    ActivityManagerNative.getDefault()
-                                                            .requestBugReport();
-                                                } catch (RemoteException e) {
-                                                }
-                                            }
-                                        }, 500);
-                                    }
-                                });
-                        AlertDialog dialog = builder.create();
-                        dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG);
-                        dialog.show();
-                    }
-
-                    public boolean onLongPress() {
-                        return false;
-                    }
-
-                    public boolean showDuringKeyguard() {
-                        return true;
-                    }
-
-                    public boolean showBeforeProvisioning() {
-                        return false;
-                    }
-                });
-        }
-
-        // last: silent mode
-        if (mShowSilentToggle) {
-            mItems.add(mSilentModeAction);
-        }
-
-        // one more thing: optionally add a list of users to switch to
-        if (SystemProperties.getBoolean("fw.power_user_switcher", false)) {
-            addUsersToMenu(mItems);
+        ArraySet<String> addedKeys = new ArraySet<String>();
+        for (int i = 0; i < defaultActions.length; i++) {
+            String actionKey = defaultActions[i];
+            if (addedKeys.contains(actionKey)) {
+                // If we already have added this, don't add it again.
+                continue;
+            }
+            if (GLOBAL_ACTION_KEY_POWER.equals(actionKey)) {
+                mItems.add(getPowerAction());
+            } else if (GLOBAL_ACTION_KEY_AIRPLANE.equals(actionKey)) {
+                mItems.add(mAirplaneModeOn);
+            } else if (GLOBAL_ACTION_KEY_BUGREPORT.equals(actionKey)
+                    && (Settings.Global.getInt(mContext.getContentResolver(),
+                        Settings.Global.BUGREPORT_IN_POWER_MENU, 0) != 0 && isCurrentUserOwner())) {
+                mItems.add(getBugReportAction());
+            } else if (GLOBAL_ACTION_KEY_SILENT.equals(actionKey) && mShowSilentToggle) {
+                mItems.add(mSilentModeAction);
+            } else if (GLOBAL_ACTION_KEY_USERS.equals(actionKey)
+                    && SystemProperties.getBoolean("fw.power_user_switcher", false)) {
+                addUsersToMenu(mItems);
+            } else if (GLOBAL_ACTION_KEY_SETTINGS.equals(actionKey)) {
+                mItems.add(getSettingsAction());
+            } else {
+                Log.e(TAG, "Invalid global action key " + actionKey);
+            }
+            // Add here so we don't add more than one.
+            addedKeys.add(actionKey);
         }
 
         mAdapter = new MyAdapter();
@@ -349,6 +303,105 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
         return dialog;
     }
 
+    private Action getPowerAction() {
+        return new SinglePressAction(
+                com.android.internal.R.drawable.ic_lock_power_off,
+                R.string.global_action_power_off) {
+
+            public void onPress() {
+                // shutdown by making sure radio and power are handled accordingly.
+                mWindowManagerFuncs.shutdown(true);
+            }
+
+            public boolean onLongPress() {
+                mWindowManagerFuncs.rebootSafeMode(true);
+                return true;
+            }
+
+            public boolean showDuringKeyguard() {
+                return true;
+            }
+
+            public boolean showBeforeProvisioning() {
+                return true;
+            }
+        };
+    }
+
+    private Action getBugReportAction() {
+        return new SinglePressAction(com.android.internal.R.drawable.stat_sys_adb,
+                R.string.global_action_bug_report) {
+
+            public void onPress() {
+                AlertDialog.Builder builder = new AlertDialog.Builder(mContext);
+                builder.setTitle(com.android.internal.R.string.bugreport_title);
+                builder.setMessage(com.android.internal.R.string.bugreport_message);
+                builder.setNegativeButton(com.android.internal.R.string.cancel, null);
+                builder.setPositiveButton(com.android.internal.R.string.report,
+                        new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                // Add a little delay before executing, to give the
+                                // dialog a chance to go away before it takes a
+                                // screenshot.
+                                mHandler.postDelayed(new Runnable() {
+                                    @Override public void run() {
+                                        try {
+                                            ActivityManagerNative.getDefault()
+                                                    .requestBugReport();
+                                        } catch (RemoteException e) {
+                                        }
+                                    }
+                                }, 500);
+                            }
+                        });
+                AlertDialog dialog = builder.create();
+                dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG);
+                dialog.show();
+            }
+
+            public boolean onLongPress() {
+                return false;
+            }
+
+            public boolean showDuringKeyguard() {
+                return true;
+            }
+
+            public boolean showBeforeProvisioning() {
+                return false;
+            }
+        };
+    }
+
+    private Action getSettingsAction() {
+        return new SinglePressAction(com.android.internal.R.drawable.ic_settings,
+                R.string.global_action_settings) {
+
+            @Override
+            public void onPress() {
+                Intent intent = new Intent(Settings.ACTION_SETTINGS);
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                mContext.startActivity(intent);
+            }
+
+            @Override
+            public boolean onLongPress() {
+                return false;
+            }
+
+            @Override
+            public boolean showDuringKeyguard() {
+                return true;
+            }
+
+            @Override
+            public boolean showBeforeProvisioning() {
+                return false;
+            }
+        };
+    }
+
     private UserInfo getCurrentUser() {
         try {
             return ActivityManagerNative.getDefault().getCurrentUser();