From 580c80f853747741ae74fbb6f670315077586208 Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Fri, 7 Jan 2011 12:52:21 -0800 Subject: [PATCH] Conditionally remove Dock settings shortcut and Power control widget. Bug: 3258028 Bug: 3248740 Change-Id: Id37787cc9562cde13048e8dfba957599219d94b5 --- AndroidManifest.xml | 9 ++++++--- res/values-xlarge/bools.xml | 20 ++++++++++++++++++++ res/values/bools.xml | 2 ++ 3 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 res/values-xlarge/bools.xml diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 91353bcdd4..a94258ea28 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -452,7 +452,8 @@ + android:clearTaskOnLaunch="true" + android:enabled="@bool/has_dock_settings"> @@ -988,7 +989,8 @@ + android:finishOnCloseSystemDialogs="true" + android:enabled="@bool/has_powercontrol_widget"> @@ -1065,7 +1067,8 @@ android:theme="@android:style/Theme.Holo.DialogWhenLarge"/> + android:label="@string/gadget_title" android:exported="false" + android:enabled="@bool/has_powercontrol_widget"> diff --git a/res/values-xlarge/bools.xml b/res/values-xlarge/bools.xml new file mode 100644 index 0000000000..55f496a6ad --- /dev/null +++ b/res/values-xlarge/bools.xml @@ -0,0 +1,20 @@ + + + + + + false + diff --git a/res/values/bools.xml b/res/values/bools.xml index 61cc79e97c..235e2bb73c 100644 --- a/res/values/bools.xml +++ b/res/values/bools.xml @@ -20,4 +20,6 @@ false false + + true -- 2.11.0