Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug 3360882 - Allow FEATURE_CUSTOM_TITLE and FEATURE_ACTION_MODE_OVERLAY to coexist." into honeycomb

Browse Source
This commit is contained in:
Adam Powell
2011-01-16 19:58:51 -08:00
committed by Android (Google) Code Review
parent d110889cbc 8f68f4fe79
commit 92cd4d0296
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/res/res/layout/dialog_custom_title_holo.xml
View File

@@ -23,10 +23,19 @@ This is an custom layout for a dialog.
android:fitsSystemWindows="true">
<FrameLayout android:id="@android:id/title_container"
android:layout_width="match_parent"
android:layout_height="24dip"
android:layout_height="60dip"
android:layout_weight="0"
android:gravity="center_vertical|left"
style="?android:attr/windowTitleBackgroundStyle">
</FrameLayout>
<ImageView android:id="@+id/titleDivider"
android:layout_width="match_parent"
android:layout_height="4dip"
android:scaleType="fitXY"
android:gravity="fill_horizontal"
android:paddingLeft="16dip"
android:paddingRight="16dip"
android:src="@android:drawable/divider_strong_holo" />
<FrameLayout
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="1"
@@ -34,10 +43,6 @@ This is an custom layout for a dialog.
android:foreground="?android:attr/windowContentOverlay">
<FrameLayout android:id="@android:id/content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="6dip"
android:paddingBottom="10dip"
android:paddingLeft="10dip"
android:paddingRight="10dip" />
android:layout_height="match_parent" />
</FrameLayout>
</LinearLayout>

2
core/res/res/values/styles.xml
View File

@@ -2057,7 +2057,7 @@
<!-- Window title -->
<style name="WindowTitleBackground.Holo">
<item name="android:background">@android:drawable/title_bar</item>
<item name="android:background">@null</item>
</style>
<style name="WindowTitle.Holo">

3
policy/src/com/android/internal/policy/impl/PhoneWindow.java
View File

@@ -197,7 +197,8 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
/* Another feature is enabled and the user is trying to enable the custom title feature */
throw new AndroidRuntimeException("You cannot combine custom titles with other title features");
}
if (((features & (1 << FEATURE_CUSTOM_TITLE)) != 0) && (featureId != FEATURE_CUSTOM_TITLE)) {
if (((features & (1 << FEATURE_CUSTOM_TITLE)) != 0) &&
(featureId != FEATURE_CUSTOM_TITLE) && (featureId != FEATURE_ACTION_MODE_OVERLAY)) {
/* Custom title feature is enabled and the user is trying to enable another feature */
throw new AndroidRuntimeException("You cannot combine custom titles with other title features");