diff options
| -rw-r--r-- | core/java/android/webkit/WebView.java | 21 | ||||
| -rw-r--r-- | core/res/res/drawable-hdpi/title_bar_shadow.9.png | bin | 198 -> 0 bytes | |||
| -rw-r--r-- | core/res/res/drawable-ldpi/title_bar_shadow.9.png | bin | 118 -> 0 bytes | |||
| -rw-r--r-- | core/res/res/drawable-mdpi/title_bar_shadow.9.png | bin | 173 -> 0 bytes | |||
| -rw-r--r-- | core/res/res/layout/grant_credentials_permission.xml | 3 | ||||
| -rw-r--r-- | core/res/res/values/arrays.xml | 1 | ||||
| -rw-r--r-- | core/res/res/values/themes.xml | 2 | ||||
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/KeyguardViewBase.java | 7 |
8 files changed, 2 insertions, 32 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 383e977388d8..5bf2ad4192b7 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -2187,14 +2187,6 @@ public class WebView extends AbsoluteLayout private View mTitleBar; /** - * Since we draw the title bar ourselves, we removed the shadow from the - * browser's activity. We do want a shadow at the bottom of the title bar, - * or at the top of the screen if the title bar is not visible. This - * drawable serves that purpose. - */ - private Drawable mTitleShadow; - - /** * Add or remove a title bar to be embedded into the WebView, and scroll * along with it vertically, while remaining in view horizontally. Pass * null to remove the title bar from the WebView, and return to drawing @@ -2220,10 +2212,6 @@ public class WebView extends AbsoluteLayout addView(v, new AbsoluteLayout.LayoutParams( ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT, 0, 0)); - if (mTitleShadow == null) { - mTitleShadow = (Drawable) mContext.getResources().getDrawable( - com.android.internal.R.drawable.title_bar_shadow); - } } mTitleBar = v; } @@ -3470,15 +3458,6 @@ public class WebView extends AbsoluteLayout drawContent(canvas); canvas.restoreToCount(saveCount); - // Now draw the shadow. - int titleH = getVisibleTitleHeight(); - if (mTitleBar != null && titleH == 0) { - int height = (int) (5f * getContext().getResources() - .getDisplayMetrics().density); - mTitleShadow.setBounds(mScrollX, mScrollY, mScrollX + getWidth(), - mScrollY + height); - mTitleShadow.draw(canvas); - } if (AUTO_REDRAW_HACK && mAutoRedraw) { invalidate(); } diff --git a/core/res/res/drawable-hdpi/title_bar_shadow.9.png b/core/res/res/drawable-hdpi/title_bar_shadow.9.png Binary files differdeleted file mode 100644 index e6dab63b593c..000000000000 --- a/core/res/res/drawable-hdpi/title_bar_shadow.9.png +++ /dev/null diff --git a/core/res/res/drawable-ldpi/title_bar_shadow.9.png b/core/res/res/drawable-ldpi/title_bar_shadow.9.png Binary files differdeleted file mode 100644 index fc45ee82c1d6..000000000000 --- a/core/res/res/drawable-ldpi/title_bar_shadow.9.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/title_bar_shadow.9.png b/core/res/res/drawable-mdpi/title_bar_shadow.9.png Binary files differdeleted file mode 100644 index dbcefee17a32..000000000000 --- a/core/res/res/drawable-mdpi/title_bar_shadow.9.png +++ /dev/null diff --git a/core/res/res/layout/grant_credentials_permission.xml b/core/res/res/layout/grant_credentials_permission.xml index 4133ea94335b..0ffe8de6fbe0 100644 --- a/core/res/res/layout/grant_credentials_permission.xml +++ b/core/res/res/layout/grant_credentials_permission.xml @@ -47,8 +47,7 @@ android:layout_height="wrap_content" android:fillViewport="true" android:layout_weight="1" - android:gravity="top|center_horizontal" - android:foreground="@drawable/title_bar_shadow"> + android:gravity="top|center_horizontal"> <LinearLayout android:layout_width="match_parent" diff --git a/core/res/res/values/arrays.xml b/core/res/res/values/arrays.xml index 3e546a1e3c68..04c6538a79c8 100644 --- a/core/res/res/values/arrays.xml +++ b/core/res/res/values/arrays.xml @@ -67,7 +67,6 @@ <item>@drawable/text_select_handle_middle</item> <item>@drawable/text_select_handle_right</item> <item>@drawable/title_bar</item> - <item>@drawable/title_bar_shadow</item> <!-- Visual lock screen --> <item>@drawable/indicator_code_lock_drag_direction_green_up</item> <item>@drawable/indicator_code_lock_drag_direction_red_up</item> diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml index f5dca47941f8..9215bf22c634 100644 --- a/core/res/res/values/themes.xml +++ b/core/res/res/values/themes.xml @@ -130,7 +130,7 @@ <item name="windowNoTitle">false</item> <item name="windowFullscreen">false</item> <item name="windowIsFloating">false</item> - <item name="windowContentOverlay">@android:drawable/title_bar_shadow</item> + <item name="windowContentOverlay">@null</item> <item name="windowShowWallpaper">false</item> <item name="windowTitleStyle">@android:style/WindowTitle</item> <item name="windowTitleSize">25dip</item> diff --git a/policy/src/com/android/internal/policy/impl/KeyguardViewBase.java b/policy/src/com/android/internal/policy/impl/KeyguardViewBase.java index 34dbace68339..82753b2f7670 100644 --- a/policy/src/com/android/internal/policy/impl/KeyguardViewBase.java +++ b/policy/src/com/android/internal/policy/impl/KeyguardViewBase.java @@ -43,13 +43,6 @@ public abstract class KeyguardViewBase extends FrameLayout { public KeyguardViewBase(Context context) { super(context); - - // drop shadow below status bar in keyguard too - mForegroundInPadding = false; - setForegroundGravity(Gravity.FILL_HORIZONTAL | Gravity.TOP); - setForeground( - context.getResources().getDrawable( - com.android.internal.R.drawable.title_bar_shadow)); } // used to inject callback |