diff options
| author | kaiyiz <kaiyiz@codeaurora.org> | 2014-05-08 11:26:02 +0800 |
|---|---|---|
| committer | emancebo <emancebo@cyngn.com> | 2014-09-04 15:20:00 -0700 |
| commit | 98b05977f75f359792d250733e2ceab935c2377d (patch) | |
| tree | 5c5d3a5423597548f46635b8121d32c4cf8ffc84 | |
| parent | cf8ebee20df800ef68e8f7c5591378feadc827c9 (diff) | |
| download | packages_apps_InCallUI-98b05977f75f359792d250733e2ceab935c2377d.tar.gz packages_apps_InCallUI-98b05977f75f359792d250733e2ceab935c2377d.tar.bz2 packages_apps_InCallUI-98b05977f75f359792d250733e2ceab935c2377d.zip | |
InCallUI: Use NoActionBar theme for InCallActivity
InCallActivity and MsimInCallActivity has actionBar, however the actionBar
shows faster than the activity, so even though activity hide the actionBar,
it still display for a moment.
Use NoActionBar theme as the parent theme for InCallActivity in stead of
Theme.Holo, and set the theme with actionBar for MsimInCallActivity.
CRs-Fixed: 659881
Conflicts:
res/values/styles.xml
Change-Id: Iabf539c691389c856f021e0b9e6cfd0e9e8c1650
| -rw-r--r-- | res/values/styles.xml | 7 | ||||
| -rw-r--r-- | src/com/android/incallui/MSimInCallActivity.java | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml index 3fb2bb28..8854c79b 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -131,6 +131,13 @@ <item name="android:windowAnimationStyle">@style/InCallAnimationStyle</item> </style> + <!-- Theme for the MsimInCallActivity activity. This theme is set after the view + of the activity is drawn. --> + <style name="InCallScreenWithActionBar" parent="@android:style/Theme.Holo"> + <item name="android:windowBackground">@android:color/black</item> + <item name="android:windowAnimationStyle">@style/InCallAnimationStyle</item> + </style> + <style name="InCallDialpadTableRowStyle"> <item name="android:layout_height">0dp</item> <item name="android:layout_weight">1</item> diff --git a/src/com/android/incallui/MSimInCallActivity.java b/src/com/android/incallui/MSimInCallActivity.java index f027e19c..4550059e 100644 --- a/src/com/android/incallui/MSimInCallActivity.java +++ b/src/com/android/incallui/MSimInCallActivity.java @@ -63,6 +63,7 @@ public class MSimInCallActivity extends InCallActivity { | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD | WindowManager.LayoutParams.FLAG_IGNORE_CHEEK_PRESSES); + setTheme(R.style.InCallScreenWithActionBar); requestWindowFeature(Window.FEATURE_ACTION_BAR); getActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_TABS); |