summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2014-03-14 22:03:12 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-14 22:03:12 +0000
commit078c053c1ab6ee6befa507149d2b1c3b659f650d (patch)
tree0026856026836e86cb5434b62697c8b1c5a724da
parent3c3fe91acda289dc4c0653122db5e708a74e103f (diff)
parent4d82dffb27abf6ad2c558abdb552a4e429e3f3ad (diff)
am 4d82dffb: am d9da2416: am 301c7155: am 263b01dd: Changed dialer launch activity style to use a 0dp height actionbar. This prevents the user from seeing a blue "Phone" actionbar during loading. DO NOT MERGE
* commit '4d82dffb27abf6ad2c558abdb552a4e429e3f3ad': Changed dialer launch activity style to use a 0dp height actionbar. This prevents the user from seeing a blue "Phone" actionbar during loading. DO NOT MERGE
-rw-r--r--AndroidManifest.xml2
-rw-r--r--res/values/styles.xml12
2 files changed, 13 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0f3285e3d..3a643a879 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -67,7 +67,7 @@
dialpad screen. -->
<activity android:name=".DialtactsActivity"
android:label="@string/launcherDialer"
- android:theme="@style/DialtactsTheme"
+ android:theme="@style/DialtactsThemeHiddenActionBar"
android:launchMode="singleTask"
android:clearTaskOnLaunch="true"
android:icon="@mipmap/ic_launcher_phone"
diff --git a/res/values/styles.xml b/res/values/styles.xml
index e0fc1db96..0413df4b9 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -77,6 +77,18 @@
<item name="favorites_padding_bottom">?android:attr/actionBarSize</item>
</style>
+ <!-- An extension of the main DialtactsTheme used when the the launcher activity is shown.
+ Ensures that there is no actionbar showing during the load of the dialer app. -->
+ <style name="DialtactsThemeHiddenActionBar" parent="DialtactsTheme">
+ <item name="android:actionBarStyle">@style/DialtactsHiddenActionBarStyle</item>
+ </style>
+
+ <!-- A "hidden" action bar style. Used when loading the launcher activity so that the
+ default actionbar is effectively hidden. -->
+ <style name="DialtactsHiddenActionBarStyle" parent="DialtactsActionBarStyle">
+ <item name="android:height">0dp</item>
+ </style>
+
<!-- Action bar overflow menu icon. -->
<style name="DialtactsActionBarOverflow"
parent="@android:style/Widget.Holo.ActionButton.Overflow">