commit | 6ced844e7655dc9fededcbe20046e1baf16f490e | [log] [tgz] |
---|---|---|
author | Michael Kolb <kolby@google.com> | Mon Aug 22 13:04:30 2011 -0700 |
committer | Michael Kolb <kolby@google.com> | Wed Aug 24 11:27:17 2011 -0700 |
tree | b90134f27f972770c58d99311babdaf5c74f7622 | |
parent | 4e772ec089ea2cb1844d7e2fca078dc12d98305c [diff] |
Fix icon resources Bug: 5066431 updated remaining icons: secure/partial/overlay progress various bookmark icons Change-Id: I474a1cd3981474eddbd4be0a38a8d0d8083232e1
diff --git a/res/drawable-hdpi/ic_downloads_holo_dark.png b/res/drawable-hdpi/ic_downloads_holo_dark.png index ac2f6bd..e6ac45a 100644 --- a/res/drawable-hdpi/ic_downloads_holo_dark.png +++ b/res/drawable-hdpi/ic_downloads_holo_dark.png Binary files differ
diff --git a/res/drawable-hdpi/ic_partial_secure.png b/res/drawable-hdpi/ic_partial_secure.png deleted file mode 100644 index e4b0068..0000000 --- a/res/drawable-hdpi/ic_partial_secure.png +++ /dev/null Binary files differ
diff --git a/res/drawable-hdpi/ic_secure_holo_dark.png b/res/drawable-hdpi/ic_secure_holo_dark.png index 72a40dd..32a49f7 100644 --- a/res/drawable-hdpi/ic_secure_holo_dark.png +++ b/res/drawable-hdpi/ic_secure_holo_dark.png Binary files differ
diff --git a/res/drawable-hdpi/ic_secure_overlay_holo_dark.png b/res/drawable-hdpi/ic_secure_overlay_holo_dark.png deleted file mode 100644 index c3bfe39..0000000 --- a/res/drawable-hdpi/ic_secure_overlay_holo_dark.png +++ /dev/null Binary files differ
diff --git a/res/drawable-hdpi/ic_secure_partial_holo_dark.png b/res/drawable-hdpi/ic_secure_partial_holo_dark.png new file mode 100644 index 0000000..24ba10e --- /dev/null +++ b/res/drawable-hdpi/ic_secure_partial_holo_dark.png Binary files differ
diff --git a/res/drawable-hdpi/progress_primary_holo_dark.9.png b/res/drawable-hdpi/progress_primary_holo_dark.9.png new file mode 100644 index 0000000..7cbff01 --- /dev/null +++ b/res/drawable-hdpi/progress_primary_holo_dark.9.png Binary files differ
diff --git a/res/drawable-mdpi/ic_partial_secure.png b/res/drawable-mdpi/ic_partial_secure.png deleted file mode 100644 index 3ef790b..0000000 --- a/res/drawable-mdpi/ic_partial_secure.png +++ /dev/null Binary files differ
diff --git a/res/drawable-mdpi/ic_secure_holo_dark.png b/res/drawable-mdpi/ic_secure_holo_dark.png index 7b10b65..458dd16 100644 --- a/res/drawable-mdpi/ic_secure_holo_dark.png +++ b/res/drawable-mdpi/ic_secure_holo_dark.png Binary files differ
diff --git a/res/drawable-mdpi/ic_secure_overlay_holo_dark.png b/res/drawable-mdpi/ic_secure_overlay_holo_dark.png deleted file mode 100644 index 98de31a..0000000 --- a/res/drawable-mdpi/ic_secure_overlay_holo_dark.png +++ /dev/null Binary files differ
diff --git a/res/drawable-mdpi/ic_secure_partial_holo_dark.png b/res/drawable-mdpi/ic_secure_partial_holo_dark.png new file mode 100644 index 0000000..14ef32d --- /dev/null +++ b/res/drawable-mdpi/ic_secure_partial_holo_dark.png Binary files differ
diff --git a/res/drawable-mdpi/progress_primary_holo_dark.9.png b/res/drawable-mdpi/progress_primary_holo_dark.9.png new file mode 100644 index 0000000..31228b6 --- /dev/null +++ b/res/drawable-mdpi/progress_primary_holo_dark.9.png Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_secure_holo_dark.png b/res/drawable-sw600dp-hdpi/ic_secure_holo_dark.png new file mode 100644 index 0000000..c11b709 --- /dev/null +++ b/res/drawable-sw600dp-hdpi/ic_secure_holo_dark.png Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_secure_partial_holo_dark.png b/res/drawable-sw600dp-hdpi/ic_secure_partial_holo_dark.png new file mode 100644 index 0000000..a90425a --- /dev/null +++ b/res/drawable-sw600dp-hdpi/ic_secure_partial_holo_dark.png Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_secure_holo_dark.png b/res/drawable-sw600dp-mdpi/ic_secure_holo_dark.png new file mode 100644 index 0000000..fac7629 --- /dev/null +++ b/res/drawable-sw600dp-mdpi/ic_secure_holo_dark.png Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_secure_partial_holo_dark.png b/res/drawable-sw600dp-mdpi/ic_secure_partial_holo_dark.png new file mode 100644 index 0000000..a7b6cf9 --- /dev/null +++ b/res/drawable-sw600dp-mdpi/ic_secure_partial_holo_dark.png Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_secure_holo_dark.png b/res/drawable-sw600dp-xhdpi/ic_secure_holo_dark.png new file mode 100644 index 0000000..1ce6c3f --- /dev/null +++ b/res/drawable-sw600dp-xhdpi/ic_secure_holo_dark.png Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_secure_partial_holo_dark.png b/res/drawable-sw600dp-xhdpi/ic_secure_partial_holo_dark.png new file mode 100644 index 0000000..01feec8 --- /dev/null +++ b/res/drawable-sw600dp-xhdpi/ic_secure_partial_holo_dark.png Binary files differ
diff --git a/res/drawable-xhdpi/bookmarks_widget_thumb_selector_focused.9.png b/res/drawable-xhdpi/bookmarks_widget_thumb_selector_focused.9.png index e95564f..6a1aa85 100644 --- a/res/drawable-xhdpi/bookmarks_widget_thumb_selector_focused.9.png +++ b/res/drawable-xhdpi/bookmarks_widget_thumb_selector_focused.9.png Binary files differ
diff --git a/res/drawable-xhdpi/border_thumb_bookmarks_widget_holo.9.png b/res/drawable-xhdpi/border_thumb_bookmarks_widget_holo.9.png index 40964eb..cc6bb2e 100644 --- a/res/drawable-xhdpi/border_thumb_bookmarks_widget_holo.9.png +++ b/res/drawable-xhdpi/border_thumb_bookmarks_widget_holo.9.png Binary files differ
diff --git a/res/drawable-xhdpi/ic_partial_secure.png b/res/drawable-xhdpi/ic_partial_secure.png deleted file mode 100644 index 82ff296..0000000 --- a/res/drawable-xhdpi/ic_partial_secure.png +++ /dev/null Binary files differ
diff --git a/res/drawable-xhdpi/ic_secure_holo_dark.png b/res/drawable-xhdpi/ic_secure_holo_dark.png index 0842acc..258774a 100644 --- a/res/drawable-xhdpi/ic_secure_holo_dark.png +++ b/res/drawable-xhdpi/ic_secure_holo_dark.png Binary files differ
diff --git a/res/drawable-xhdpi/ic_secure_overlay_holo_dark.png b/res/drawable-xhdpi/ic_secure_overlay_holo_dark.png deleted file mode 100644 index 3bd3d2c..0000000 --- a/res/drawable-xhdpi/ic_secure_overlay_holo_dark.png +++ /dev/null Binary files differ
diff --git a/res/drawable-xhdpi/ic_secure_partial_holo_dark.png b/res/drawable-xhdpi/ic_secure_partial_holo_dark.png new file mode 100644 index 0000000..86c5993 --- /dev/null +++ b/res/drawable-xhdpi/ic_secure_partial_holo_dark.png Binary files differ
diff --git a/res/drawable-xhdpi/progress_primary_holo_dark.9.png b/res/drawable-xhdpi/progress_primary_holo_dark.9.png new file mode 100644 index 0000000..097160b --- /dev/null +++ b/res/drawable-xhdpi/progress_primary_holo_dark.9.png Binary files differ
diff --git a/res/layout/title_bar.xml b/res/layout/title_bar.xml index acc49e6..eb3f782 100644 --- a/res/layout/title_bar.xml +++ b/res/layout/title_bar.xml
@@ -42,7 +42,7 @@ android:layout_height="wrap_content" android:background="@null" android:layout_below="@id/taburlbar" - android:src="@drawable/progress" + android:src="@drawable/progress_primary_holo_dark" android:layout_marginTop="@dimen/progress_bar_margin" android:visibility="gone" /> </RelativeLayout>
diff --git a/res/layout/title_bar_nav.xml b/res/layout/title_bar_nav.xml index e14c089..18cd4e7 100644 --- a/res/layout/title_bar_nav.xml +++ b/res/layout/title_bar_nav.xml
@@ -39,16 +39,14 @@ style="@style/HoloButton"> <ImageView android:id="@+id/favicon" - android:layout_width="36dip" - android:layout_height="36dip" - android:paddingLeft="8dip" - android:paddingRight="8dip" - android:layout_gravity="center_vertical" /> + android:layout_width="20dip" + android:layout_height="20dip" + android:layout_gravity="center" /> <ImageView android:id="@+id/lock" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="bottom|right" + android:layout_width="32dip" + android:layout_height="33dip" + android:layout_gravity="center" android:visibility="gone" /> </FrameLayout> <ImageView
diff --git a/res/values-sw600dp/dimensions.xml b/res/values-sw600dp/dimensions.xml index bc87333..78956d6 100644 --- a/res/values-sw600dp/dimensions.xml +++ b/res/values-sw600dp/dimensions.xml
@@ -36,7 +36,6 @@ <dimen name="qc_item_size">48dip</dimen> <dimen name="suggest_item_padding">16dp</dimen> <dimen name="toolbar_height">48dip</dimen> - <dimen name="progress_bar_margin">-11dip</dimen> <dimen name="tab_thumbnail_width">@dimen/qc_thumb_width</dimen> <dimen name="tab_thumbnail_height">@dimen/qc_thumb_height</dimen> </resources>
diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java index 80f4de8..3b8ecc6 100644 --- a/src/com/android/browser/BaseUi.java +++ b/src/com/android/browser/BaseUi.java
@@ -116,7 +116,7 @@ mInputManager = (InputMethodManager) browser.getSystemService(Activity.INPUT_METHOD_SERVICE); mSecLockIcon = res.getDrawable(R.drawable.ic_secure_holo_dark); - mMixLockIcon = res.getDrawable(R.drawable.ic_partial_secure); + mMixLockIcon = res.getDrawable(R.drawable.ic_secure_partial_holo_dark); FrameLayout frameLayout = (FrameLayout) mActivity.getWindow() .getDecorView().findViewById(android.R.id.content);