summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2014-03-14 20:08:38 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-14 20:08:38 +0000
commit301c7155e92e21934baca1d760dc80e3bba97a56 (patch)
treef20c66f6ec04b14f344a61ecd72a541d06e5cbd9
parent364b5735d69ac835a7e66554ecd526d7a334d9a2 (diff)
parent263b01ddc35396c3aef17bee547f1e568fcc97d1 (diff)
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 '263b01ddc35396c3aef17bee547f1e568fcc97d1': 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 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">