summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2014-03-13 20:53:50 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-03-13 20:53:51 +0000
commit719a2f9728422e4c8d6d72be98cbd05c331af941 (patch)
tree644c25dbcccea9c31d20420ccae0318603db344d
parentf8a5fb0d4735c0d16db830e270a7be5c976150aa (diff)
parentedd27f498187a7aa09b0c09e8712e5c1309d39b2 (diff)
Merge "Changed dialer launch activity style to use a 0dp height actionbar. This prevents the user from seeing a blue "Phone" actionbar during loading."
-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 207ab6bcc..1025d0fdc 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">