diff options
377 files changed, 965 insertions, 729 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a1de131..c85ed3b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -20,6 +20,8 @@ <original-package android:name="com.android.browser" /> + <uses-sdk android:minSdkVersion="21"/> + <permission android:name="com.android.browser.permission.PRELOAD" android:label="@string/permission_preload_label" android:protectionLevel="signatureOrSystem" /> @@ -62,6 +64,7 @@ android:authorities="com.android.browser;browser" android:multiprocess="false" android:exported="true" + android:theme="@style/PreferencesTheme" android:readPermission="com.android.browser.permission.READ_HISTORY_BOOKMARKS" android:writePermission="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS"> <path-permission android:path="/bookmarks/search_suggest_query" @@ -145,10 +148,9 @@ </activity> <activity android:name="ShortcutActivity" - android:theme="@style/ShortcutTheme" + android:theme="@style/PreferencesTheme" android:label="@string/shortcut_bookmark" android:icon="@mipmap/ic_launcher_shortcut_browser_bookmark"> - <intent-filter> <action android:name="android.intent.action.CREATE_SHORTCUT" /> <category android:name="android.intent.category.DEFAULT" /> @@ -156,7 +158,7 @@ </activity> - <activity android:name="BrowserPreferencesPage" android:label="@string/menu_preferences"> + <activity android:name="BrowserPreferencesPage" android:label="@string/menu_preferences" android:theme="@style/PreferencesTheme"> <intent-filter> <action android:name="android.intent.action.MANAGE_NETWORK_USAGE" /> <category android:name="android.intent.category.DEFAULT" /> @@ -166,7 +168,7 @@ <activity android:name="BookmarkSearch" android:label="@string/bookmarks_search" android:stateNotNeeded="true" - android:theme="@android:style/Theme.NoDisplay" + android:theme="@style/PreferencesTheme" android:excludeFromRecents="true"> <intent-filter> <action android:name="android.intent.action.SEARCH" /> @@ -177,17 +179,18 @@ </activity> <activity android:name="AddBookmarkPage" android:label="@string/bookmarks_add_page" - android:theme="@style/DialogWhenLarge" + android:theme="@style/PreferencesTheme" android:configChanges="orientation|keyboardHidden|screenSize" android:windowSoftInputMode="adjustResize"> <intent-filter> <action android:name="android.intent.action.INSERT" /> <category android:name="android.intent.category.DEFAULT" /> <data android:mimeType="vnd.android.cursor.dir/bookmark"/> - </intent-filter> + android:theme="@style/PreferencesTheme" </intent-filter> </activity> - <activity android:name="ComboViewActivity"> + <activity android:name="ComboViewActivity" + android:theme="@style/PreferencesTheme"> </activity> <!-- Bookmark thumbnail homescreen widget --> @@ -212,7 +215,7 @@ android:name=".widget.BookmarkWidgetProxy" android:exported="false" /> <activity android:name=".widget.BookmarkWidgetConfigure" - android:theme="@android:style/Theme.Holo.DialogWhenLarge"> + android:theme="@android:style/Theme.Material.DialogWhenLarge"> <intent-filter> <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/> </intent-filter> @@ -271,4 +274,3 @@ </application> </manifest> - diff --git a/res/anim/button_elevation.xml b/res/anim/button_elevation.xml new file mode 100644 index 0000000..9159646 --- /dev/null +++ b/res/anim/button_elevation.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 The CyanogenMod Project + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +--> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true"> + <objectAnimator + android:propertyName="translationZ" + android:duration="@android:integer/config_shortAnimTime" + android:valueFrom="@dimen/elevation_low" + android:valueTo="@dimen/elevation_high" + android:valueType="floatType"/> + </item> + <item> + <objectAnimator + android:propertyName="translationZ" + android:duration="@android:integer/config_shortAnimTime" + android:valueFrom="@dimen/elevation_high" + android:valueTo="@dimen/elevation_low" + android:valueType="floatType"/> + </item> + </selector> diff --git a/res/drawable-hdpi/browsertab_add.png b/res/drawable-hdpi/browsertab_add.png Binary files differindex 7401eed..768ec1d 100644 --- a/res/drawable-hdpi/browsertab_add.png +++ b/res/drawable-hdpi/browsertab_add.png diff --git a/res/drawable-hdpi/browsertab_add_focused.png b/res/drawable-hdpi/browsertab_add_focused.png Binary files differindex 2ebe44e..30c371b 100644 --- a/res/drawable-hdpi/browsertab_add_focused.png +++ b/res/drawable-hdpi/browsertab_add_focused.png diff --git a/res/drawable-hdpi/browsertab_inactive.png b/res/drawable-hdpi/browsertab_inactive.png Binary files differindex eb2f4d9..3ba90b1 100644 --- a/res/drawable-hdpi/browsertab_inactive.png +++ b/res/drawable-hdpi/browsertab_inactive.png diff --git a/res/drawable-hdpi/default_video_poster.png b/res/drawable-hdpi/default_video_poster.png Binary files differindex 8c1c94a..1a322ca 100644 --- a/res/drawable-hdpi/default_video_poster.png +++ b/res/drawable-hdpi/default_video_poster.png diff --git a/res/drawable-hdpi/geolocation_permissions_prompt_background.9.png b/res/drawable-hdpi/geolocation_permissions_prompt_background.9.png Binary files differindex 1604a3d..185a80e 100644 --- a/res/drawable-hdpi/geolocation_permissions_prompt_background.9.png +++ b/res/drawable-hdpi/geolocation_permissions_prompt_background.9.png diff --git a/res/drawable-hdpi/ic_back_dark.png b/res/drawable-hdpi/ic_back_dark.png Binary files differnew file mode 100644 index 0000000..5fa4948 --- /dev/null +++ b/res/drawable-hdpi/ic_back_dark.png diff --git a/res/drawable-hdpi/ic_back_disabled_dark.png b/res/drawable-hdpi/ic_back_disabled_dark.png Binary files differnew file mode 100644 index 0000000..5fa4948 --- /dev/null +++ b/res/drawable-hdpi/ic_back_disabled_dark.png diff --git a/res/drawable-hdpi/ic_back_disabled_holo_dark.png b/res/drawable-hdpi/ic_back_disabled_holo_dark.png Binary files differdeleted file mode 100644 index eca8a56..0000000 --- a/res/drawable-hdpi/ic_back_disabled_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_back_hierarchy_dark.png b/res/drawable-hdpi/ic_back_hierarchy_dark.png Binary files differnew file mode 100644 index 0000000..86fa337 --- /dev/null +++ b/res/drawable-hdpi/ic_back_hierarchy_dark.png diff --git a/res/drawable-hdpi/ic_back_hierarchy_holo_dark.png b/res/drawable-hdpi/ic_back_hierarchy_holo_dark.png Binary files differdeleted file mode 100644 index ed99557..0000000 --- a/res/drawable-hdpi/ic_back_hierarchy_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_back_holo_dark.png b/res/drawable-hdpi/ic_back_holo_dark.png Binary files differdeleted file mode 100644 index 5e31b19..0000000 --- a/res/drawable-hdpi/ic_back_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_bookmark_black.png b/res/drawable-hdpi/ic_bookmark_black.png Binary files differnew file mode 100644 index 0000000..15aaccf --- /dev/null +++ b/res/drawable-hdpi/ic_bookmark_black.png diff --git a/res/drawable-hdpi/ic_bookmark_off_dark.png b/res/drawable-hdpi/ic_bookmark_off_dark.png Binary files differnew file mode 100644 index 0000000..99dc3dc --- /dev/null +++ b/res/drawable-hdpi/ic_bookmark_off_dark.png diff --git a/res/drawable-hdpi/ic_bookmark_off_holo_dark.png b/res/drawable-hdpi/ic_bookmark_off_holo_dark.png Binary files differdeleted file mode 100644 index f827be5..0000000 --- a/res/drawable-hdpi/ic_bookmark_off_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_bookmark_on_dark.png b/res/drawable-hdpi/ic_bookmark_on_dark.png Binary files differnew file mode 100644 index 0000000..c31388b --- /dev/null +++ b/res/drawable-hdpi/ic_bookmark_on_dark.png diff --git a/res/drawable-hdpi/ic_bookmark_on_holo_dark.png b/res/drawable-hdpi/ic_bookmark_on_holo_dark.png Binary files differdeleted file mode 100644 index 2aad5cc..0000000 --- a/res/drawable-hdpi/ic_bookmark_on_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_bookmark_widget_bookmark_dark.png b/res/drawable-hdpi/ic_bookmark_widget_bookmark_dark.png Binary files differnew file mode 100644 index 0000000..b29d9a2 --- /dev/null +++ b/res/drawable-hdpi/ic_bookmark_widget_bookmark_dark.png diff --git a/res/drawable-hdpi/ic_bookmark_widget_bookmark_holo_dark.png b/res/drawable-hdpi/ic_bookmark_widget_bookmark_holo_dark.png Binary files differdeleted file mode 100644 index 4e0d125..0000000 --- a/res/drawable-hdpi/ic_bookmark_widget_bookmark_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_bookmarks_dark.png b/res/drawable-hdpi/ic_bookmarks_dark.png Binary files differnew file mode 100644 index 0000000..b29d9a2 --- /dev/null +++ b/res/drawable-hdpi/ic_bookmarks_dark.png diff --git a/res/drawable-hdpi/ic_bookmarks_history_dark.png b/res/drawable-hdpi/ic_bookmarks_history_dark.png Binary files differnew file mode 100644 index 0000000..b29d9a2 --- /dev/null +++ b/res/drawable-hdpi/ic_bookmarks_history_dark.png diff --git a/res/drawable-hdpi/ic_bookmarks_history_holo_dark.png b/res/drawable-hdpi/ic_bookmarks_history_holo_dark.png Binary files differdeleted file mode 100644 index afd5c16..0000000 --- a/res/drawable-hdpi/ic_bookmarks_history_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_bookmarks_holo_dark.png b/res/drawable-hdpi/ic_bookmarks_holo_dark.png Binary files differdeleted file mode 100644 index c313cce..0000000 --- a/res/drawable-hdpi/ic_bookmarks_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_close_window_dark.png b/res/drawable-hdpi/ic_close_window_dark.png Binary files differnew file mode 100644 index 0000000..0fd1556 --- /dev/null +++ b/res/drawable-hdpi/ic_close_window_dark.png diff --git a/res/drawable-hdpi/ic_close_window_holo_dark.png b/res/drawable-hdpi/ic_close_window_holo_dark.png Binary files differdeleted file mode 100644 index 60bcd4c..0000000 --- a/res/drawable-hdpi/ic_close_window_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_delete_black.png b/res/drawable-hdpi/ic_delete_black.png Binary files differnew file mode 100644 index 0000000..4e34e33 --- /dev/null +++ b/res/drawable-hdpi/ic_delete_black.png diff --git a/res/drawable-hdpi/ic_desktop_dark.png b/res/drawable-hdpi/ic_desktop_dark.png Binary files differnew file mode 100644 index 0000000..4bb18fa --- /dev/null +++ b/res/drawable-hdpi/ic_desktop_dark.png diff --git a/res/drawable-hdpi/ic_desktop_holo_dark.png b/res/drawable-hdpi/ic_desktop_holo_dark.png Binary files differdeleted file mode 100644 index 76fbb85..0000000 --- a/res/drawable-hdpi/ic_desktop_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_folder_holo_dark.png b/res/drawable-hdpi/ic_folder_dark.png Binary files differindex 139d79b..139d79b 100644 --- a/res/drawable-hdpi/ic_folder_holo_dark.png +++ b/res/drawable-hdpi/ic_folder_dark.png diff --git a/res/drawable-hdpi/ic_forward_dark.png b/res/drawable-hdpi/ic_forward_dark.png Binary files differnew file mode 100644 index 0000000..1512685 --- /dev/null +++ b/res/drawable-hdpi/ic_forward_dark.png diff --git a/res/drawable-hdpi/ic_forward_disabled_dark.png b/res/drawable-hdpi/ic_forward_disabled_dark.png Binary files differnew file mode 100644 index 0000000..1512685 --- /dev/null +++ b/res/drawable-hdpi/ic_forward_disabled_dark.png diff --git a/res/drawable-hdpi/ic_forward_disabled_holo_dark.png b/res/drawable-hdpi/ic_forward_disabled_holo_dark.png Binary files differdeleted file mode 100644 index 9330b92..0000000 --- a/res/drawable-hdpi/ic_forward_disabled_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_forward_holo_dark.png b/res/drawable-hdpi/ic_forward_holo_dark.png Binary files differdeleted file mode 100644 index d5a5fa7..0000000 --- a/res/drawable-hdpi/ic_forward_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_gps_denied_dark.png b/res/drawable-hdpi/ic_gps_denied_dark.png Binary files differnew file mode 100644 index 0000000..9ac0cd3 --- /dev/null +++ b/res/drawable-hdpi/ic_gps_denied_dark.png diff --git a/res/drawable-hdpi/ic_gps_denied_holo_dark.png b/res/drawable-hdpi/ic_gps_denied_holo_dark.png Binary files differdeleted file mode 100644 index 5bd9c39..0000000 --- a/res/drawable-hdpi/ic_gps_denied_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_gps_on_dark.png b/res/drawable-hdpi/ic_gps_on_dark.png Binary files differnew file mode 100644 index 0000000..65aa70b --- /dev/null +++ b/res/drawable-hdpi/ic_gps_on_dark.png diff --git a/res/drawable-hdpi/ic_gps_on_holo_dark.png b/res/drawable-hdpi/ic_gps_on_holo_dark.png Binary files differdeleted file mode 100644 index e736362..0000000 --- a/res/drawable-hdpi/ic_gps_on_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_history_dark.png b/res/drawable-hdpi/ic_history_dark.png Binary files differnew file mode 100644 index 0000000..b2b1332 --- /dev/null +++ b/res/drawable-hdpi/ic_history_dark.png diff --git a/res/drawable-hdpi/ic_history_holo_dark.png b/res/drawable-hdpi/ic_history_holo_dark.png Binary files differdeleted file mode 100644 index 4f2ee7d..0000000 --- a/res/drawable-hdpi/ic_history_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_home_dark.png b/res/drawable-hdpi/ic_home_dark.png Binary files differnew file mode 100644 index 0000000..24d2df3 --- /dev/null +++ b/res/drawable-hdpi/ic_home_dark.png diff --git a/res/drawable-hdpi/ic_home_holo_dark.png b/res/drawable-hdpi/ic_home_holo_dark.png Binary files differdeleted file mode 100644 index f355507..0000000 --- a/res/drawable-hdpi/ic_home_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_home_info_dark.png b/res/drawable-hdpi/ic_home_info_dark.png Binary files differnew file mode 100644 index 0000000..aa5817a --- /dev/null +++ b/res/drawable-hdpi/ic_home_info_dark.png diff --git a/res/drawable-hdpi/ic_home_info_holo_dark.png b/res/drawable-hdpi/ic_home_info_holo_dark.png Binary files differdeleted file mode 100644 index 5a0d151..0000000 --- a/res/drawable-hdpi/ic_home_info_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_incognito_holo_dark.png b/res/drawable-hdpi/ic_incognito_dark.png Binary files differindex 3e44913..3e44913 100644 --- a/res/drawable-hdpi/ic_incognito_holo_dark.png +++ b/res/drawable-hdpi/ic_incognito_dark.png diff --git a/res/drawable-hdpi/ic_menu_new_window.png b/res/drawable-hdpi/ic_menu_new_window.png Binary files differindex ac9dbd6..77b1e4d 100644 --- a/res/drawable-hdpi/ic_menu_new_window.png +++ b/res/drawable-hdpi/ic_menu_new_window.png diff --git a/res/drawable-hdpi/ic_menu_overflow.png b/res/drawable-hdpi/ic_menu_overflow.png Binary files differindex a12aedf..fdc4a5a 100644 --- a/res/drawable-hdpi/ic_menu_overflow.png +++ b/res/drawable-hdpi/ic_menu_overflow.png diff --git a/res/drawable-hdpi/ic_mobile.png b/res/drawable-hdpi/ic_mobile.png Binary files differindex cd688c8..67f2289 100644 --- a/res/drawable-hdpi/ic_mobile.png +++ b/res/drawable-hdpi/ic_mobile.png diff --git a/res/drawable-hdpi/ic_new_incognito_holo_dark.png b/res/drawable-hdpi/ic_new_incognito_dark.png Binary files differindex 2d2f5bf..2d2f5bf 100644 --- a/res/drawable-hdpi/ic_new_incognito_holo_dark.png +++ b/res/drawable-hdpi/ic_new_incognito_dark.png diff --git a/res/drawable-hdpi/ic_new_window_dark.png b/res/drawable-hdpi/ic_new_window_dark.png Binary files differnew file mode 100644 index 0000000..481643e --- /dev/null +++ b/res/drawable-hdpi/ic_new_window_dark.png diff --git a/res/drawable-hdpi/ic_new_window_holo_dark.png b/res/drawable-hdpi/ic_new_window_holo_dark.png Binary files differdeleted file mode 100644 index 70cc97d..0000000 --- a/res/drawable-hdpi/ic_new_window_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_querybuilder_disabled.png b/res/drawable-hdpi/ic_querybuilder_disabled.png Binary files differindex 907a248..1dcd14b 100644 --- a/res/drawable-hdpi/ic_querybuilder_disabled.png +++ b/res/drawable-hdpi/ic_querybuilder_disabled.png diff --git a/res/drawable-hdpi/ic_querybuilder_normal.png b/res/drawable-hdpi/ic_querybuilder_normal.png Binary files differindex 195329d..1dcd14b 100644 --- a/res/drawable-hdpi/ic_querybuilder_normal.png +++ b/res/drawable-hdpi/ic_querybuilder_normal.png diff --git a/res/drawable-hdpi/ic_querybuilder_pressed.png b/res/drawable-hdpi/ic_querybuilder_pressed.png Binary files differindex 1ad9e05..1dcd14b 100644 --- a/res/drawable-hdpi/ic_querybuilder_pressed.png +++ b/res/drawable-hdpi/ic_querybuilder_pressed.png diff --git a/res/drawable-hdpi/ic_refresh_dark.png b/res/drawable-hdpi/ic_refresh_dark.png Binary files differnew file mode 100644 index 0000000..cd16fdd --- /dev/null +++ b/res/drawable-hdpi/ic_refresh_dark.png diff --git a/res/drawable-hdpi/ic_refresh_holo_dark.png b/res/drawable-hdpi/ic_refresh_holo_dark.png Binary files differdeleted file mode 100644 index b335c0f..0000000 --- a/res/drawable-hdpi/ic_refresh_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_search_category_bookmark.png b/res/drawable-hdpi/ic_search_category_bookmark.png Binary files differindex bdecfd0..79efe5f 100644 --- a/res/drawable-hdpi/ic_search_category_bookmark.png +++ b/res/drawable-hdpi/ic_search_category_bookmark.png diff --git a/res/drawable-hdpi/ic_search_category_browser.png b/res/drawable-hdpi/ic_search_category_browser.png Binary files differindex 30b7a1e..5d14f56 100644 --- a/res/drawable-hdpi/ic_search_category_browser.png +++ b/res/drawable-hdpi/ic_search_category_browser.png diff --git a/res/drawable-hdpi/ic_search_category_history.png b/res/drawable-hdpi/ic_search_category_history.png Binary files differindex 94c89ae..efc0240 100644 --- a/res/drawable-hdpi/ic_search_category_history.png +++ b/res/drawable-hdpi/ic_search_category_history.png diff --git a/res/drawable-hdpi/ic_search_category_suggest.png b/res/drawable-hdpi/ic_search_category_suggest.png Binary files differindex 165a11d..14d3919 100644 --- a/res/drawable-hdpi/ic_search_category_suggest.png +++ b/res/drawable-hdpi/ic_search_category_suggest.png diff --git a/res/drawable-hdpi/ic_search_dark.png b/res/drawable-hdpi/ic_search_dark.png Binary files differnew file mode 100644 index 0000000..a2fc5b2 --- /dev/null +++ b/res/drawable-hdpi/ic_search_dark.png diff --git a/res/drawable-hdpi/ic_search_holo_dark.png b/res/drawable-hdpi/ic_search_holo_dark.png Binary files differdeleted file mode 100644 index b33d638..0000000 --- a/res/drawable-hdpi/ic_search_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_secure_dark.png b/res/drawable-hdpi/ic_secure_dark.png Binary files differnew file mode 100644 index 0000000..76348f7 --- /dev/null +++ b/res/drawable-hdpi/ic_secure_dark.png diff --git a/res/drawable-hdpi/ic_secure_holo_dark.png b/res/drawable-hdpi/ic_secure_holo_dark.png Binary files differdeleted file mode 100644 index 32a49f7..0000000 --- a/res/drawable-hdpi/ic_secure_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_secure_partial_dark.png b/res/drawable-hdpi/ic_secure_partial_dark.png Binary files differnew file mode 100644 index 0000000..d7e3e5b --- /dev/null +++ b/res/drawable-hdpi/ic_secure_partial_dark.png diff --git a/res/drawable-hdpi/ic_secure_partial_holo_dark.png b/res/drawable-hdpi/ic_secure_partial_holo_dark.png Binary files differdeleted file mode 100644 index 24ba10e..0000000 --- a/res/drawable-hdpi/ic_secure_partial_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_settings_dark.png b/res/drawable-hdpi/ic_settings_dark.png Binary files differnew file mode 100644 index 0000000..f9a8915 --- /dev/null +++ b/res/drawable-hdpi/ic_settings_dark.png diff --git a/res/drawable-hdpi/ic_settings_holo_dark.png b/res/drawable-hdpi/ic_settings_holo_dark.png Binary files differdeleted file mode 100644 index ac3f40c..0000000 --- a/res/drawable-hdpi/ic_settings_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_share_holo_dark.png b/res/drawable-hdpi/ic_share_dark.png Binary files differindex 2094394..2094394 100644 --- a/res/drawable-hdpi/ic_share_holo_dark.png +++ b/res/drawable-hdpi/ic_share_dark.png diff --git a/res/drawable-hdpi/ic_stop_dark.png b/res/drawable-hdpi/ic_stop_dark.png Binary files differnew file mode 100644 index 0000000..0fd1556 --- /dev/null +++ b/res/drawable-hdpi/ic_stop_dark.png diff --git a/res/drawable-hdpi/ic_stop_holo_dark.png b/res/drawable-hdpi/ic_stop_holo_dark.png Binary files differdeleted file mode 100644 index 60bcd4c..0000000 --- a/res/drawable-hdpi/ic_stop_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_tab_close.png b/res/drawable-hdpi/ic_tab_close.png Binary files differindex 199af9a..794b7b7 100644 --- a/res/drawable-hdpi/ic_tab_close.png +++ b/res/drawable-hdpi/ic_tab_close.png diff --git a/res/drawable-hdpi/ic_voice_search_dark.png b/res/drawable-hdpi/ic_voice_search_dark.png Binary files differnew file mode 100644 index 0000000..e5c2e8a --- /dev/null +++ b/res/drawable-hdpi/ic_voice_search_dark.png diff --git a/res/drawable-hdpi/ic_voice_search_holo_dark.png b/res/drawable-hdpi/ic_voice_search_holo_dark.png Binary files differdeleted file mode 100644 index e79aa71..0000000 --- a/res/drawable-hdpi/ic_voice_search_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_web_dark.png b/res/drawable-hdpi/ic_web_dark.png Binary files differnew file mode 100644 index 0000000..0e3e7a9 --- /dev/null +++ b/res/drawable-hdpi/ic_web_dark.png diff --git a/res/drawable-hdpi/ic_web_holo_dark.png b/res/drawable-hdpi/ic_web_holo_dark.png Binary files differdeleted file mode 100644 index fe881c2..0000000 --- a/res/drawable-hdpi/ic_web_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_windows_dark.png b/res/drawable-hdpi/ic_windows_dark.png Binary files differnew file mode 100644 index 0000000..7eb5f5d --- /dev/null +++ b/res/drawable-hdpi/ic_windows_dark.png diff --git a/res/drawable-hdpi/ic_windows_holo_dark.png b/res/drawable-hdpi/ic_windows_holo_dark.png Binary files differdeleted file mode 100644 index cfc3f70..0000000 --- a/res/drawable-hdpi/ic_windows_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/nav_tab_bg.9.png b/res/drawable-hdpi/nav_tab_bg.9.png Binary files differindex 72ae85b..d7e8693 100644 --- a/res/drawable-hdpi/nav_tab_bg.9.png +++ b/res/drawable-hdpi/nav_tab_bg.9.png diff --git a/res/drawable-hdpi/progress.9.png b/res/drawable-hdpi/progress.9.png Binary files differindex da3ce0a..225bccd 100644 --- a/res/drawable-hdpi/progress.9.png +++ b/res/drawable-hdpi/progress.9.png diff --git a/res/drawable-hdpi/textfield_active_holo_dark.9.png b/res/drawable-hdpi/textfield_active_holo_dark.9.png Binary files differindex dd223c7..bd1e36c 100644 --- a/res/drawable-hdpi/textfield_active_holo_dark.9.png +++ b/res/drawable-hdpi/textfield_active_holo_dark.9.png diff --git a/res/drawable-hdpi/trashcan.png b/res/drawable-hdpi/trashcan.png Binary files differindex c203fe4..a9eac0c 100644 --- a/res/drawable-hdpi/trashcan.png +++ b/res/drawable-hdpi/trashcan.png diff --git a/res/drawable-mdpi/browsertab_add.png b/res/drawable-mdpi/browsertab_add.png Binary files differindex f960c1d..fbbe32b 100644 --- a/res/drawable-mdpi/browsertab_add.png +++ b/res/drawable-mdpi/browsertab_add.png diff --git a/res/drawable-mdpi/browsertab_add_focused.png b/res/drawable-mdpi/browsertab_add_focused.png Binary files differindex cb595f3..6b6f538 100644 --- a/res/drawable-mdpi/browsertab_add_focused.png +++ b/res/drawable-mdpi/browsertab_add_focused.png diff --git a/res/drawable-mdpi/browsertab_inactive.png b/res/drawable-mdpi/browsertab_inactive.png Binary files differindex 1db22a5..aa50b1b 100644 --- a/res/drawable-mdpi/browsertab_inactive.png +++ b/res/drawable-mdpi/browsertab_inactive.png diff --git a/res/drawable-mdpi/default_video_poster.png b/res/drawable-mdpi/default_video_poster.png Binary files differindex 9e62fa9..df7ac96 100644 --- a/res/drawable-mdpi/default_video_poster.png +++ b/res/drawable-mdpi/default_video_poster.png diff --git a/res/drawable-mdpi/geolocation_permissions_prompt_background.9.png b/res/drawable-mdpi/geolocation_permissions_prompt_background.9.png Binary files differindex 1604a3d..7a53cbb 100644 --- a/res/drawable-mdpi/geolocation_permissions_prompt_background.9.png +++ b/res/drawable-mdpi/geolocation_permissions_prompt_background.9.png diff --git a/res/drawable-mdpi/ic_back_dark.png b/res/drawable-mdpi/ic_back_dark.png Binary files differnew file mode 100644 index 0000000..9e662f6 --- /dev/null +++ b/res/drawable-mdpi/ic_back_dark.png diff --git a/res/drawable-mdpi/ic_back_disabled_dark.png b/res/drawable-mdpi/ic_back_disabled_dark.png Binary files differnew file mode 100644 index 0000000..9e662f6 --- /dev/null +++ b/res/drawable-mdpi/ic_back_disabled_dark.png diff --git a/res/drawable-mdpi/ic_back_disabled_holo_dark.png b/res/drawable-mdpi/ic_back_disabled_holo_dark.png Binary files differdeleted file mode 100644 index aca4345..0000000 --- a/res/drawable-mdpi/ic_back_disabled_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_back_hierarchy_dark.png b/res/drawable-mdpi/ic_back_hierarchy_dark.png Binary files differnew file mode 100644 index 0000000..5513b05 --- /dev/null +++ b/res/drawable-mdpi/ic_back_hierarchy_dark.png diff --git a/res/drawable-mdpi/ic_back_hierarchy_holo_dark.png b/res/drawable-mdpi/ic_back_hierarchy_holo_dark.png Binary files differdeleted file mode 100644 index 13d20ce..0000000 --- a/res/drawable-mdpi/ic_back_hierarchy_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_back_holo_dark.png b/res/drawable-mdpi/ic_back_holo_dark.png Binary files differdeleted file mode 100644 index 8977423..0000000 --- a/res/drawable-mdpi/ic_back_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_bookmark_black.png b/res/drawable-mdpi/ic_bookmark_black.png Binary files differnew file mode 100644 index 0000000..d7cd384 --- /dev/null +++ b/res/drawable-mdpi/ic_bookmark_black.png diff --git a/res/drawable-mdpi/ic_bookmark_off_holo_dark.png b/res/drawable-mdpi/ic_bookmark_off_dark.png Binary files differindex 825970c..825970c 100644 --- a/res/drawable-mdpi/ic_bookmark_off_holo_dark.png +++ b/res/drawable-mdpi/ic_bookmark_off_dark.png diff --git a/res/drawable-mdpi/ic_bookmark_on_holo_dark.png b/res/drawable-mdpi/ic_bookmark_on_dark.png Binary files differindex 82da4ea..82da4ea 100644 --- a/res/drawable-mdpi/ic_bookmark_on_holo_dark.png +++ b/res/drawable-mdpi/ic_bookmark_on_dark.png diff --git a/res/drawable-mdpi/ic_bookmark_widget_bookmark_dark.png b/res/drawable-mdpi/ic_bookmark_widget_bookmark_dark.png Binary files differnew file mode 100644 index 0000000..ec69d41 --- /dev/null +++ b/res/drawable-mdpi/ic_bookmark_widget_bookmark_dark.png diff --git a/res/drawable-mdpi/ic_bookmark_widget_bookmark_holo_dark.png b/res/drawable-mdpi/ic_bookmark_widget_bookmark_holo_dark.png Binary files differdeleted file mode 100644 index 0efb4c6..0000000 --- a/res/drawable-mdpi/ic_bookmark_widget_bookmark_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_bookmarks_dark.png b/res/drawable-mdpi/ic_bookmarks_dark.png Binary files differnew file mode 100644 index 0000000..ec69d41 --- /dev/null +++ b/res/drawable-mdpi/ic_bookmarks_dark.png diff --git a/res/drawable-mdpi/ic_bookmarks_history_dark.png b/res/drawable-mdpi/ic_bookmarks_history_dark.png Binary files differnew file mode 100644 index 0000000..ec69d41 --- /dev/null +++ b/res/drawable-mdpi/ic_bookmarks_history_dark.png diff --git a/res/drawable-mdpi/ic_bookmarks_history_holo_dark.png b/res/drawable-mdpi/ic_bookmarks_history_holo_dark.png Binary files differdeleted file mode 100644 index f4953e5..0000000 --- a/res/drawable-mdpi/ic_bookmarks_history_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_bookmarks_holo_dark.png b/res/drawable-mdpi/ic_bookmarks_holo_dark.png Binary files differdeleted file mode 100644 index d9b305f..0000000 --- a/res/drawable-mdpi/ic_bookmarks_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_close_window_dark.png b/res/drawable-mdpi/ic_close_window_dark.png Binary files differnew file mode 100644 index 0000000..e80681a --- /dev/null +++ b/res/drawable-mdpi/ic_close_window_dark.png diff --git a/res/drawable-mdpi/ic_close_window_holo_dark.png b/res/drawable-mdpi/ic_close_window_holo_dark.png Binary files differdeleted file mode 100644 index 682c0a5..0000000 --- a/res/drawable-mdpi/ic_close_window_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_delete_black.png b/res/drawable-mdpi/ic_delete_black.png Binary files differnew file mode 100644 index 0000000..213fe67 --- /dev/null +++ b/res/drawable-mdpi/ic_delete_black.png diff --git a/res/drawable-mdpi/ic_desktop_dark.png b/res/drawable-mdpi/ic_desktop_dark.png Binary files differnew file mode 100644 index 0000000..b74276c --- /dev/null +++ b/res/drawable-mdpi/ic_desktop_dark.png diff --git a/res/drawable-mdpi/ic_desktop_holo_dark.png b/res/drawable-mdpi/ic_desktop_holo_dark.png Binary files differdeleted file mode 100644 index 1bb8120..0000000 --- a/res/drawable-mdpi/ic_desktop_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_folder_holo_dark.png b/res/drawable-mdpi/ic_folder_dark.png Binary files differindex a9bebb9..a9bebb9 100644 --- a/res/drawable-mdpi/ic_folder_holo_dark.png +++ b/res/drawable-mdpi/ic_folder_dark.png diff --git a/res/drawable-mdpi/ic_forward_dark.png b/res/drawable-mdpi/ic_forward_dark.png Binary files differnew file mode 100644 index 0000000..c62019b --- /dev/null +++ b/res/drawable-mdpi/ic_forward_dark.png diff --git a/res/drawable-mdpi/ic_forward_disabled_dark.png b/res/drawable-mdpi/ic_forward_disabled_dark.png Binary files differnew file mode 100644 index 0000000..c62019b --- /dev/null +++ b/res/drawable-mdpi/ic_forward_disabled_dark.png diff --git a/res/drawable-mdpi/ic_forward_disabled_holo_dark.png b/res/drawable-mdpi/ic_forward_disabled_holo_dark.png Binary files differdeleted file mode 100644 index 5cd3f7f..0000000 --- a/res/drawable-mdpi/ic_forward_disabled_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_forward_holo_dark.png b/res/drawable-mdpi/ic_forward_holo_dark.png Binary files differdeleted file mode 100644 index 7f60012..0000000 --- a/res/drawable-mdpi/ic_forward_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_gps_denied_dark.png b/res/drawable-mdpi/ic_gps_denied_dark.png Binary files differnew file mode 100644 index 0000000..61f8c9b --- /dev/null +++ b/res/drawable-mdpi/ic_gps_denied_dark.png diff --git a/res/drawable-mdpi/ic_gps_denied_holo_dark.png b/res/drawable-mdpi/ic_gps_denied_holo_dark.png Binary files differdeleted file mode 100644 index 3a48b47..0000000 --- a/res/drawable-mdpi/ic_gps_denied_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_gps_on_dark.png b/res/drawable-mdpi/ic_gps_on_dark.png Binary files differnew file mode 100644 index 0000000..a125035 --- /dev/null +++ b/res/drawable-mdpi/ic_gps_on_dark.png diff --git a/res/drawable-mdpi/ic_gps_on_holo_dark.png b/res/drawable-mdpi/ic_gps_on_holo_dark.png Binary files differdeleted file mode 100644 index 505e29a..0000000 --- a/res/drawable-mdpi/ic_gps_on_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_history_dark.png b/res/drawable-mdpi/ic_history_dark.png Binary files differnew file mode 100644 index 0000000..b93da10 --- /dev/null +++ b/res/drawable-mdpi/ic_history_dark.png diff --git a/res/drawable-mdpi/ic_history_holo_dark.png b/res/drawable-mdpi/ic_history_holo_dark.png Binary files differdeleted file mode 100644 index 0e4e118..0000000 --- a/res/drawable-mdpi/ic_history_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_home_dark.png b/res/drawable-mdpi/ic_home_dark.png Binary files differnew file mode 100644 index 0000000..80545ce --- /dev/null +++ b/res/drawable-mdpi/ic_home_dark.png diff --git a/res/drawable-mdpi/ic_home_holo_dark.png b/res/drawable-mdpi/ic_home_holo_dark.png Binary files differdeleted file mode 100644 index 8884eaa..0000000 --- a/res/drawable-mdpi/ic_home_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_home_info_dark.png b/res/drawable-mdpi/ic_home_info_dark.png Binary files differnew file mode 100644 index 0000000..97f0e3b --- /dev/null +++ b/res/drawable-mdpi/ic_home_info_dark.png diff --git a/res/drawable-mdpi/ic_home_info_holo_dark.png b/res/drawable-mdpi/ic_home_info_holo_dark.png Binary files differdeleted file mode 100644 index 964b8c8..0000000 --- a/res/drawable-mdpi/ic_home_info_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_incognito_holo_dark.png b/res/drawable-mdpi/ic_incognito_dark.png Binary files differindex 197599c..197599c 100644 --- a/res/drawable-mdpi/ic_incognito_holo_dark.png +++ b/res/drawable-mdpi/ic_incognito_dark.png diff --git a/res/drawable-mdpi/ic_menu_new_window.png b/res/drawable-mdpi/ic_menu_new_window.png Binary files differindex 8b41251..39b6469 100644 --- a/res/drawable-mdpi/ic_menu_new_window.png +++ b/res/drawable-mdpi/ic_menu_new_window.png diff --git a/res/drawable-mdpi/ic_menu_overflow.png b/res/drawable-mdpi/ic_menu_overflow.png Binary files differindex 4a3bde3..1d8ad18 100644 --- a/res/drawable-mdpi/ic_menu_overflow.png +++ b/res/drawable-mdpi/ic_menu_overflow.png diff --git a/res/drawable-mdpi/ic_mobile.png b/res/drawable-mdpi/ic_mobile.png Binary files differindex 6cf4283..01b337b 100644 --- a/res/drawable-mdpi/ic_mobile.png +++ b/res/drawable-mdpi/ic_mobile.png diff --git a/res/drawable-mdpi/ic_new_incognito_holo_dark.png b/res/drawable-mdpi/ic_new_incognito_dark.png Binary files differindex e8a7f49..e8a7f49 100644 --- a/res/drawable-mdpi/ic_new_incognito_holo_dark.png +++ b/res/drawable-mdpi/ic_new_incognito_dark.png diff --git a/res/drawable-mdpi/ic_new_window_dark.png b/res/drawable-mdpi/ic_new_window_dark.png Binary files differnew file mode 100644 index 0000000..977dd34 --- /dev/null +++ b/res/drawable-mdpi/ic_new_window_dark.png diff --git a/res/drawable-mdpi/ic_new_window_holo_dark.png b/res/drawable-mdpi/ic_new_window_holo_dark.png Binary files differdeleted file mode 100644 index 026afd0..0000000 --- a/res/drawable-mdpi/ic_new_window_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_querybuilder_disabled.png b/res/drawable-mdpi/ic_querybuilder_disabled.png Binary files differindex 58956b6..0ec5214 100644 --- a/res/drawable-mdpi/ic_querybuilder_disabled.png +++ b/res/drawable-mdpi/ic_querybuilder_disabled.png diff --git a/res/drawable-mdpi/ic_querybuilder_normal.png b/res/drawable-mdpi/ic_querybuilder_normal.png Binary files differindex 0d2858b..0ec5214 100644 --- a/res/drawable-mdpi/ic_querybuilder_normal.png +++ b/res/drawable-mdpi/ic_querybuilder_normal.png diff --git a/res/drawable-mdpi/ic_querybuilder_pressed.png b/res/drawable-mdpi/ic_querybuilder_pressed.png Binary files differindex 0d2858b..0ec5214 100644 --- a/res/drawable-mdpi/ic_querybuilder_pressed.png +++ b/res/drawable-mdpi/ic_querybuilder_pressed.png diff --git a/res/drawable-mdpi/ic_refresh_dark.png b/res/drawable-mdpi/ic_refresh_dark.png Binary files differnew file mode 100644 index 0000000..235c84f --- /dev/null +++ b/res/drawable-mdpi/ic_refresh_dark.png diff --git a/res/drawable-mdpi/ic_refresh_holo_dark.png b/res/drawable-mdpi/ic_refresh_holo_dark.png Binary files differdeleted file mode 100644 index d015979..0000000 --- a/res/drawable-mdpi/ic_refresh_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_search_category_bookmark.png b/res/drawable-mdpi/ic_search_category_bookmark.png Binary files differindex cdf4be1..a3e60cc 100644 --- a/res/drawable-mdpi/ic_search_category_bookmark.png +++ b/res/drawable-mdpi/ic_search_category_bookmark.png diff --git a/res/drawable-mdpi/ic_search_category_browser.png b/res/drawable-mdpi/ic_search_category_browser.png Binary files differindex 455e640..4c393cc 100644 --- a/res/drawable-mdpi/ic_search_category_browser.png +++ b/res/drawable-mdpi/ic_search_category_browser.png diff --git a/res/drawable-mdpi/ic_search_category_history.png b/res/drawable-mdpi/ic_search_category_history.png Binary files differindex 0f63144..158072b 100644 --- a/res/drawable-mdpi/ic_search_category_history.png +++ b/res/drawable-mdpi/ic_search_category_history.png diff --git a/res/drawable-mdpi/ic_search_category_suggest.png b/res/drawable-mdpi/ic_search_category_suggest.png Binary files differindex 0f04fc4..8d21dbb 100644 --- a/res/drawable-mdpi/ic_search_category_suggest.png +++ b/res/drawable-mdpi/ic_search_category_suggest.png diff --git a/res/drawable-mdpi/ic_search_dark.png b/res/drawable-mdpi/ic_search_dark.png Binary files differnew file mode 100644 index 0000000..dff1e3a --- /dev/null +++ b/res/drawable-mdpi/ic_search_dark.png diff --git a/res/drawable-mdpi/ic_search_holo_dark.png b/res/drawable-mdpi/ic_search_holo_dark.png Binary files differdeleted file mode 100644 index 3a991cb..0000000 --- a/res/drawable-mdpi/ic_search_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_secure_dark.png b/res/drawable-mdpi/ic_secure_dark.png Binary files differnew file mode 100644 index 0000000..8568256 --- /dev/null +++ b/res/drawable-mdpi/ic_secure_dark.png diff --git a/res/drawable-mdpi/ic_secure_holo_dark.png b/res/drawable-mdpi/ic_secure_holo_dark.png Binary files differdeleted file mode 100644 index 458dd16..0000000 --- a/res/drawable-mdpi/ic_secure_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_secure_partial_dark.png b/res/drawable-mdpi/ic_secure_partial_dark.png Binary files differnew file mode 100644 index 0000000..cc8f039 --- /dev/null +++ b/res/drawable-mdpi/ic_secure_partial_dark.png diff --git a/res/drawable-mdpi/ic_secure_partial_holo_dark.png b/res/drawable-mdpi/ic_secure_partial_holo_dark.png Binary files differdeleted file mode 100644 index 14ef32d..0000000 --- a/res/drawable-mdpi/ic_secure_partial_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_settings_dark.png b/res/drawable-mdpi/ic_settings_dark.png Binary files differnew file mode 100644 index 0000000..fdcf657 --- /dev/null +++ b/res/drawable-mdpi/ic_settings_dark.png diff --git a/res/drawable-mdpi/ic_settings_holo_dark.png b/res/drawable-mdpi/ic_settings_holo_dark.png Binary files differdeleted file mode 100644 index 2ab07c4..0000000 --- a/res/drawable-mdpi/ic_settings_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_share_holo_dark.png b/res/drawable-mdpi/ic_share_dark.png Binary files differindex d02cbad..d02cbad 100644 --- a/res/drawable-mdpi/ic_share_holo_dark.png +++ b/res/drawable-mdpi/ic_share_dark.png diff --git a/res/drawable-mdpi/ic_stop_dark.png b/res/drawable-mdpi/ic_stop_dark.png Binary files differnew file mode 100644 index 0000000..e80681a --- /dev/null +++ b/res/drawable-mdpi/ic_stop_dark.png diff --git a/res/drawable-mdpi/ic_stop_holo_dark.png b/res/drawable-mdpi/ic_stop_holo_dark.png Binary files differdeleted file mode 100644 index 682c0a5..0000000 --- a/res/drawable-mdpi/ic_stop_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_tab_close.png b/res/drawable-mdpi/ic_tab_close.png Binary files differindex 33f5c43..df332ef 100644 --- a/res/drawable-mdpi/ic_tab_close.png +++ b/res/drawable-mdpi/ic_tab_close.png diff --git a/res/drawable-mdpi/ic_voice_search_dark.png b/res/drawable-mdpi/ic_voice_search_dark.png Binary files differnew file mode 100644 index 0000000..75730cd --- /dev/null +++ b/res/drawable-mdpi/ic_voice_search_dark.png diff --git a/res/drawable-mdpi/ic_voice_search_holo_dark.png b/res/drawable-mdpi/ic_voice_search_holo_dark.png Binary files differdeleted file mode 100644 index f809e52..0000000 --- a/res/drawable-mdpi/ic_voice_search_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_web_dark.png b/res/drawable-mdpi/ic_web_dark.png Binary files differnew file mode 100644 index 0000000..9083c63 --- /dev/null +++ b/res/drawable-mdpi/ic_web_dark.png diff --git a/res/drawable-mdpi/ic_web_holo_dark.png b/res/drawable-mdpi/ic_web_holo_dark.png Binary files differdeleted file mode 100644 index 7cab120..0000000 --- a/res/drawable-mdpi/ic_web_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_windows_dark.png b/res/drawable-mdpi/ic_windows_dark.png Binary files differnew file mode 100644 index 0000000..2cd98cc --- /dev/null +++ b/res/drawable-mdpi/ic_windows_dark.png diff --git a/res/drawable-mdpi/ic_windows_holo_dark.png b/res/drawable-mdpi/ic_windows_holo_dark.png Binary files differdeleted file mode 100644 index 4d1d3eb..0000000 --- a/res/drawable-mdpi/ic_windows_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/nav_tab_bg.9.png b/res/drawable-mdpi/nav_tab_bg.9.png Binary files differindex 717a8cf..d30ba95 100644 --- a/res/drawable-mdpi/nav_tab_bg.9.png +++ b/res/drawable-mdpi/nav_tab_bg.9.png diff --git a/res/drawable-mdpi/progress.9.png b/res/drawable-mdpi/progress.9.png Binary files differindex 9ccee66..0bfbeae 100644 --- a/res/drawable-mdpi/progress.9.png +++ b/res/drawable-mdpi/progress.9.png diff --git a/res/drawable-mdpi/textfield_active_holo_dark.9.png b/res/drawable-mdpi/textfield_active_holo_dark.9.png Binary files differindex 296760d..32140b6 100644 --- a/res/drawable-mdpi/textfield_active_holo_dark.9.png +++ b/res/drawable-mdpi/textfield_active_holo_dark.9.png diff --git a/res/drawable-mdpi/trashcan.png b/res/drawable-mdpi/trashcan.png Binary files differindex 053ba67..e4ea52e 100644 --- a/res/drawable-mdpi/trashcan.png +++ b/res/drawable-mdpi/trashcan.png diff --git a/res/drawable-nodpi/bg_browsertabs.png b/res/drawable-nodpi/bg_browsertabs.png Binary files differindex 8a517f7..ed73058 100644 --- a/res/drawable-nodpi/bg_browsertabs.png +++ b/res/drawable-nodpi/bg_browsertabs.png diff --git a/res/drawable-sw600dp-nodpi/bg_urlbar.png b/res/drawable-sw600dp-nodpi/bg_urlbar.png Binary files differindex 51e95e0..31c6443 100644 --- a/res/drawable-sw600dp-nodpi/bg_urlbar.png +++ b/res/drawable-sw600dp-nodpi/bg_urlbar.png diff --git a/res/drawable-xhdpi/browsertab_add.png b/res/drawable-xhdpi/browsertab_add.png Binary files differindex ef7603e..84f1123 100644 --- a/res/drawable-xhdpi/browsertab_add.png +++ b/res/drawable-xhdpi/browsertab_add.png diff --git a/res/drawable-xhdpi/browsertab_add_focused.png b/res/drawable-xhdpi/browsertab_add_focused.png Binary files differindex 7039974..56ea166 100644 --- a/res/drawable-xhdpi/browsertab_add_focused.png +++ b/res/drawable-xhdpi/browsertab_add_focused.png diff --git a/res/drawable-xhdpi/browsertab_inactive.png b/res/drawable-xhdpi/browsertab_inactive.png Binary files differindex 28eeed4..a4e93df 100644 --- a/res/drawable-xhdpi/browsertab_inactive.png +++ b/res/drawable-xhdpi/browsertab_inactive.png diff --git a/res/drawable-xhdpi/default_video_poster.png b/res/drawable-xhdpi/default_video_poster.png Binary files differindex 5eff15c..3098fd9 100644 --- a/res/drawable-xhdpi/default_video_poster.png +++ b/res/drawable-xhdpi/default_video_poster.png diff --git a/res/drawable-xhdpi/geolocation_permissions_prompt_background.9.png b/res/drawable-xhdpi/geolocation_permissions_prompt_background.9.png Binary files differindex 19a35a3..d9f2c5e 100644 --- a/res/drawable-xhdpi/geolocation_permissions_prompt_background.9.png +++ b/res/drawable-xhdpi/geolocation_permissions_prompt_background.9.png diff --git a/res/drawable-xhdpi/ic_back_dark.png b/res/drawable-xhdpi/ic_back_dark.png Binary files differnew file mode 100644 index 0000000..addbfc8 --- /dev/null +++ b/res/drawable-xhdpi/ic_back_dark.png diff --git a/res/drawable-xhdpi/ic_back_disabled_dark.png b/res/drawable-xhdpi/ic_back_disabled_dark.png Binary files differnew file mode 100644 index 0000000..addbfc8 --- /dev/null +++ b/res/drawable-xhdpi/ic_back_disabled_dark.png diff --git a/res/drawable-xhdpi/ic_back_disabled_holo_dark.png b/res/drawable-xhdpi/ic_back_disabled_holo_dark.png Binary files differdeleted file mode 100644 index 9f99c00..0000000 --- a/res/drawable-xhdpi/ic_back_disabled_holo_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_back_hierarchy_dark.png b/res/drawable-xhdpi/ic_back_hierarchy_dark.png Binary files differnew file mode 100644 index 0000000..815b155 --- /dev/null +++ b/res/drawable-xhdpi/ic_back_hierarchy_dark.png diff --git a/res/drawable-xhdpi/ic_back_hierarchy_holo_dark.png b/res/drawable-xhdpi/ic_back_hierarchy_holo_dark.png Binary files differdeleted file mode 100644 index e459b98..0000000 --- a/res/drawable-xhdpi/ic_back_hierarchy_holo_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_back_holo_dark.png b/res/drawable-xhdpi/ic_back_holo_dark.png Binary files differdeleted file mode 100644 index f79f20a..0000000 --- a/res/drawable-xhdpi/ic_back_holo_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_bookmark_black.png b/res/drawable-xhdpi/ic_bookmark_black.png Binary files differnew file mode 100644 index 0000000..9992141 --- /dev/null +++ b/res/drawable-xhdpi/ic_bookmark_black.png diff --git a/res/drawable-xhdpi/ic_bookmark_off_dark.png b/res/drawable-xhdpi/ic_bookmark_off_dark.png Binary files differnew file mode 100644 index 0000000..1472f6a --- /dev/null +++ b/res/drawable-xhdpi/ic_bookmark_off_dark.png diff --git a/res/drawable-xhdpi/ic_bookmark_off_holo_dark.png b/res/drawable-xhdpi/ic_bookmark_off_holo_dark.png Binary files differdeleted file mode 100644 index c60aad8..0000000 --- a/res/drawable-xhdpi/ic_bookmark_off_holo_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_bookmark_on_dark.png b/res/drawable-xhdpi/ic_bookmark_on_dark.png Binary files differnew file mode 100644 index 0000000..46de0e9 --- /dev/null +++ b/res/drawable-xhdpi/ic_bookmark_on_dark.png diff --git a/res/drawable-xhdpi/ic_bookmark_on_holo_dark.png b/res/drawable-xhdpi/ic_bookmark_on_holo_dark.png Binary files differdeleted file mode 100644 index 5219525..0000000 --- a/res/drawable-xhdpi/ic_bookmark_on_holo_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_bookmark_widget_bookmark_dark.png b/res/drawable-xhdpi/ic_bookmark_widget_bookmark_dark.png Binary files differnew file mode 100644 index 0000000..f9f1780 --- /dev/null +++ b/res/drawable-xhdpi/ic_bookmark_widget_bookmark_dark.png diff --git a/res/drawable-xhdpi/ic_bookmark_widget_bookmark_holo_dark.png b/res/drawable-xhdpi/ic_bookmark_widget_bookmark_holo_dark.png Binary files differdeleted file mode 100644 index 8025248..0000000 --- a/res/drawable-xhdpi/ic_bookmark_widget_bookmark_holo_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_bookmarks_dark.png b/res/drawable-xhdpi/ic_bookmarks_dark.png Binary files differnew file mode 100644 index 0000000..f9f1780 --- /dev/null +++ b/res/drawable-xhdpi/ic_bookmarks_dark.png diff --git a/res/drawable-xhdpi/ic_bookmarks_history_dark.png b/res/drawable-xhdpi/ic_bookmarks_history_dark.png Binary files differnew file mode 100644 index 0000000..f9f1780 --- /dev/null +++ b/res/drawable-xhdpi/ic_bookmarks_history_dark.png diff --git a/res/drawable-xhdpi/ic_bookmarks_history_holo_dark.png b/res/drawable-xhdpi/ic_bookmarks_history_holo_dark.png Binary files differdeleted file mode 100644 index 71fdd09..0000000 --- a/res/drawable-xhdpi/ic_bookmarks_history_holo_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_bookmarks_holo_dark.png b/res/drawable-xhdpi/ic_bookmarks_holo_dark.png Binary files differdeleted file mode 100644 index 00ae343..0000000 --- a/res/drawable-xhdpi/ic_bookmarks_holo_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_close_window_dark.png b/res/drawable-xhdpi/ic_close_window_dark.png Binary files differnew file mode 100644 index 0000000..76e07f0 --- /dev/null +++ b/res/drawable-xhdpi/ic_close_window_dark.png diff --git a/res/drawable-xhdpi/ic_close_window_holo_dark.png b/res/drawable-xhdpi/ic_close_window_holo_dark.png Binary files differdeleted file mode 100644 index da31f98..0000000 --- a/res/drawable-xhdpi/ic_close_window_holo_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_delete_black.png b/res/drawable-xhdpi/ic_delete_black.png Binary files differnew file mode 100644 index 0000000..e677071 --- /dev/null +++ b/res/drawable-xhdpi/ic_delete_black.png diff --git a/res/drawable-xhdpi/ic_desktop_dark.png b/res/drawable-xhdpi/ic_desktop_dark.png Binary files differnew file mode 100644 index 0000000..92b187d --- /dev/null +++ b/res/drawable-xhdpi/ic_desktop_dark.png diff --git a/res/drawable-xhdpi/ic_desktop_holo_dark.png b/res/drawable-xhdpi/ic_desktop_holo_dark.png Binary files differdeleted file mode 100644 index 1689e9d..0000000 --- a/res/drawable-xhdpi/ic_desktop_holo_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_folder_holo_dark.png b/res/drawable-xhdpi/ic_folder_dark.png Binary files differindex 6bdb7d0..6bdb7d0 100644 --- a/res/drawable-xhdpi/ic_folder_holo_dark.png +++ b/res/drawable-xhdpi/ic_folder_dark.png diff --git a/res/drawable-xhdpi/ic_forward_dark.png b/res/drawable-xhdpi/ic_forward_dark.png Binary files differnew file mode 100644 index 0000000..5ec9356 --- /dev/null +++ b/res/drawable-xhdpi/ic_forward_dark.png diff --git a/res/drawable-xhdpi/ic_forward_disabled_dark.png b/res/drawable-xhdpi/ic_forward_disabled_dark.png Binary files differnew file mode 100644 index 0000000..5ec9356 --- /dev/null +++ b/res/drawable-xhdpi/ic_forward_disabled_dark.png diff --git a/res/drawable-xhdpi/ic_forward_disabled_holo_dark.png b/res/drawable-xhdpi/ic_forward_disabled_holo_dark.png Binary files differdeleted file mode 100644 index bbe6571..0000000 --- a/res/drawable-xhdpi/ic_forward_disabled_holo_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_forward_holo_dark.png b/res/drawable-xhdpi/ic_forward_holo_dark.png Binary files differdeleted file mode 100644 index c0e8371..0000000 --- a/res/drawable-xhdpi/ic_forward_holo_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_gps_denied_dark.png b/res/drawable-xhdpi/ic_gps_denied_dark.png Binary files differnew file mode 100644 index 0000000..1894424 --- /dev/null +++ b/res/drawable-xhdpi/ic_gps_denied_dark.png diff --git a/res/drawable-xhdpi/ic_gps_denied_holo_dark.png b/res/drawable-xhdpi/ic_gps_denied_holo_dark.png Binary files differdeleted file mode 100644 index a695cda..0000000 --- a/res/drawable-xhdpi/ic_gps_denied_holo_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_gps_on_dark.png b/res/drawable-xhdpi/ic_gps_on_dark.png Binary files differnew file mode 100644 index 0000000..a5683f9 --- /dev/null +++ b/res/drawable-xhdpi/ic_gps_on_dark.png diff --git a/res/drawable-xhdpi/ic_gps_on_holo_dark.png b/res/drawable-xhdpi/ic_gps_on_holo_dark.png Binary files differdeleted file mode 100644 index 38c1892..0000000 --- a/res/drawable-xhdpi/ic_gps_on_holo_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_history_dark.png b/res/drawable-xhdpi/ic_history_dark.png Binary files differnew file mode 100644 index 0000000..7681ac8 --- /dev/null +++ b/res/drawable-xhdpi/ic_history_dark.png diff --git a/res/drawable-xhdpi/ic_history_holo_dark.png b/res/drawable-xhdpi/ic_history_holo_dark.png Binary files differdeleted file mode 100644 index c916bde..0000000 --- a/res/drawable-xhdpi/ic_history_holo_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_home_dark.png b/res/drawable-xhdpi/ic_home_dark.png Binary files differnew file mode 100644 index 0000000..d00f914 --- /dev/null +++ b/res/drawable-xhdpi/ic_home_dark.png diff --git a/res/drawable-xhdpi/ic_home_holo_dark.png b/res/drawable-xhdpi/ic_home_holo_dark.png Binary files differdeleted file mode 100644 index 177abe9..0000000 --- a/res/drawable-xhdpi/ic_home_holo_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_home_info_dark.png b/res/drawable-xhdpi/ic_home_info_dark.png Binary files differnew file mode 100644 index 0000000..16e375d --- /dev/null +++ b/res/drawable-xhdpi/ic_home_info_dark.png diff --git a/res/drawable-xhdpi/ic_home_info_holo_dark.png b/res/drawable-xhdpi/ic_home_info_holo_dark.png Binary files differdeleted file mode 100644 index 6f43ba5..0000000 --- a/res/drawable-xhdpi/ic_home_info_holo_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_incognito_holo_dark.png b/res/drawable-xhdpi/ic_incognito_dark.png Binary files differindex 94bf80e..94bf80e 100644 --- a/res/drawable-xhdpi/ic_incognito_holo_dark.png +++ b/res/drawable-xhdpi/ic_incognito_dark.png diff --git a/res/drawable-xhdpi/ic_menu_new_window.png b/res/drawable-xhdpi/ic_menu_new_window.png Binary files differindex 6caa148..9d61768 100644 --- a/res/drawable-xhdpi/ic_menu_new_window.png +++ b/res/drawable-xhdpi/ic_menu_new_window.png diff --git a/res/drawable-xhdpi/ic_menu_overflow.png b/res/drawable-xhdpi/ic_menu_overflow.png Binary files differindex 715cff8..1b04eda 100644 --- a/res/drawable-xhdpi/ic_menu_overflow.png +++ b/res/drawable-xhdpi/ic_menu_overflow.png diff --git a/res/drawable-xhdpi/ic_mobile.png b/res/drawable-xhdpi/ic_mobile.png Binary files differindex a055b07..1d0e829 100644 --- a/res/drawable-xhdpi/ic_mobile.png +++ b/res/drawable-xhdpi/ic_mobile.png diff --git a/res/drawable-xhdpi/ic_new_incognito_holo_dark.png b/res/drawable-xhdpi/ic_new_incognito_dark.png Binary files differindex 2f21240..2f21240 100644 --- a/res/drawable-xhdpi/ic_new_incognito_holo_dark.png +++ b/res/drawable-xhdpi/ic_new_incognito_dark.png diff --git a/res/drawable-xhdpi/ic_new_window_dark.png b/res/drawable-xhdpi/ic_new_window_dark.png Binary files differnew file mode 100644 index 0000000..6704210 --- /dev/null +++ b/res/drawable-xhdpi/ic_new_window_dark.png diff --git a/res/drawable-xhdpi/ic_new_window_holo_dark.png b/res/drawable-xhdpi/ic_new_window_holo_dark.png Binary files differdeleted file mode 100644 index 69420f7..0000000 --- a/res/drawable-xhdpi/ic_new_window_holo_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_querybuilder_disabled.png b/res/drawable-xhdpi/ic_querybuilder_disabled.png Binary files differindex 79fb478..7cc50bb 100644 --- a/res/drawable-xhdpi/ic_querybuilder_disabled.png +++ b/res/drawable-xhdpi/ic_querybuilder_disabled.png diff --git a/res/drawable-xhdpi/ic_querybuilder_normal.png b/res/drawable-xhdpi/ic_querybuilder_normal.png Binary files differindex 1a4680c..7cc50bb 100644 --- a/res/drawable-xhdpi/ic_querybuilder_normal.png +++ b/res/drawable-xhdpi/ic_querybuilder_normal.png diff --git a/res/drawable-xhdpi/ic_querybuilder_pressed.png b/res/drawable-xhdpi/ic_querybuilder_pressed.png Binary files differindex af9e7a1..7cc50bb 100644 --- a/res/drawable-xhdpi/ic_querybuilder_pressed.png +++ b/res/drawable-xhdpi/ic_querybuilder_pressed.png diff --git a/res/drawable-xhdpi/ic_refresh_dark.png b/res/drawable-xhdpi/ic_refresh_dark.png Binary files differnew file mode 100644 index 0000000..5f89fc2 --- /dev/null +++ b/res/drawable-xhdpi/ic_refresh_dark.png diff --git a/res/drawable-xhdpi/ic_refresh_holo_dark.png b/res/drawable-xhdpi/ic_refresh_holo_dark.png Binary files differdeleted file mode 100644 index efdf884..0000000 --- a/res/drawable-xhdpi/ic_refresh_holo_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_search_category_bookmark.png b/res/drawable-xhdpi/ic_search_category_bookmark.png Binary files differindex 6046a95..aa16953 100644 --- a/res/drawable-xhdpi/ic_search_category_bookmark.png +++ b/res/drawable-xhdpi/ic_search_category_bookmark.png diff --git a/res/drawable-xhdpi/ic_search_category_browser.png b/res/drawable-xhdpi/ic_search_category_browser.png Binary files differindex bb767b4..5523314 100644 --- a/res/drawable-xhdpi/ic_search_category_browser.png +++ b/res/drawable-xhdpi/ic_search_category_browser.png diff --git a/res/drawable-xhdpi/ic_search_category_history.png b/res/drawable-xhdpi/ic_search_category_history.png Binary files differindex 681e4b4..b5ef95d 100644 --- a/res/drawable-xhdpi/ic_search_category_history.png +++ b/res/drawable-xhdpi/ic_search_category_history.png diff --git a/res/drawable-xhdpi/ic_search_category_suggest.png b/res/drawable-xhdpi/ic_search_category_suggest.png Binary files differindex be0388c..a2d894f 100644 --- a/res/drawable-xhdpi/ic_search_category_suggest.png +++ b/res/drawable-xhdpi/ic_search_category_suggest.png diff --git a/res/drawable-xhdpi/ic_search_dark.png b/res/drawable-xhdpi/ic_search_dark.png Binary files differnew file mode 100644 index 0000000..043759a --- /dev/null +++ b/res/drawable-xhdpi/ic_search_dark.png diff --git a/res/drawable-xhdpi/ic_search_holo_dark.png b/res/drawable-xhdpi/ic_search_holo_dark.png Binary files differdeleted file mode 100644 index fbc62cf..0000000 --- a/res/drawable-xhdpi/ic_search_holo_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_secure_dark.png b/res/drawable-xhdpi/ic_secure_dark.png Binary files differnew file mode 100644 index 0000000..81a3542 --- /dev/null +++ b/res/drawable-xhdpi/ic_secure_dark.png diff --git a/res/drawable-xhdpi/ic_secure_holo_dark.png b/res/drawable-xhdpi/ic_secure_holo_dark.png Binary files differdeleted file mode 100644 index 258774a..0000000 --- a/res/drawable-xhdpi/ic_secure_holo_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_secure_partial_dark.png b/res/drawable-xhdpi/ic_secure_partial_dark.png Binary files differnew file mode 100644 index 0000000..1df4dd9 --- /dev/null +++ b/res/drawable-xhdpi/ic_secure_partial_dark.png diff --git a/res/drawable-xhdpi/ic_secure_partial_holo_dark.png b/res/drawable-xhdpi/ic_secure_partial_holo_dark.png Binary files differdeleted file mode 100644 index 86c5993..0000000 --- a/res/drawable-xhdpi/ic_secure_partial_holo_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_settings_dark.png b/res/drawable-xhdpi/ic_settings_dark.png Binary files differnew file mode 100644 index 0000000..12e5d10 --- /dev/null +++ b/res/drawable-xhdpi/ic_settings_dark.png diff --git a/res/drawable-xhdpi/ic_settings_holo_dark.png b/res/drawable-xhdpi/ic_settings_holo_dark.png Binary files differdeleted file mode 100644 index 0541407..0000000 --- a/res/drawable-xhdpi/ic_settings_holo_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_share_holo_dark.png b/res/drawable-xhdpi/ic_share_dark.png Binary files differindex 5c3047a..5c3047a 100644 --- a/res/drawable-xhdpi/ic_share_holo_dark.png +++ b/res/drawable-xhdpi/ic_share_dark.png diff --git a/res/drawable-xhdpi/ic_stop_dark.png b/res/drawable-xhdpi/ic_stop_dark.png Binary files differnew file mode 100644 index 0000000..0eb9d8b --- /dev/null +++ b/res/drawable-xhdpi/ic_stop_dark.png diff --git a/res/drawable-xhdpi/ic_stop_holo_dark.png b/res/drawable-xhdpi/ic_stop_holo_dark.png Binary files differdeleted file mode 100644 index da31f98..0000000 --- a/res/drawable-xhdpi/ic_stop_holo_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_tab_close.png b/res/drawable-xhdpi/ic_tab_close.png Binary files differindex 65f09dd..e9e9c7a 100644 --- a/res/drawable-xhdpi/ic_tab_close.png +++ b/res/drawable-xhdpi/ic_tab_close.png diff --git a/res/drawable-xhdpi/ic_voice_search_dark.png b/res/drawable-xhdpi/ic_voice_search_dark.png Binary files differnew file mode 100644 index 0000000..a6f37ee --- /dev/null +++ b/res/drawable-xhdpi/ic_voice_search_dark.png diff --git a/res/drawable-xhdpi/ic_voice_search_holo_dark.png b/res/drawable-xhdpi/ic_voice_search_holo_dark.png Binary files differdeleted file mode 100644 index 02876b7..0000000 --- a/res/drawable-xhdpi/ic_voice_search_holo_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_web_dark.png b/res/drawable-xhdpi/ic_web_dark.png Binary files differnew file mode 100644 index 0000000..bded242 --- /dev/null +++ b/res/drawable-xhdpi/ic_web_dark.png diff --git a/res/drawable-xhdpi/ic_web_holo_dark.png b/res/drawable-xhdpi/ic_web_holo_dark.png Binary files differdeleted file mode 100644 index 4395e8e..0000000 --- a/res/drawable-xhdpi/ic_web_holo_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_windows_dark.png b/res/drawable-xhdpi/ic_windows_dark.png Binary files differnew file mode 100644 index 0000000..5b07ad6 --- /dev/null +++ b/res/drawable-xhdpi/ic_windows_dark.png diff --git a/res/drawable-xhdpi/ic_windows_holo_dark.png b/res/drawable-xhdpi/ic_windows_holo_dark.png Binary files differdeleted file mode 100644 index c7411b7..0000000 --- a/res/drawable-xhdpi/ic_windows_holo_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/nav_tab_bg.9.png b/res/drawable-xhdpi/nav_tab_bg.9.png Binary files differindex d81bbca..9fa2234 100644 --- a/res/drawable-xhdpi/nav_tab_bg.9.png +++ b/res/drawable-xhdpi/nav_tab_bg.9.png diff --git a/res/drawable-xhdpi/progress.9.png b/res/drawable-xhdpi/progress.9.png Binary files differindex f6f8d8d..bf52847 100644 --- a/res/drawable-xhdpi/progress.9.png +++ b/res/drawable-xhdpi/progress.9.png diff --git a/res/drawable-xhdpi/textfield_active_holo_dark.9.png b/res/drawable-xhdpi/textfield_active_holo_dark.9.png Binary files differindex 97687e5..312b498 100644 --- a/res/drawable-xhdpi/textfield_active_holo_dark.9.png +++ b/res/drawable-xhdpi/textfield_active_holo_dark.9.png diff --git a/res/drawable-xhdpi/trashcan.png b/res/drawable-xhdpi/trashcan.png Binary files differindex 8b9982c..a9eac0c 100644 --- a/res/drawable-xhdpi/trashcan.png +++ b/res/drawable-xhdpi/trashcan.png diff --git a/res/drawable-xxhdpi/app_web_browser_sm.png b/res/drawable-xxhdpi/app_web_browser_sm.png Binary files differnew file mode 100644 index 0000000..45a5f12 --- /dev/null +++ b/res/drawable-xxhdpi/app_web_browser_sm.png diff --git a/res/drawable-xxhdpi/bg_bookmarks_widget_holo.9.png b/res/drawable-xxhdpi/bg_bookmarks_widget_holo.9.png Binary files differnew file mode 100644 index 0000000..62b411e --- /dev/null +++ b/res/drawable-xxhdpi/bg_bookmarks_widget_holo.9.png diff --git a/res/drawable-xxhdpi/bookmarks_widget_thumb_selector_focused.9.png b/res/drawable-xxhdpi/bookmarks_widget_thumb_selector_focused.9.png Binary files differnew file mode 100644 index 0000000..6a1aa85 --- /dev/null +++ b/res/drawable-xxhdpi/bookmarks_widget_thumb_selector_focused.9.png diff --git a/res/drawable-xxhdpi/bookmarks_widget_thumb_selector_longpressed.9.png b/res/drawable-xxhdpi/bookmarks_widget_thumb_selector_longpressed.9.png Binary files differnew file mode 100644 index 0000000..f0233c4 --- /dev/null +++ b/res/drawable-xxhdpi/bookmarks_widget_thumb_selector_longpressed.9.png diff --git a/res/drawable-xxhdpi/bookmarks_widget_thumb_selector_pressed.9.png b/res/drawable-xxhdpi/bookmarks_widget_thumb_selector_pressed.9.png Binary files differnew file mode 100644 index 0000000..7fb84e2 --- /dev/null +++ b/res/drawable-xxhdpi/bookmarks_widget_thumb_selector_pressed.9.png diff --git a/res/drawable-xxhdpi/border_thumb_bookmarks_widget_holo.9.png b/res/drawable-xxhdpi/border_thumb_bookmarks_widget_holo.9.png Binary files differnew file mode 100644 index 0000000..cc6bb2e --- /dev/null +++ b/res/drawable-xxhdpi/border_thumb_bookmarks_widget_holo.9.png diff --git a/res/drawable-xxhdpi/browser_thumbnail.png b/res/drawable-xxhdpi/browser_thumbnail.png Binary files differnew file mode 100644 index 0000000..a2db941 --- /dev/null +++ b/res/drawable-xxhdpi/browser_thumbnail.png diff --git a/res/drawable-xxhdpi/browser_widget_preview.png b/res/drawable-xxhdpi/browser_widget_preview.png Binary files differnew file mode 100644 index 0000000..2112b9e --- /dev/null +++ b/res/drawable-xxhdpi/browser_widget_preview.png diff --git a/res/drawable-xxhdpi/browsertab_add.png b/res/drawable-xxhdpi/browsertab_add.png Binary files differnew file mode 100644 index 0000000..60cc858 --- /dev/null +++ b/res/drawable-xxhdpi/browsertab_add.png diff --git a/res/drawable-xxhdpi/browsertab_add_focused.png b/res/drawable-xxhdpi/browsertab_add_focused.png Binary files differnew file mode 100644 index 0000000..4ccee3d --- /dev/null +++ b/res/drawable-xxhdpi/browsertab_add_focused.png diff --git a/res/drawable-xxhdpi/browsertab_inactive.png b/res/drawable-xxhdpi/browsertab_inactive.png Binary files differnew file mode 100644 index 0000000..07d7e0e --- /dev/null +++ b/res/drawable-xxhdpi/browsertab_inactive.png diff --git a/res/drawable-xxhdpi/default_video_poster.png b/res/drawable-xxhdpi/default_video_poster.png Binary files differnew file mode 100644 index 0000000..373585e --- /dev/null +++ b/res/drawable-xxhdpi/default_video_poster.png diff --git a/res/drawable-xxhdpi/geolocation_permissions_prompt_background.9.png b/res/drawable-xxhdpi/geolocation_permissions_prompt_background.9.png Binary files differnew file mode 100644 index 0000000..a8a548c --- /dev/null +++ b/res/drawable-xxhdpi/geolocation_permissions_prompt_background.9.png diff --git a/res/drawable-xxhdpi/ic_add_string.png b/res/drawable-xxhdpi/ic_add_string.png Binary files differnew file mode 100644 index 0000000..7ea150d --- /dev/null +++ b/res/drawable-xxhdpi/ic_add_string.png diff --git a/res/drawable-xxhdpi/ic_back_dark.png b/res/drawable-xxhdpi/ic_back_dark.png Binary files differnew file mode 100644 index 0000000..4057cc5 --- /dev/null +++ b/res/drawable-xxhdpi/ic_back_dark.png diff --git a/res/drawable-xxhdpi/ic_back_disabled_dark.png b/res/drawable-xxhdpi/ic_back_disabled_dark.png Binary files differnew file mode 100644 index 0000000..4057cc5 --- /dev/null +++ b/res/drawable-xxhdpi/ic_back_disabled_dark.png diff --git a/res/drawable-xxhdpi/ic_back_hierarchy_dark.png b/res/drawable-xxhdpi/ic_back_hierarchy_dark.png Binary files differnew file mode 100644 index 0000000..69ac65e --- /dev/null +++ b/res/drawable-xxhdpi/ic_back_hierarchy_dark.png diff --git a/res/drawable-xxhdpi/ic_bookmark_black.png b/res/drawable-xxhdpi/ic_bookmark_black.png Binary files differnew file mode 100644 index 0000000..1e4c01b --- /dev/null +++ b/res/drawable-xxhdpi/ic_bookmark_black.png diff --git a/res/drawable-xxhdpi/ic_bookmark_off_dark.png b/res/drawable-xxhdpi/ic_bookmark_off_dark.png Binary files differnew file mode 100644 index 0000000..ba8eccb --- /dev/null +++ b/res/drawable-xxhdpi/ic_bookmark_off_dark.png diff --git a/res/drawable-xxhdpi/ic_bookmark_on_dark.png b/res/drawable-xxhdpi/ic_bookmark_on_dark.png Binary files differnew file mode 100644 index 0000000..33a28c0 --- /dev/null +++ b/res/drawable-xxhdpi/ic_bookmark_on_dark.png diff --git a/res/drawable-xxhdpi/ic_bookmark_widget_bookmark_dark.png b/res/drawable-xxhdpi/ic_bookmark_widget_bookmark_dark.png Binary files differnew file mode 100644 index 0000000..7267a25 --- /dev/null +++ b/res/drawable-xxhdpi/ic_bookmark_widget_bookmark_dark.png diff --git a/res/drawable-xxhdpi/ic_bookmarks_dark.png b/res/drawable-xxhdpi/ic_bookmarks_dark.png Binary files differnew file mode 100644 index 0000000..7267a25 --- /dev/null +++ b/res/drawable-xxhdpi/ic_bookmarks_dark.png diff --git a/res/drawable-xxhdpi/ic_bookmarks_history_dark.png b/res/drawable-xxhdpi/ic_bookmarks_history_dark.png Binary files differnew file mode 100644 index 0000000..7267a25 --- /dev/null +++ b/res/drawable-xxhdpi/ic_bookmarks_history_dark.png diff --git a/res/drawable-xxhdpi/ic_cancel_white_24dp.png b/res/drawable-xxhdpi/ic_cancel_white_24dp.png Binary files differnew file mode 100644 index 0000000..faa409f --- /dev/null +++ b/res/drawable-xxhdpi/ic_cancel_white_24dp.png diff --git a/res/drawable-xxhdpi/ic_close_window_dark.png b/res/drawable-xxhdpi/ic_close_window_dark.png Binary files differnew file mode 100644 index 0000000..0eb9d8b --- /dev/null +++ b/res/drawable-xxhdpi/ic_close_window_dark.png diff --git a/res/drawable-xxhdpi/ic_delete_black.png b/res/drawable-xxhdpi/ic_delete_black.png Binary files differnew file mode 100644 index 0000000..8d86e58 --- /dev/null +++ b/res/drawable-xxhdpi/ic_delete_black.png diff --git a/res/drawable-xxhdpi/ic_desktop_dark.png b/res/drawable-xxhdpi/ic_desktop_dark.png Binary files differnew file mode 100644 index 0000000..b54a561 --- /dev/null +++ b/res/drawable-xxhdpi/ic_desktop_dark.png diff --git a/res/drawable-xxhdpi/ic_dialog_browser_certificate_partially_secure.png b/res/drawable-xxhdpi/ic_dialog_browser_certificate_partially_secure.png Binary files differnew file mode 100644 index 0000000..37c0b91 --- /dev/null +++ b/res/drawable-xxhdpi/ic_dialog_browser_certificate_partially_secure.png diff --git a/res/drawable-xxhdpi/ic_dialog_browser_certificate_secure.png b/res/drawable-xxhdpi/ic_dialog_browser_certificate_secure.png Binary files differnew file mode 100644 index 0000000..036eba6 --- /dev/null +++ b/res/drawable-xxhdpi/ic_dialog_browser_certificate_secure.png diff --git a/res/drawable-xxhdpi/ic_dialog_browser_security_bad.png b/res/drawable-xxhdpi/ic_dialog_browser_security_bad.png Binary files differnew file mode 100644 index 0000000..1e3068b --- /dev/null +++ b/res/drawable-xxhdpi/ic_dialog_browser_security_bad.png diff --git a/res/drawable-xxhdpi/ic_dialog_browser_security_good.png b/res/drawable-xxhdpi/ic_dialog_browser_security_good.png Binary files differnew file mode 100644 index 0000000..e8badf6 --- /dev/null +++ b/res/drawable-xxhdpi/ic_dialog_browser_security_good.png diff --git a/res/drawable-xxhdpi/ic_folder_dark.png b/res/drawable-xxhdpi/ic_folder_dark.png Binary files differnew file mode 100644 index 0000000..6bdb7d0 --- /dev/null +++ b/res/drawable-xxhdpi/ic_folder_dark.png diff --git a/res/drawable-xxhdpi/ic_forward_dark.png b/res/drawable-xxhdpi/ic_forward_dark.png Binary files differnew file mode 100644 index 0000000..5ec9356 --- /dev/null +++ b/res/drawable-xxhdpi/ic_forward_dark.png diff --git a/res/drawable-xxhdpi/ic_forward_disabled_dark.png b/res/drawable-xxhdpi/ic_forward_disabled_dark.png Binary files differnew file mode 100644 index 0000000..5ec9356 --- /dev/null +++ b/res/drawable-xxhdpi/ic_forward_disabled_dark.png diff --git a/res/drawable-xxhdpi/ic_gps_denied_dark.png b/res/drawable-xxhdpi/ic_gps_denied_dark.png Binary files differnew file mode 100644 index 0000000..0478775 --- /dev/null +++ b/res/drawable-xxhdpi/ic_gps_denied_dark.png diff --git a/res/drawable-xxhdpi/ic_gps_on_dark.png b/res/drawable-xxhdpi/ic_gps_on_dark.png Binary files differnew file mode 100644 index 0000000..72f948e --- /dev/null +++ b/res/drawable-xxhdpi/ic_gps_on_dark.png diff --git a/res/drawable-xxhdpi/ic_history_dark.png b/res/drawable-xxhdpi/ic_history_dark.png Binary files differnew file mode 100644 index 0000000..3e438ec --- /dev/null +++ b/res/drawable-xxhdpi/ic_history_dark.png diff --git a/res/drawable-xxhdpi/ic_home_dark.png b/res/drawable-xxhdpi/ic_home_dark.png Binary files differnew file mode 100644 index 0000000..fd40ac3 --- /dev/null +++ b/res/drawable-xxhdpi/ic_home_dark.png diff --git a/res/drawable-xxhdpi/ic_home_info_dark.png b/res/drawable-xxhdpi/ic_home_info_dark.png Binary files differnew file mode 100644 index 0000000..c67573f --- /dev/null +++ b/res/drawable-xxhdpi/ic_home_info_dark.png diff --git a/res/drawable-xxhdpi/ic_incognito_dark.png b/res/drawable-xxhdpi/ic_incognito_dark.png Binary files differnew file mode 100644 index 0000000..94bf80e --- /dev/null +++ b/res/drawable-xxhdpi/ic_incognito_dark.png diff --git a/res/drawable-xxhdpi/ic_list_data_large.png b/res/drawable-xxhdpi/ic_list_data_large.png Binary files differnew file mode 100644 index 0000000..4047c4d --- /dev/null +++ b/res/drawable-xxhdpi/ic_list_data_large.png diff --git a/res/drawable-xxhdpi/ic_list_data_off.png b/res/drawable-xxhdpi/ic_list_data_off.png Binary files differnew file mode 100644 index 0000000..b508b6b --- /dev/null +++ b/res/drawable-xxhdpi/ic_list_data_off.png diff --git a/res/drawable-xxhdpi/ic_list_data_small.png b/res/drawable-xxhdpi/ic_list_data_small.png Binary files differnew file mode 100644 index 0000000..680e69c --- /dev/null +++ b/res/drawable-xxhdpi/ic_list_data_small.png diff --git a/res/drawable-xxhdpi/ic_menu_new_window.png b/res/drawable-xxhdpi/ic_menu_new_window.png Binary files differnew file mode 100644 index 0000000..9d61768 --- /dev/null +++ b/res/drawable-xxhdpi/ic_menu_new_window.png diff --git a/res/drawable-xxhdpi/ic_menu_overflow.png b/res/drawable-xxhdpi/ic_menu_overflow.png Binary files differnew file mode 100644 index 0000000..2ed4457 --- /dev/null +++ b/res/drawable-xxhdpi/ic_menu_overflow.png diff --git a/res/drawable-xxhdpi/ic_mobile.png b/res/drawable-xxhdpi/ic_mobile.png Binary files differnew file mode 100644 index 0000000..842451a --- /dev/null +++ b/res/drawable-xxhdpi/ic_mobile.png diff --git a/res/drawable-xxhdpi/ic_new_incognito_dark.png b/res/drawable-xxhdpi/ic_new_incognito_dark.png Binary files differnew file mode 100644 index 0000000..2f21240 --- /dev/null +++ b/res/drawable-xxhdpi/ic_new_incognito_dark.png diff --git a/res/drawable-xxhdpi/ic_new_window_dark.png b/res/drawable-xxhdpi/ic_new_window_dark.png Binary files differnew file mode 100644 index 0000000..49b3e0b --- /dev/null +++ b/res/drawable-xxhdpi/ic_new_window_dark.png diff --git a/res/drawable-xxhdpi/ic_querybuilder_disabled.png b/res/drawable-xxhdpi/ic_querybuilder_disabled.png Binary files differnew file mode 100644 index 0000000..c019a31 --- /dev/null +++ b/res/drawable-xxhdpi/ic_querybuilder_disabled.png diff --git a/res/drawable-xxhdpi/ic_querybuilder_normal.png b/res/drawable-xxhdpi/ic_querybuilder_normal.png Binary files differnew file mode 100644 index 0000000..c019a31 --- /dev/null +++ b/res/drawable-xxhdpi/ic_querybuilder_normal.png diff --git a/res/drawable-xxhdpi/ic_querybuilder_pressed.png b/res/drawable-xxhdpi/ic_querybuilder_pressed.png Binary files differnew file mode 100644 index 0000000..c019a31 --- /dev/null +++ b/res/drawable-xxhdpi/ic_querybuilder_pressed.png diff --git a/res/drawable-xxhdpi/ic_refresh_dark.png b/res/drawable-xxhdpi/ic_refresh_dark.png Binary files differnew file mode 100644 index 0000000..72128fe --- /dev/null +++ b/res/drawable-xxhdpi/ic_refresh_dark.png diff --git a/res/drawable-xxhdpi/ic_search_category_bookmark.png b/res/drawable-xxhdpi/ic_search_category_bookmark.png Binary files differnew file mode 100644 index 0000000..e200fcb --- /dev/null +++ b/res/drawable-xxhdpi/ic_search_category_bookmark.png diff --git a/res/drawable-xxhdpi/ic_search_category_browser.png b/res/drawable-xxhdpi/ic_search_category_browser.png Binary files differnew file mode 100644 index 0000000..2fe31c8 --- /dev/null +++ b/res/drawable-xxhdpi/ic_search_category_browser.png diff --git a/res/drawable-xxhdpi/ic_search_category_history.png b/res/drawable-xxhdpi/ic_search_category_history.png Binary files differnew file mode 100644 index 0000000..040d6a3 --- /dev/null +++ b/res/drawable-xxhdpi/ic_search_category_history.png diff --git a/res/drawable-xxhdpi/ic_search_category_suggest.png b/res/drawable-xxhdpi/ic_search_category_suggest.png Binary files differnew file mode 100644 index 0000000..f0c8c57 --- /dev/null +++ b/res/drawable-xxhdpi/ic_search_category_suggest.png diff --git a/res/drawable-xxhdpi/ic_search_dark.png b/res/drawable-xxhdpi/ic_search_dark.png Binary files differnew file mode 100644 index 0000000..0bbeab1 --- /dev/null +++ b/res/drawable-xxhdpi/ic_search_dark.png diff --git a/res/drawable-xxhdpi/ic_secure_dark.png b/res/drawable-xxhdpi/ic_secure_dark.png Binary files differnew file mode 100644 index 0000000..850e06e --- /dev/null +++ b/res/drawable-xxhdpi/ic_secure_dark.png diff --git a/res/drawable-xxhdpi/ic_secure_partial_dark.png b/res/drawable-xxhdpi/ic_secure_partial_dark.png Binary files differnew file mode 100644 index 0000000..aa32a7e --- /dev/null +++ b/res/drawable-xxhdpi/ic_secure_partial_dark.png diff --git a/res/drawable-xxhdpi/ic_settings_dark.png b/res/drawable-xxhdpi/ic_settings_dark.png Binary files differnew file mode 100644 index 0000000..6bb8f6e --- /dev/null +++ b/res/drawable-xxhdpi/ic_settings_dark.png diff --git a/res/drawable-xxhdpi/ic_share_dark.png b/res/drawable-xxhdpi/ic_share_dark.png Binary files differnew file mode 100644 index 0000000..9963c6a --- /dev/null +++ b/res/drawable-xxhdpi/ic_share_dark.png diff --git a/res/drawable-xxhdpi/ic_stop_dark.png b/res/drawable-xxhdpi/ic_stop_dark.png Binary files differnew file mode 100644 index 0000000..0eb9d8b --- /dev/null +++ b/res/drawable-xxhdpi/ic_stop_dark.png diff --git a/res/drawable-xxhdpi/ic_tab_close.png b/res/drawable-xxhdpi/ic_tab_close.png Binary files differnew file mode 100644 index 0000000..e9e9c7a --- /dev/null +++ b/res/drawable-xxhdpi/ic_tab_close.png diff --git a/res/drawable-xxhdpi/ic_voice_search_dark.png b/res/drawable-xxhdpi/ic_voice_search_dark.png Binary files differnew file mode 100644 index 0000000..077f8d8 --- /dev/null +++ b/res/drawable-xxhdpi/ic_voice_search_dark.png diff --git a/res/drawable-xxhdpi/ic_web_dark.png b/res/drawable-xxhdpi/ic_web_dark.png Binary files differnew file mode 100644 index 0000000..56e7246 --- /dev/null +++ b/res/drawable-xxhdpi/ic_web_dark.png diff --git a/res/drawable-xxhdpi/ic_windows_dark.png b/res/drawable-xxhdpi/ic_windows_dark.png Binary files differnew file mode 100644 index 0000000..9ff2296 --- /dev/null +++ b/res/drawable-xxhdpi/ic_windows_dark.png diff --git a/res/drawable-xxhdpi/magnifying_glass.png b/res/drawable-xxhdpi/magnifying_glass.png Binary files differnew file mode 100644 index 0000000..62742b7 --- /dev/null +++ b/res/drawable-xxhdpi/magnifying_glass.png diff --git a/res/drawable-xxhdpi/nav_tab_bg.9.png b/res/drawable-xxhdpi/nav_tab_bg.9.png Binary files differnew file mode 100644 index 0000000..b980597 --- /dev/null +++ b/res/drawable-xxhdpi/nav_tab_bg.9.png diff --git a/res/drawable-xxhdpi/overlay_url_bookmark_widget_holo.9.png b/res/drawable-xxhdpi/overlay_url_bookmark_widget_holo.9.png Binary files differnew file mode 100644 index 0000000..8bfaa63 --- /dev/null +++ b/res/drawable-xxhdpi/overlay_url_bookmark_widget_holo.9.png diff --git a/res/drawable-xxhdpi/progress.9.png b/res/drawable-xxhdpi/progress.9.png Binary files differnew file mode 100644 index 0000000..bf52847 --- /dev/null +++ b/res/drawable-xxhdpi/progress.9.png diff --git a/res/drawable-xxhdpi/qc_background_normal.png b/res/drawable-xxhdpi/qc_background_normal.png Binary files differnew file mode 100644 index 0000000..bea09ca --- /dev/null +++ b/res/drawable-xxhdpi/qc_background_normal.png diff --git a/res/drawable-xxhdpi/textfield_active_holo_dark.9.png b/res/drawable-xxhdpi/textfield_active_holo_dark.9.png Binary files differnew file mode 100644 index 0000000..09b9321 --- /dev/null +++ b/res/drawable-xxhdpi/textfield_active_holo_dark.9.png diff --git a/res/drawable-xxhdpi/textfield_default_holo_dark.9.png b/res/drawable-xxhdpi/textfield_default_holo_dark.9.png Binary files differnew file mode 100644 index 0000000..c3e59fc --- /dev/null +++ b/res/drawable-xxhdpi/textfield_default_holo_dark.9.png diff --git a/res/drawable-xxhdpi/thumb_bookmark_widget_folder_back_holo.png b/res/drawable-xxhdpi/thumb_bookmark_widget_folder_back_holo.png Binary files differnew file mode 100644 index 0000000..f1e6d36 --- /dev/null +++ b/res/drawable-xxhdpi/thumb_bookmark_widget_folder_back_holo.png diff --git a/res/drawable-xxhdpi/thumb_bookmark_widget_folder_holo.png b/res/drawable-xxhdpi/thumb_bookmark_widget_folder_holo.png Binary files differnew file mode 100644 index 0000000..5c3cfd2 --- /dev/null +++ b/res/drawable-xxhdpi/thumb_bookmark_widget_folder_holo.png diff --git a/res/drawable-xxhdpi/thumbnail_bookmarks_widget_no_bookmark_holo.png b/res/drawable-xxhdpi/thumbnail_bookmarks_widget_no_bookmark_holo.png Binary files differnew file mode 100644 index 0000000..7d24d4a --- /dev/null +++ b/res/drawable-xxhdpi/thumbnail_bookmarks_widget_no_bookmark_holo.png diff --git a/res/drawable-xxhdpi/trashcan.png b/res/drawable-xxhdpi/trashcan.png Binary files differnew file mode 100644 index 0000000..0e95e9b --- /dev/null +++ b/res/drawable-xxhdpi/trashcan.png diff --git a/res/drawable/browser_background_holo.xml b/res/drawable/browser_background_holo.xml index a225969..6d2d1da 100644 --- a/res/drawable/browser_background_holo.xml +++ b/res/drawable/browser_background_holo.xml @@ -16,6 +16,6 @@ <shape xmlns:android="http://schemas.android.com/apk/res/android"> <gradient android:type="linear" android:angle="90" - android:startColor="#FF000000" - android:endColor="#FF2D2D2D" /> -</shape>
\ No newline at end of file + android:startColor="#fafafa" + android:endColor="#fafafa" /> +</shape> diff --git a/res/drawable/btn_checkbox_star.xml b/res/drawable/btn_checkbox_star.xml index 08a8699..6f2c75b 100644 --- a/res/drawable/btn_checkbox_star.xml +++ b/res/drawable/btn_checkbox_star.xml @@ -16,7 +16,7 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_checked="true" - android:drawable="@drawable/ic_bookmark_on_holo_dark" /> + android:drawable="@drawable/ic_bookmark_on_dark" /> <item android:state_checked="false" - android:drawable="@drawable/ic_bookmark_off_holo_dark" /> + android:drawable="@drawable/ic_bookmark_off_dark" /> </selector> diff --git a/res/drawable/btn_imageview_star.xml b/res/drawable/btn_imageview_star.xml index c1bfb5d..319c199 100644 --- a/res/drawable/btn_imageview_star.xml +++ b/res/drawable/btn_imageview_star.xml @@ -16,7 +16,7 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_activated="true" - android:drawable="@drawable/ic_bookmark_on_holo_dark" /> + android:drawable="@drawable/ic_bookmark_on_dark" /> <item android:state_activated="false" - android:drawable="@drawable/ic_bookmark_off_holo_dark" /> + android:drawable="@drawable/ic_bookmark_off_dark" /> </selector> diff --git a/res/drawable/fab_accent.xml b/res/drawable/fab_accent.xml new file mode 100644 index 0000000..53395c3 --- /dev/null +++ b/res/drawable/fab_accent.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 The CyanogenMod Project + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +--> + +<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval"> + <solid android:color="#4caf50" /> +</shape> diff --git a/res/drawable/floating_action_button.xml b/res/drawable/floating_action_button.xml new file mode 100644 index 0000000..bededb5 --- /dev/null +++ b/res/drawable/floating_action_button.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 The CyanogenMod Project + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +--> + +<ripple xmlns:android="http://schemas.android.com/apk/res/android" + android:color="@color/floating_action_button_touch_tint"> + <item android:id="@android:id/mask"> + <shape android:shape="oval"> + <solid android:color="#4caf50" /> + </shape> + </item> +</ripple> diff --git a/res/layout-land/nav_screen.xml b/res/layout-land/nav_screen.xml index fdadd6a..1af5c44 100644 --- a/res/layout-land/nav_screen.xml +++ b/res/layout-land/nav_screen.xml @@ -39,13 +39,13 @@ style="@style/HoloButton" android:gravity="center_vertical" android:contentDescription="@string/accessibility_button_newtab" - android:src="@drawable/ic_new_window_holo_dark" /> + android:src="@drawable/ic_new_window_dark" /> <ImageButton android:id="@+id/bookmarks" android:layout_width="wrap_content" android:layout_height="match_parent" android:contentDescription="@string/accessibility_button_bookmarks" - android:src="@drawable/ic_bookmarks_history_holo_dark" + android:src="@drawable/ic_bookmarks_history_dark" style="@style/HoloButton" /> <ImageButton android:id="@+id/more" diff --git a/res/layout-sw600dp/suggestion_item.xml b/res/layout-sw600dp/suggestion_item.xml new file mode 100644 index 0000000..020ba58 --- /dev/null +++ b/res/layout-sw600dp/suggestion_item.xml @@ -0,0 +1,85 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* //device/apps/common/assets/res/any/layout/simple_spinner_item.xml +** +** Copyright 2010, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="48dip" + android:orientation="horizontal" + android:gravity="center_vertical" + android:baselineAligned="false" + > + <LinearLayout + android:id="@+id/suggestion" + android:layout_width="0dip" + android:layout_height="match_parent" + android:layout_weight="1" + android:orientation="horizontal" + android:background="?android:attr/selectableItemBackground" + android:padding="0dp"> + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/icon1" + android:layout_gravity="center_vertical" + android:layout_marginLeft="@dimen/suggest_item_padding" + android:layout_marginRight="@dimen/suggest_item_padding" /> + <LinearLayout + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_gravity="center_vertical" + android:orientation="vertical"> + <TextView + android:id="@android:id/text1" + style="@style/SuggestionLineMedium" + android:maxLines="1" + android:textColor="@color/black" + android:textColorHint="@color/black" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + <TextView + android:id="@android:id/text2" + style="@style/SuggestionLineSmall" + android:singleLine="true" + android:textColor="@color/black" + android:textColorHint="@color/black" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + </LinearLayout> + </LinearLayout> + <ImageView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:id="@+id/divider" + android:scaleType="center" + android:background="@*android:drawable/list_divider_holo_light" + /> + <ImageView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:id="@+id/icon2" + android:scaleType="center" + android:src="@drawable/ic_querybuilder" + android:background="?android:attr/selectableItemBackground" + android:paddingRight="@dimen/suggest_item_padding" + android:paddingLeft="@dimen/suggest_item_padding" + /> +</LinearLayout> diff --git a/res/layout-sw600dp/title_bar_nav.xml b/res/layout-sw600dp/title_bar_nav.xml index a6b8a32..62e0d78 100644 --- a/res/layout-sw600dp/title_bar_nav.xml +++ b/res/layout-sw600dp/title_bar_nav.xml @@ -17,7 +17,8 @@ <com.android.browser.NavigationBarTablet xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" - android:background="@drawable/bg_urlbar"> + android:elevation="5dp" + android:background="@color/primary"> <LinearLayout android:id="@+id/navbuttons" android:layout_width="wrap_content" @@ -25,14 +26,14 @@ android:orientation="horizontal"> <ImageButton android:id="@+id/back" - android:src="@drawable/ic_back_holo_dark" + android:src="@drawable/ic_back_dark" android:layout_width="wrap_content" android:layout_height="match_parent" android:contentDescription="@string/accessibility_button_back" style="@style/HoloButton" /> <ImageButton android:id="@+id/forward" - android:src="@drawable/ic_forward_holo_dark" + android:src="@drawable/ic_forward_dark" android:layout_width="wrap_content" android:layout_height="match_parent" android:contentDescription="@string/accessibility_button_forward" @@ -44,7 +45,7 @@ style="@style/HoloButton" android:gravity="center_vertical" android:contentDescription="@string/accessibility_button_stop" - android:src="@drawable/ic_stop_holo_dark" /> + android:src="@drawable/ic_stop_dark" /> </LinearLayout> <LinearLayout android:id="@+id/urlbar_focused" @@ -57,7 +58,7 @@ android:id="@+id/url_icon" android:layout_width="32dip" android:layout_height="20dip" - android:src="@drawable/ic_web_holo_dark" + android:src="@drawable/ic_web_dark" android:layout_gravity="center" /> <ImageView android:id="@+id/lock" @@ -83,6 +84,7 @@ android:scrollHorizontally="true" android:inputType="textUri" android:imeOptions="actionGo|flagNoExtractUi|flagNoFullscreen" + android:theme="@style/Widget.UrlInputView" style="@style/Suggestions" /> <ImageButton android:id="@+id/star" @@ -93,14 +95,14 @@ style="@style/HoloButton" /> <ImageButton android:id="@+id/clear" - android:src="@drawable/ic_stop_holo_dark" + android:src="@drawable/ic_stop_dark" android:layout_width="wrap_content" android:layout_height="match_parent" android:contentDescription="@string/accessibility_button_clear" style="@style/HoloButton" /> <ImageButton android:id="@+id/voice" - android:src="@drawable/ic_voice_search_holo_dark" + android:src="@drawable/ic_voice_search_dark" android:layout_width="wrap_content" android:layout_height="match_parent" android:contentDescription="@string/accessibility_button_voice" @@ -108,7 +110,7 @@ </LinearLayout> <ImageButton android:id="@+id/search" - android:src="@drawable/ic_search_holo_dark" + android:src="@drawable/ic_search_dark" android:layout_width="wrap_content" android:layout_height="match_parent" android:gravity="center_vertical" @@ -121,5 +123,5 @@ android:scaleType="center" style="@style/HoloButton" android:contentDescription="@string/accessibility_button_bookmarks" - android:src="@drawable/ic_bookmarks_history_holo_dark" /> + android:src="@drawable/ic_bookmarks_history_dark" /> </com.android.browser.NavigationBarTablet> diff --git a/res/layout-sw600dp/title_bar_snapshot.xml b/res/layout-sw600dp/title_bar_snapshot.xml index a2cc9d0..2155e70 100644 --- a/res/layout-sw600dp/title_bar_snapshot.xml +++ b/res/layout-sw600dp/title_bar_snapshot.xml @@ -19,7 +19,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:background="@drawable/bg_urlbar"> + android:background="@color/primary_dark"> <ImageView android:id="@+id/date_icon" android:src="@drawable/ic_search_category_history" @@ -50,6 +50,6 @@ android:scaleType="center" android:paddingRight="16dip" style="@style/HoloButton" - android:src="@drawable/ic_bookmarks_history_holo_dark" + android:src="@drawable/ic_bookmarks_history_dark" android:contentDescription="@string/accessibility_button_bookmarks" /> </com.android.browser.SnapshotBar> diff --git a/res/layout/add_new_bookmark.xml b/res/layout/add_new_bookmark.xml index 53f7554..730b74e 100644 --- a/res/layout/add_new_bookmark.xml +++ b/res/layout/add_new_bookmark.xml @@ -4,9 +4,9 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -14,8 +14,8 @@ limitations under the License. --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" android:orientation="horizontal" @@ -31,7 +31,7 @@ android:layout_marginLeft="5dip" android:layout_marginRight="11dip" android:focusable="false" - android:src="@drawable/ic_bookmark_on_holo_dark" + android:src="@drawable/ic_bookmark_on_dark" android:scaleType="fitCenter" /> <LinearLayout @@ -39,18 +39,18 @@ android:layout_height="wrap_content" android:orientation="vertical" > - <TextView android:id="@+id/title" + <TextView android:id="@+id/title" android:text="@string/add_new_bookmark" android:textAppearance="?android:attr/textAppearanceMedium" - android:textStyle="bold" - android:layout_width="wrap_content" + android:textStyle="bold" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="2dip" /> - <TextView android:id="@+id/url" + <TextView android:id="@+id/url" android:textAppearance="?android:attr/textAppearanceSmall" android:maxLines="1" - android:layout_width="wrap_content" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:ellipsize="end" diff --git a/res/layout/bookmark_grid_row.xml b/res/layout/bookmark_grid_row.xml index 7955ad7..bb308ab 100644 --- a/res/layout/bookmark_grid_row.xml +++ b/res/layout/bookmark_grid_row.xml @@ -17,6 +17,6 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" + android:theme="@style/PreferencesTheme" android:layout_height="match_parent"> </LinearLayout> - diff --git a/res/layout/bookmark_group_view.xml b/res/layout/bookmark_group_view.xml index e6c9628..69e0e75 100644 --- a/res/layout/bookmark_group_view.xml +++ b/res/layout/bookmark_group_view.xml @@ -19,6 +19,7 @@ android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:orientation="horizontal" + android:theme="@style/PreferencesTheme" android:background="?android:attr/listChoiceBackgroundIndicator"> <TextView @@ -35,4 +36,3 @@ android:layout_height="match_parent" /> </LinearLayout> - diff --git a/res/layout/bookmark_list.xml b/res/layout/bookmark_list.xml index 4425a26..28fe255 100644 --- a/res/layout/bookmark_list.xml +++ b/res/layout/bookmark_list.xml @@ -21,6 +21,7 @@ android:layout_height="match_parent" android:minHeight="@dimen/widgetItemMinHeight" android:paddingLeft="16dip" + android:theme="@style/PreferencesTheme" android:background="@drawable/bookmark_thumb_selector"> <ImageView android:id="@+id/favicon" diff --git a/res/layout/bookmark_thumbnail.xml b/res/layout/bookmark_thumbnail.xml index cd7b9be..0e80998 100644 --- a/res/layout/bookmark_thumbnail.xml +++ b/res/layout/bookmark_thumbnail.xml @@ -20,6 +20,7 @@ android:orientation="vertical" android:padding="@dimen/combo_horizontalSpacing" android:background="@drawable/bookmark_thumb_selector" + android:elevation="3dp" > <ImageView diff --git a/res/layout/bookmarks_drag_actionmode.xml b/res/layout/bookmarks_drag_actionmode.xml index 64b1042..77e590f 100644 --- a/res/layout/bookmarks_drag_actionmode.xml +++ b/res/layout/bookmarks_drag_actionmode.xml @@ -30,19 +30,19 @@ android:layout_height="match_parent" android:paddingLeft="16dip" android:paddingRight="16dip" - android:src="@drawable/ic_web_holo_dark" /> + android:src="@drawable/ic_web_dark" /> <ImageView android:id="@+id/new_window_context_menu_id" android:layout_width="wrap_content" android:layout_height="match_parent" android:paddingLeft="16dip" android:paddingRight="16dip" - android:src="@drawable/ic_new_window_holo_dark" /> + android:src="@drawable/ic_new_window_dark" /> <ImageView android:id="@+id/info" android:layout_width="wrap_content" android:layout_height="match_parent" android:paddingLeft="16dip" android:paddingRight="16dip" - android:src="@drawable/ic_home_info_holo_dark" /> + android:src="@drawable/ic_home_info_dark" /> </LinearLayout> diff --git a/res/layout/bookmarks_header.xml b/res/layout/bookmarks_header.xml index ba8cf2c..fc2d1f8 100644 --- a/res/layout/bookmarks_header.xml +++ b/res/layout/bookmarks_header.xml @@ -18,4 +18,5 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/crumbs" android:layout_width="match_parent" + android:elevation="8dp" android:layout_height="match_parent" /> diff --git a/res/layout/browser_add_bookmark_content.xml b/res/layout/browser_add_bookmark_content.xml index 58db8a5..6b4bad9 100644 --- a/res/layout/browser_add_bookmark_content.xml +++ b/res/layout/browser_add_bookmark_content.xml @@ -61,7 +61,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:gravity="center_vertical" - android:drawableLeft="@drawable/ic_bookmark_on_holo_dark" + android:drawableLeft="@drawable/ic_bookmark_black" android:text="@string/bookmark_this_page" android:textAppearance="?android:attr/textAppearanceMedium" /> <View android:id="@+id/remove_divider" @@ -76,7 +76,7 @@ android:layout_gravity="center_vertical" android:gravity="center_vertical" android:text="@string/remove" - android:drawableLeft="@drawable/trashcan" + android:drawableLeft="@drawable/ic_delete_black" android:visibility="gone" android:textAppearance="?android:attr/textAppearanceMedium" /> </LinearLayout> diff --git a/res/layout/browser_subwindow.xml b/res/layout/browser_subwindow.xml index fb6fa37..e1f05d7 100644 --- a/res/layout/browser_subwindow.xml +++ b/res/layout/browser_subwindow.xml @@ -4,9 +4,9 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -31,7 +31,7 @@ android:focusable="true" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/ic_close_window_holo_dark" /> + android:src="@drawable/ic_close_window_dark" /> </LinearLayout> <LinearLayout android:id="@+id/inner_container" diff --git a/res/layout/folder_list_item.xml b/res/layout/folder_list_item.xml index 46cda37..374c10f 100644 --- a/res/layout/folder_list_item.xml +++ b/res/layout/folder_list_item.xml @@ -4,9 +4,9 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -25,7 +25,7 @@ android:layout_height="wrap_content" android:gravity="center_vertical" android:minHeight="?android:attr/listPreferredItemHeight" - android:src="@drawable/ic_folder_holo_dark" /> + android:src="@drawable/ic_folder_dark" /> <TextView android:id="@android:id/text1" android:layout_width="match_parent" diff --git a/res/layout/nav_screen.xml b/res/layout/nav_screen.xml index c655727..a6c331a 100644 --- a/res/layout/nav_screen.xml +++ b/res/layout/nav_screen.xml @@ -32,21 +32,23 @@ android:layout_height="@dimen/toolbar_height" android:layout_gravity="top" android:gravity="right" - android:background="#CC0d0d0d"> + android:background="#4caf50" + android:elevation="8dp"> <ImageButton - android:id="@+id/newtab" - android:layout_width="wrap_content" - android:layout_height="match_parent" - style="@style/HoloButton" - android:gravity="center_vertical" - android:contentDescription="@string/accessibility_button_newtab" - android:src="@drawable/ic_new_window_holo_dark" /> + android:id="@+id/newtab" + android:layout_width="wrap_content" + android:layout_height="match_parent" + style="@style/HoloButton" + android:gravity="center_vertical" + android:contentDescription="@string/accessibility_button_newtab" + android:visibility="gone" + android:src="@drawable/ic_new_window_dark" /> <ImageButton android:id="@+id/bookmarks" android:layout_width="wrap_content" android:layout_height="match_parent" android:contentDescription="@string/accessibility_button_bookmarks" - android:src="@drawable/ic_bookmarks_history_holo_dark" + android:src="@drawable/ic_bookmarks_history_dark" style="@style/HoloButton" /> <ImageButton android:id="@+id/more" @@ -59,4 +61,20 @@ android:contentDescription="@string/accessibility_button_more" android:src="@drawable/ic_menu_overflow" /> </LinearLayout> + <FrameLayout + android:id="@+id/floating_action_button_container" + android:background="@drawable/fab_accent" + android:layout_alignParentRight="true" + android:layout_alignParentBottom="true" + android:layout_margin="16dp" + android:elevation="4dp" + android:layout_height="wrap_content" + android:layout_width="wrap_content"> + <ImageButton + android:id="@+id/floating_action_button" + android:layout_width="56dp" + android:layout_height="56dp" + android:background="@drawable/floating_action_button" + android:src="@drawable/ic_new_window_dark"/> + </FrameLayout> </RelativeLayout> diff --git a/res/layout/nav_tab_view.xml b/res/layout/nav_tab_view.xml index d1205f0..5b1b55c 100644 --- a/res/layout/nav_tab_view.xml +++ b/res/layout/nav_tab_view.xml @@ -21,7 +21,8 @@ android:layout_height="wrap_content" android:orientation="vertical" android:background="@drawable/nav_tab_bg" - android:focusable="false"> + android:focusable="false" + android:elevation="6dp"> <LinearLayout android:id="@+id/titlebar" android:orientation="horizontal" @@ -38,7 +39,7 @@ android:singleLine="true" android:ellipsize="end" android:lines="1" - android:textAppearance="?android:attr/textAppearanceSmall" + android:textAppearance="?android:attr/textAppearanceSmallInverse" android:scrollHorizontally="true" android:drawablePadding="8dip" /> <ImageView @@ -53,7 +54,7 @@ </LinearLayout> <ImageView android:id="@+id/tab_view" - android:src="@drawable/ic_stop_holo_dark" + android:src="@drawable/ic_stop_dark" android:layout_width="@dimen/nav_tab_width" android:layout_height="@dimen/nav_tab_height" android:paddingLeft="2dip" diff --git a/res/layout/new_folder_layout.xml b/res/layout/new_folder_layout.xml index ad9ba4b..7db5b38 100644 --- a/res/layout/new_folder_layout.xml +++ b/res/layout/new_folder_layout.xml @@ -26,7 +26,7 @@ android:layout_height="wrap_content" android:gravity="center_vertical" android:minHeight="?android:attr/listPreferredItemHeight" - android:src="@drawable/ic_folder_holo_dark" /> + android:src="@drawable/ic_folder_dark" /> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/res/layout/qc_menu_item.xml b/res/layout/qc_menu_item.xml index 6c84aa6..99c1eb9 100644 --- a/res/layout/qc_menu_item.xml +++ b/res/layout/qc_menu_item.xml @@ -27,4 +27,5 @@ android:paddingRight="8dip" android:paddingTop="4dip" android:paddingBottom="4dip" + android:elevation="8dp" /> diff --git a/res/layout/qc_tab.xml b/res/layout/qc_tab.xml index af8d46f..c5e2de2 100644 --- a/res/layout/qc_tab.xml +++ b/res/layout/qc_tab.xml @@ -20,6 +20,7 @@ android:orientation="vertical" android:background="@color/black" android:padding="0dip" + android:elevation="8dp" > <TextView android:id="@+id/title1" android:layout_width="match_parent" @@ -57,5 +58,6 @@ android:typeface="sans" android:textSize="12sp" android:textColor="#DDDDDD" + android:elevation="5dp" /> </LinearLayout> diff --git a/res/layout/qc_tabs_view.xml b/res/layout/qc_tabs_view.xml index accae68..76a4ff7 100644 --- a/res/layout/qc_tabs_view.xml +++ b/res/layout/qc_tabs_view.xml @@ -18,6 +18,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="0dip" + android:elevation="8dp" > <ImageView android:id="@+id/icon" @@ -33,7 +34,7 @@ android:typeface="sans" android:textSize="12sp" android:textStyle="bold" - android:textColor="#ffffff" + android:textColor="#4caF50" android:background="@drawable/tab_nr" /> </RelativeLayout> diff --git a/res/layout/tab.xml b/res/layout/tab.xml index 040c977..e746a99 100755 --- a/res/layout/tab.xml +++ b/res/layout/tab.xml @@ -24,7 +24,6 @@ android:fitsSystemWindows="true" android:layout_width="match_parent" android:layout_height="match_parent"> - <!-- Wrapper layout for the WebView, which must be in a FrameLayout. --> <FrameLayout android:id="@+id/webview_wrapper" android:layout_width="match_parent" @@ -35,12 +34,14 @@ <ViewStub android:id="@+id/permissions_prompt" android:layout="@layout/permissions_prompt" android:layout_width="match_parent" - android:layout_height="wrap_content" /> + android:layout_height="wrap_content" + android:elevation="5dp" /> <!-- Geolocation permissions prompt --> <ViewStub android:id="@+id/geolocation_permissions_prompt" android:layout="@layout/geolocation_permissions_prompt" android:layout_width="match_parent" - android:layout_height="wrap_content" /> + android:layout_height="wrap_content" + android:elevation="5dp" /> </LinearLayout> diff --git a/res/layout/tab_bar.xml b/res/layout/tab_bar.xml index a9a70fd..7d32a8c 100644 --- a/res/layout/tab_bar.xml +++ b/res/layout/tab_bar.xml @@ -16,7 +16,7 @@ android:layout_width="match_parent" android:layout_height="?android:attr/actionBarSize" android:orientation="horizontal" - > + android:elevation="8dp"> <com.android.browser.TabScrollView android:id="@+id/tabs" android:layout_width="0dip" diff --git a/res/layout/tab_title.xml b/res/layout/tab_title.xml index 8a5e308..3f72753 100644 --- a/res/layout/tab_title.xml +++ b/res/layout/tab_title.xml @@ -15,13 +15,14 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:gravity="center_vertical" - android:orientation="horizontal"> + android:orientation="horizontal" + android:elevation="8dp"> <ImageView android:id="@+id/incognito" android:layout_width="wrap_content" android:layout_height="match_parent" android:gravity="center_vertical" - android:src="@drawable/ic_incognito_holo_dark" + android:src="@drawable/ic_incognito_dark" android:contentDescription="@string/accessibility_state_incognito" android:visibility="gone" /> <ImageView diff --git a/res/layout/title_bar.xml b/res/layout/title_bar.xml index acc49e6..609fd9d 100644 --- a/res/layout/title_bar.xml +++ b/res/layout/title_bar.xml @@ -18,7 +18,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/titlebar" android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:elevation="8dp"> <include layout="@layout/title_bar_nav" android:id="@+id/taburlbar" diff --git a/res/layout/title_bar_nav.xml b/res/layout/title_bar_nav.xml index 2f1e0a2..5052757 100644 --- a/res/layout/title_bar_nav.xml +++ b/res/layout/title_bar_nav.xml @@ -17,7 +17,8 @@ <com.android.browser.NavigationBarPhone xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" - android:background="@drawable/bg_urlbar"> + android:background="@color/primary" + android:elevation="8dp"> <LinearLayout android:id="@+id/title_bg" android:layout_width="0dip" @@ -34,14 +35,14 @@ android:paddingLeft="4dip" android:paddingRight="8dip" android:visibility="gone" - android:src="@drawable/ic_search_category_suggest" /> + android:src="@drawable/ic_search_dark" /> <ImageView android:id="@+id/incognito_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingLeft="4dip" android:visibility="gone" - android:src="@drawable/ic_incognito_holo_dark" /> + android:src="@drawable/ic_incognito_dark" /> <FrameLayout android:id="@+id/iconcombo" android:layout_width="44dip" @@ -69,7 +70,7 @@ android:layout_gravity="center_vertical" android:paddingLeft="4dip" android:contentDescription="@string/accessibility_button_stop" - android:src="@drawable/ic_stop_holo_dark" + android:src="@drawable/ic_stop_dark" style="@style/HoloButton" /> <com.android.browser.UrlInputView android:id="@+id/url" @@ -88,6 +89,7 @@ android:inputType="textUri" android:imeOptions="actionGo|flagNoExtractUi|flagNoFullscreen" style="@style/Suggestions" + android:theme="@style/Widget.UrlInputView" android:background="@null" /> <ImageView android:id="@+id/voice" @@ -95,7 +97,7 @@ android:layout_height="match_parent" android:paddingRight="4dip" android:contentDescription="@string/accessibility_button_voice" - android:src="@drawable/ic_voice_search_holo_dark" + android:src="@drawable/ic_voice_search_dark" style="@style/HoloButton" android:visibility="gone" /> <ImageView @@ -104,7 +106,7 @@ android:layout_height="match_parent" android:paddingRight="4dip" android:contentDescription="@string/accessibility_button_clear" - android:src="@drawable/ic_close_window_holo_dark" + android:src="@drawable/ic_close_window_dark" style="@style/HoloButton" android:visibility="gone" /> </LinearLayout> @@ -113,7 +115,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:contentDescription="@string/accessibility_button_navscreen" - android:src="@drawable/ic_windows_holo_dark" + android:src="@drawable/ic_windows_dark" style="@style/HoloButton" /> <ImageButton android:id="@+id/more" diff --git a/res/layout/title_bar_snapshot.xml b/res/layout/title_bar_snapshot.xml index 0e2ab1c..c203a80 100644 --- a/res/layout/title_bar_snapshot.xml +++ b/res/layout/title_bar_snapshot.xml @@ -19,7 +19,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:background="@drawable/bg_urlbar"> + android:background="@color/primary" + android:elevation="8dp"> <ImageView android:src="@drawable/ic_search_category_history" android:layout_width="wrap_content" @@ -56,7 +57,7 @@ android:id="@+id/tab_switcher" android:layout_width="wrap_content" android:layout_height="match_parent" - android:src="@drawable/ic_windows_holo_dark" + android:src="@drawable/ic_windows_dark" android:contentDescription="@string/accessibility_button_navscreen" style="@style/HoloButton" /> <ImageButton diff --git a/res/menu-sw600dp/combined.xml b/res/menu-sw600dp/combined.xml index 97abc8d..3c02d03 100644 --- a/res/menu-sw600dp/combined.xml +++ b/res/menu-sw600dp/combined.xml @@ -18,7 +18,7 @@ <item android:id="@+id/preferences_menu_id" android:title="@string/menu_preferences" - android:icon="@drawable/ic_settings_holo_dark" + android:icon="@drawable/ic_settings_dark" android:alphabeticShortcut="p" android:showAsAction="ifRoom" android:orderInCategory="1000" /> diff --git a/res/menu/browser.xml b/res/menu/browser.xml index 8c3aefb..13880c9 100644 --- a/res/menu/browser.xml +++ b/res/menu/browser.xml @@ -4,9 +4,9 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -31,18 +31,18 @@ <item android:id="@+id/new_tab_menu_id" android:title="@string/new_tab" - android:icon="@drawable/ic_new_window_holo_dark" + android:icon="@drawable/ic_new_window_dark" android:showAsAction="never" android:alphabeticShortcut="n" /> <item android:id="@+id/bookmarks_menu_id" android:title="@string/bookmarks" - android:icon="@drawable/ic_bookmarks_holo_dark" + android:icon="@drawable/ic_bookmarks_dark" android:showAsAction="never" /> <item android:id="@+id/add_bookmark_menu_id" android:title="@string/save_to_bookmarks" - android:icon="@drawable/ic_bookmark_on_holo_dark" + android:icon="@drawable/ic_bookmark_on_dark" android:alphabeticShortcut="d" android:visible="@bool/menu_show_bookmarks" /> <group @@ -50,7 +50,7 @@ <item android:id="@+id/share_page_menu_id" android:title="@string/share_page" - android:icon="@drawable/ic_share_holo_dark" + android:icon="@drawable/ic_share_dark" android:alphabeticShortcut="s" /> <item android:id="@+id/find_menu_id" @@ -85,7 +85,7 @@ <item android:id="@+id/preferences_menu_id" android:title="@string/menu_preferences" - android:icon="@drawable/ic_settings_holo_dark" + android:icon="@drawable/ic_settings_dark" android:alphabeticShortcut="p" /> <!-- followings are debug only --> <item @@ -140,4 +140,3 @@ android:icon="@*android:drawable/ic_menu_refresh" android:visible="false" /> </menu> - diff --git a/res/menu/url_selection.xml b/res/menu/url_selection.xml index 8f4a93c..33e9ae0 100644 --- a/res/menu/url_selection.xml +++ b/res/menu/url_selection.xml @@ -16,9 +16,8 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item android:id="@+id/share" - android:icon="@drawable/ic_share_holo_dark" + android:icon="@drawable/ic_share_dark" android:title="@string/menu_share_url" android:showAsAction="always|withText" /> </menu> - diff --git a/res/mipmap-hdpi/ic_launcher_browser.png b/res/mipmap-hdpi/ic_launcher_browser.png Binary files differindex 4f9377f..a346c60 100644 --- a/res/mipmap-hdpi/ic_launcher_browser.png +++ b/res/mipmap-hdpi/ic_launcher_browser.png diff --git a/res/mipmap-mdpi/ic_launcher_browser.png b/res/mipmap-mdpi/ic_launcher_browser.png Binary files differindex 9bc6817..5f41c8e 100644 --- a/res/mipmap-mdpi/ic_launcher_browser.png +++ b/res/mipmap-mdpi/ic_launcher_browser.png diff --git a/res/mipmap-xhdpi/ic_launcher_browser.png b/res/mipmap-xhdpi/ic_launcher_browser.png Binary files differindex 9412fbe..4e1f08e 100644 --- a/res/mipmap-xhdpi/ic_launcher_browser.png +++ b/res/mipmap-xhdpi/ic_launcher_browser.png diff --git a/res/mipmap-xxhdpi/ic_launcher_browser.png b/res/mipmap-xxhdpi/ic_launcher_browser.png Binary files differindex bd8c447..3c99526 100644 --- a/res/mipmap-xxhdpi/ic_launcher_browser.png +++ b/res/mipmap-xxhdpi/ic_launcher_browser.png diff --git a/res/mipmap-xxxhdpi/ic_launcher_browser.png b/res/mipmap-xxxhdpi/ic_launcher_browser.png Binary files differnew file mode 100644 index 0000000..531d05b --- /dev/null +++ b/res/mipmap-xxxhdpi/ic_launcher_browser.png diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml index 699f10a..f03cac1 100644 --- a/res/values-sw600dp/styles.xml +++ b/res/values-sw600dp/styles.xml @@ -14,18 +14,25 @@ limitations under the License. --> <resources> - <style name="BrowserTheme" parent="@android:Theme.Holo"> + <style name="BrowserTheme" parent="@android:Theme.Material"> + <item name="android:colorPrimary">@color/primary</item> + <item name="android:colorPrimaryDark">@color/primary_dark</item> + <item name="android:colorAccent">@color/accent</item> + <item name="android:textColor">?android:attr/textColorPrimaryInverse</item> + <item name="android:textColorHint">?android:attr/textColorHintInverse</item> <item name="android:windowBackground">@color/white</item> - <item name="android:colorBackground">#FFFFFFFF</item> + <item name="android:colorBackground">@color/white</item> <item name="android:windowActionBar">true</item> <item name="android:windowNoTitle">false</item> <item name="android:actionBarStyle">@style/ActionBarStyle</item> - <item name="android:actionBarSize">56dip</item> + <item name="android:actionBarSize">64dip</item> </style> - <style name="Suggestions" parent="@android:style/Widget.Holo.AutoCompleteTextView"> - </style> - <style name="ActionBarStyle" parent="@android:style/Widget.Holo.ActionBar"> - <item name="android:background">@drawable/bg_browsertabs</item> - <item name="android:displayOptions"></item> + <style name="Suggestions" parent="@android:style/Widget.Material.Light.AutoCompleteTextView"> + <item name="android:textColor">@color/white</item> + <item name="android:textColorHint">@color/white</item> + <item name="android:dropDownVerticalOffset">0dip</item> </style> + <style name="ActionBarStyle" parent="@android:style/ThemeOverlay.Material.Dark.ActionBar"> + <item name="android:background">@color/primary</item> + </style> </resources> diff --git a/res/values/colors.xml b/res/values/colors.xml index ffee48b..3b362aa 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -4,38 +4,41 @@ ** ** Copyright 2006, The Android Open Source Project ** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at ** -** http://www.apache.org/licenses/LICENSE-2.0 +** http://www.apache.org/licenses/LICENSE-2.0 ** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and ** limitations under the License. */ --> <!-- FIXME: Change the name of this file! It is now being used generically for the browser --> <resources> - <color name="white">#ffffffff</color> - <color name="black">#ff000000</color> - + <color name="white">#fafafa</color> + <color name="black">#212121</color> + <color name="primary">#4caf50</color> + <color name="primary_dark">#388e3c</color> + <color name="accent">#1b5e20</color> + <color name="floating_action_button_touch_tint">#388e3c</color> <color name="bookmarkWidgetHeader">#383847</color> <color name="bookmarkWidgetDivider">#383847</color> <color name="bookmarkWidgetItemBackground">#2b2b3c</color> <color name="bookmarkWidgetFolderBackground">#A0383847</color> <color name="bookmarkWidgetFaviconBackground">#23ffffff</color> <color name="bookmarkListFaviconBackground">#23ffffff</color> - <color name="tabFaviconBackground">#FF555555</color> + <color name="tabFaviconBackground">#4caf50</color> <color name="tabFocusHighlight">#FF99CC00</color> <color name="qcMenuBackground">#C0000000</color> - <color name="qc_normal">#E02A96BC</color> - <color name="qc_selected">#E0FF8800</color> - <color name="qc_sub">#F01A5B73</color> - <color name="qc_tab_nr">#F033B5E5</color> + <color name="qc_normal">#4caf50</color> + <color name="qc_selected">#388e3c</color> + <color name="qc_sub">#2e7d32</color> + <color name="qc_tab_nr">#2e7d32</color> <color name="tabViewTitleBackground">#D0000000</color> <color name="navtab_bg">#80606060</color> </resources> diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml index 5e3ec8b..019a173 100644 --- a/res/values/dimensions.xml +++ b/res/values/dimensions.xml @@ -74,4 +74,9 @@ <dimen name="nav_tab_text_small">14sp</dimen> <dimen name="suggest_item_padding">8dp</dimen> <dimen name="progress_bar_margin">-11dip</dimen> + <dimen name="diameter">48dp</dimen> + <dimen name="elevation_low">1dp</dimen> + <dimen name="elevation_high">4dp</dimen> + <dimen name="add_button_margin">16dp</dimen> + </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 17c5eb2..b0167c8 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -18,18 +18,30 @@ */ --> <resources> - <style name="BrowserTheme" parent="@android:Theme.Holo"> + <style name="BrowserTheme" parent="@android:Theme.Material.Light"> <item name="android:windowBackground">@color/white</item> - <item name="android:colorBackground">#FFFFFFFF</item> + <item name="android:colorBackground">@color/white</item> <item name="android:windowActionBar">false</item> <item name="android:windowNoTitle">true</item> <item name="android:windowActionModeOverlay">true</item> <item name="android:actionBarStyle">@style/ActionBarStyle</item> + <item name="android:colorPrimary">@color/primary</item> + <item name="android:colorPrimaryDark">@color/primary_dark</item> + <item name="android:colorAccent">@color/accent</item> </style> - <style name="DialogWhenLarge" parent="@android:style/Theme.Holo.DialogWhenLarge" > + <style name="PreferencesTheme" parent="@android:Theme.Material.Light.DarkActionBar"> + <item name="android:colorPrimary">@color/primary</item> + <item name="android:colorPrimaryDark">@color/primary_dark</item> + <item name="android:colorAccent">@color/accent</item> + </style> + <style name="DialogWhenLarge" parent="@android:style/Theme.Material.DialogWhenLarge" > <item name="android:windowActionBar">false</item> + <item name="android:popupBackground">#fafafa</item> </style> - <style name="BookmarkTheme" parent="@android:Theme.Holo"> + <style name="BookmarkTheme" parent="@android:Theme.Material"> + <item name="android:colorPrimary">@color/primary</item> + <item name="android:colorPrimaryDark">@color/primary_dark</item> + <item name="android:colorAccent">@color/accent</item> <item name="android:windowActionBar">false</item> <item name="android:windowNoTitle">true</item> <item name="android:colorBackgroundCacheHint">@null</item> @@ -39,26 +51,31 @@ <item name="android:backgroundDimEnabled">false</item> <item name="android:windowIsTranslucent">true</item> </style> - <style name="ActionBarStyle" parent="@android:style/Widget.Holo.ActionBar"> - <item name="android:background">@drawable/bg_urlbar</item> + <style name="ActionBarStyle" parent="@android:style/ThemeOverlay.Material.Dark.ActionBar"> + <item name="android:background">@color/primary</item> <item name="android:displayOptions"></item> </style> - <style name="Suggestions" parent="@android:style/Widget.Holo.AutoCompleteTextView"> - <item name="android:popupBackground">#D0000000</item> + <style name="Suggestions" parent="@android:style/Widget.Material.AutoCompleteTextView"> + <item name="android:popupBackground">#fafafa</item> <item name="android:dropDownVerticalOffset">0dip</item> + <item name="android:textColor">?android:attr/textColorPrimaryInverse</item> + <item name="android:textColorHint">?android:attr/textColorHintInverse</item> + </style> + <style name="Widget.UrlInputView" parent="BrowserTheme"> + <item name="android:colorAccent">@color/accent</item> </style> <style name="SuggestionLineMedium" - parent="@android:style/TextAppearance.Holo.Medium"> + parent="@android:style/TextAppearance.Material.Medium"> <item name="android:textSize">16sp</item> </style> <style name="SuggestionLineSmall" - parent="@android:style/TextAppearance.Holo.Small"> + parent="@android:style/TextAppearance.Material.Small"> <item name="android:textSize">12sp</item> </style> <style name="ActionBar" parent="@android:style/Widget.ActionBar"> - <item name="android:background">@color/black</item> + <item name="android:background">@color/primary</item> </style> - <style name="ShortcutTheme" parent="@android:Theme.Holo.DialogWhenLarge"> + <style name="ShortcutTheme" parent="@android:Theme.Material.DialogWhenLarge"> </style> <style name="TitleBar"> <item name="android:windowEnterAnimation">@anim/title_bar_enter</item> diff --git a/src/com/android/browser/AddBookmarkPage.java b/src/com/android/browser/AddBookmarkPage.java index 6e82dbf..6f3779a 100644 --- a/src/com/android/browser/AddBookmarkPage.java +++ b/src/com/android/browser/AddBookmarkPage.java @@ -669,7 +669,7 @@ public class AddBookmarkPage extends Activity mCrumbs = (BreadCrumbView) findViewById(R.id.crumbs); mCrumbs.setUseBackButton(true); mCrumbs.setController(this); - mHeaderIcon = getResources().getDrawable(R.drawable.ic_folder_holo_dark); + mHeaderIcon = getResources().getDrawable(R.drawable.ic_folder_dark); mCrumbHolder = findViewById(R.id.crumb_holder); mCrumbs.setMaxVisible(MAX_CRUMBS_SHOWN); diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java index 6b10459..c098045 100644 --- a/src/com/android/browser/BaseUi.java +++ b/src/com/android/browser/BaseUi.java @@ -121,8 +121,8 @@ public abstract class BaseUi implements UI { Resources res = mActivity.getResources(); mInputManager = (InputMethodManager) browser.getSystemService(Activity.INPUT_METHOD_SERVICE); - mLockIconSecure = res.getDrawable(R.drawable.ic_secure_holo_dark); - mLockIconMixed = res.getDrawable(R.drawable.ic_secure_partial_holo_dark); + mLockIconSecure = res.getDrawable(R.drawable.ic_secure_dark); + mLockIconMixed = res.getDrawable(R.drawable.ic_secure_partial_dark); FrameLayout frameLayout = (FrameLayout) mActivity.getWindow() .getDecorView().findViewById(android.R.id.content); LayoutInflater.from(mActivity) diff --git a/src/com/android/browser/BreadCrumbView.java b/src/com/android/browser/BreadCrumbView.java index d331b53..c8d0f2b 100644 --- a/src/com/android/browser/BreadCrumbView.java +++ b/src/com/android/browser/BreadCrumbView.java @@ -169,7 +169,7 @@ public class BreadCrumbView extends LinearLayout implements OnClickListener { private void addBackButton() { mBackButton = new ImageButton(mContext); - mBackButton.setImageResource(R.drawable.ic_back_hierarchy_holo_dark); + mBackButton.setImageResource(R.drawable.ic_back_hierarchy_dark); TypedValue outValue = new TypedValue(); getContext().getTheme().resolveAttribute( android.R.attr.selectableItemBackground, outValue, true); diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java index af965f4..cb53107 100644 --- a/src/com/android/browser/BrowserBookmarksPage.java +++ b/src/com/android/browser/BrowserBookmarksPage.java @@ -309,7 +309,7 @@ public class BrowserBookmarksPage extends Fragment implements View.OnCreateConte if (isFolder) { item.setUrl(null); Bitmap bitmap = - BitmapFactory.decodeResource(getResources(), R.drawable.ic_folder_holo_dark); + BitmapFactory.decodeResource(getResources(), R.drawable.ic_folder_dark); item.setFavicon(bitmap); new LookupBookmarkCount(getActivity(), item) .execute(cursor.getLong(BookmarksLoader.COLUMN_INDEX_ID)); diff --git a/src/com/android/browser/NavScreen.java b/src/com/android/browser/NavScreen.java index 1e4704e..7730cae 100644 --- a/src/com/android/browser/NavScreen.java +++ b/src/com/android/browser/NavScreen.java @@ -62,6 +62,7 @@ public class NavScreen extends RelativeLayout TextView mTitle; ImageView mFavicon; ImageButton mCloseTab; + ImageView mNewTabFab; NavTabScroller mScroller; TabAdapter mAdapter; @@ -113,30 +114,38 @@ public class NavScreen extends RelativeLayout } private void init() { - LayoutInflater.from(mContext).inflate(R.layout.nav_screen, this); - setContentDescription(mContext.getResources().getString( - R.string.accessibility_transition_navscreen)); - mBookmarks = (ImageButton) findViewById(R.id.bookmarks); - mNewTab = (ImageButton) findViewById(R.id.newtab); - mMore = (ImageButton) findViewById(R.id.more); - mBookmarks.setOnClickListener(this); - mNewTab.setOnClickListener(this); - mMore.setOnClickListener(this); - mScroller = (NavTabScroller) findViewById(R.id.scroller); - TabControl tc = mUiController.getTabControl(); - mTabViews = new HashMap<Tab, View>(tc.getTabCount()); - mAdapter = new TabAdapter(mContext, tc); - mScroller.setOrientation(mOrientation == Configuration.ORIENTATION_LANDSCAPE - ? LinearLayout.HORIZONTAL : LinearLayout.VERTICAL); - // update state for active tab - mScroller.setAdapter(mAdapter, - mUiController.getTabControl().getTabPosition(mUi.getActiveTab())); - mScroller.setOnRemoveListener(new OnRemoveListener() { - public void onRemovePosition(int pos) { - Tab tab = mAdapter.getItem(pos); - onCloseTab(tab); - } - }); + LayoutInflater.from(mContext).inflate(R.layout.nav_screen, this); + setContentDescription(mContext.getResources().getString( + R.string.accessibility_transition_navscreen)); + mBookmarks = (ImageButton) findViewById(R.id.bookmarks); + mNewTab = (ImageButton) findViewById(R.id.newtab); + mMore = (ImageButton) findViewById(R.id.more); + mBookmarks.setOnClickListener(this); + mNewTab.setOnClickListener(this); + mMore.setOnClickListener(this); + mScroller = (NavTabScroller) findViewById(R.id.scroller); + TabControl tc = mUiController.getTabControl(); + mTabViews = new HashMap<Tab, View>(tc.getTabCount()); + mAdapter = new TabAdapter(mContext, tc); + mScroller.setOrientation(mOrientation == Configuration.ORIENTATION_LANDSCAPE + ? LinearLayout.HORIZONTAL : LinearLayout.VERTICAL); + // update state for active tab + mScroller.setAdapter(mAdapter, + mUiController.getTabControl().getTabPosition(mUi.getActiveTab())); + mScroller.setOnRemoveListener(new OnRemoveListener() { + public void onRemovePosition(int pos) { + Tab tab = mAdapter.getItem(pos); + onCloseTab(tab); + } + }); + mNewTabFab = (ImageView) findViewById(R.id.floating_action_button); + mNewTabFab.setOnClickListener( + new View.OnClickListener() { + @Override + public void onClick(View v) { + openNewTab(); + } + }); } @Override diff --git a/src/com/android/browser/NavTabScroller.java b/src/com/android/browser/NavTabScroller.java index c940bf5..f1f8e35 100644 --- a/src/com/android/browser/NavTabScroller.java +++ b/src/com/android/browser/NavTabScroller.java @@ -1,18 +1,18 @@ /* - * Copyright (C) 2011 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ +* Copyright (C) 2011 The Android Open Source Project +* +* Licensed under the Apache License, Version 2.0 (the "License"); you may not +* use this file except in compliance with the License. You may obtain a copy of +* the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +* License for the specific language governing permissions and limitations under +* the License. +*/ package com.android.browser; @@ -35,535 +35,535 @@ import android.widget.LinearLayout; import com.android.browser.view.ScrollerView; /** - * custom view for displaying tabs in the nav screen - */ +* custom view for displaying tabs in the nav screen +*/ public class NavTabScroller extends ScrollerView { - static final int INVALID_POSITION = -1; - static final float[] PULL_FACTOR = { 2.5f, 0.9f }; - - interface OnRemoveListener { - public void onRemovePosition(int position); - } - - interface OnLayoutListener { - public void onLayout(int l, int t, int r, int b); - } - - private ContentLayout mContentView; - private BaseAdapter mAdapter; - private OnRemoveListener mRemoveListener; - private OnLayoutListener mLayoutListener; - private int mGap; - private int mGapPosition; - private ObjectAnimator mGapAnimator; - - // after drag animation velocity in pixels/sec - private static final float MIN_VELOCITY = 1500; - private AnimatorSet mAnimator; - - private float mFlingVelocity; - private boolean mNeedsScroll; - private int mScrollPosition; - - DecelerateInterpolator mCubic; - int mPullValue; - - public NavTabScroller(Context context, AttributeSet attrs, int defStyle) { - super(context, attrs, defStyle); - init(context); - } - - public NavTabScroller(Context context, AttributeSet attrs) { - super(context, attrs); - init(context); - } - - public NavTabScroller(Context context) { - super(context); - init(context); - } - - private void init(Context ctx) { - mCubic = new DecelerateInterpolator(1.5f); - mGapPosition = INVALID_POSITION; - setHorizontalScrollBarEnabled(false); - setVerticalScrollBarEnabled(false); - mContentView = new ContentLayout(ctx, this); - mContentView.setOrientation(LinearLayout.HORIZONTAL); - addView(mContentView); - mContentView.setLayoutParams( - new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT)); - // ProGuard ! - setGap(getGap()); - mFlingVelocity = getContext().getResources().getDisplayMetrics().density - * MIN_VELOCITY; - } - - protected int getScrollValue() { - return mHorizontal ? mScrollX : mScrollY; - } - - protected void setScrollValue(int value) { - scrollTo(mHorizontal ? value : 0, mHorizontal ? 0 : value); - } - - protected NavTabView getTabView(int pos) { - return (NavTabView) mContentView.getChildAt(pos); - } - - protected boolean isHorizontal() { - return mHorizontal; - } - - public void setOrientation(int orientation) { - mContentView.setOrientation(orientation); - if (orientation == LinearLayout.HORIZONTAL) { - mContentView.setLayoutParams( - new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT)); - } else { - mContentView.setLayoutParams( - new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)); + static final int INVALID_POSITION = -1; + static final float[] PULL_FACTOR = { 2.5f, 0.9f }; + + interface OnRemoveListener { + public void onRemovePosition(int position); + } + + interface OnLayoutListener { + public void onLayout(int l, int t, int r, int b); + } + + private ContentLayout mContentView; + private BaseAdapter mAdapter; + private OnRemoveListener mRemoveListener; + private OnLayoutListener mLayoutListener; + private int mGap; + private int mGapPosition; + private ObjectAnimator mGapAnimator; + + // after drag animation velocity in pixels/sec + private static final float MIN_VELOCITY = 1500; + private AnimatorSet mAnimator; + + private float mFlingVelocity; + private boolean mNeedsScroll; + private int mScrollPosition; + + DecelerateInterpolator mCubic; + int mPullValue; + + public NavTabScroller(Context context, AttributeSet attrs, int defStyle) { + super(context, attrs, defStyle); + init(context); + } + + public NavTabScroller(Context context, AttributeSet attrs) { + super(context, attrs); + init(context); + } + + public NavTabScroller(Context context) { + super(context); + init(context); + } + + private void init(Context ctx) { + mCubic = new DecelerateInterpolator(1.5f); + mGapPosition = INVALID_POSITION; + setHorizontalScrollBarEnabled(false); + setVerticalScrollBarEnabled(false); + mContentView = new ContentLayout(ctx, this); + mContentView.setOrientation(LinearLayout.HORIZONTAL); + addView(mContentView); + mContentView.setLayoutParams( + new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT)); + // ProGuard ! + setGap(getGap()); + mFlingVelocity = getContext().getResources().getDisplayMetrics().density + * MIN_VELOCITY; + } + + protected int getScrollValue() { + return mHorizontal ? mScrollX : mScrollY; + } + + protected void setScrollValue(int value) { + scrollTo(mHorizontal ? value : 0, mHorizontal ? 0 : value); + } + + protected NavTabView getTabView(int pos) { + return (NavTabView) mContentView.getChildAt(pos); + } + + protected boolean isHorizontal() { + return mHorizontal; + } + + public void setOrientation(int orientation) { + mContentView.setOrientation(orientation); + if (orientation == LinearLayout.HORIZONTAL) { + mContentView.setLayoutParams( + new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT)); + } else { + mContentView.setLayoutParams( + new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)); + } + super.setOrientation(orientation); + } + + @Override + protected void onMeasure(int wspec, int hspec) { + super.onMeasure(wspec, hspec); + calcPadding(); + } + + private void calcPadding() { + if (mAdapter.getCount() > 0) { + View v = mContentView.getChildAt(0); + if (mHorizontal) { + int pad = (getMeasuredWidth() - v.getMeasuredWidth()) / 2 + 2; + mContentView.setPadding(pad, 0, pad, 0); + } else { + int pad = (getMeasuredHeight() - v.getMeasuredHeight()) / 2 + 2; + mContentView.setPadding(0, pad, 0, pad); + } + } + } + + public void setAdapter(BaseAdapter adapter) { + setAdapter(adapter, 0); + } + + + public void setOnRemoveListener(OnRemoveListener l) { + mRemoveListener = l; + } + + public void setOnLayoutListener(OnLayoutListener l) { + mLayoutListener = l; + } + + protected void setAdapter(BaseAdapter adapter, int selection) { + mAdapter = adapter; + mAdapter.registerDataSetObserver(new DataSetObserver() { + + @Override + public void onChanged() { + super.onChanged(); + handleDataChanged(); + } + + @Override + public void onInvalidated() { + super.onInvalidated(); + } + }); + handleDataChanged(selection); + } + + protected ViewGroup getContentView() { + return mContentView; + } + + protected int getRelativeChildTop(int ix) { + return mContentView.getChildAt(ix).getTop() - mScrollY; + } + + protected void handleDataChanged() { + handleDataChanged(INVALID_POSITION); + } + + void handleDataChanged(int newscroll) { + int scroll = getScrollValue(); + if (mGapAnimator != null) { + mGapAnimator.cancel(); + } + mContentView.removeAllViews(); + for (int i = 0; i < mAdapter.getCount(); i++) { + View v = mAdapter.getView(i, null, mContentView); + LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams( + LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT); + lp.gravity = (mHorizontal ? Gravity.CENTER_VERTICAL : Gravity.CENTER_HORIZONTAL); + mContentView.addView(v, lp); + if (mGapPosition > INVALID_POSITION){ + adjustViewGap(v, i); + } + } + if (newscroll > INVALID_POSITION) { + newscroll = Math.min(mAdapter.getCount() - 1, newscroll); + mNeedsScroll = true; + mScrollPosition = newscroll; + requestLayout(); + } else { + setScrollValue(scroll); + } + } + + protected void finishScroller() { + mScroller.forceFinished(true); + } + + @Override + protected void onLayout(boolean changed, int l, int t, int r, int b) { + super.onLayout(changed, l, t, r, b); + if (mNeedsScroll) { + mScroller.forceFinished(true); + snapToSelected(mScrollPosition, false); + mNeedsScroll = false; + } + if (mLayoutListener != null) { + mLayoutListener.onLayout(l, t, r, b); + mLayoutListener = null; + } + } + + void clearTabs() { + mContentView.removeAllViews(); + } + + void snapToSelected(int pos, boolean smooth) { + if (pos < 0) return; + View v = mContentView.getChildAt(pos); + if (v == null) return; + int sx = 0; + int sy = 0; + if (mHorizontal) { + sx = (v.getLeft() + v.getRight() - getWidth()) / 2; + } else { + sy = (v.getTop() + v.getBottom() - getHeight()) / 2; + } + if ((sx != mScrollX) || (sy != mScrollY)) { + if (smooth) { + smoothScrollTo(sx,sy); + } else { + scrollTo(sx, sy); + } + } + } + + protected void animateOut(View v) { + if (v == null) return; + animateOut(v, -mFlingVelocity); + } + + private void animateOut(final View v, float velocity) { + float start = mHorizontal ? v.getTranslationY() : v.getTranslationX(); + animateOut(v, velocity, start); + } + + private void animateOut(final View v, float velocity, float start) { + if ((v == null) || (mAnimator != null)) return; + final int position = mContentView.indexOfChild(v); + int target = 0; + if (velocity < 0) { + target = mHorizontal ? -getHeight() : -getWidth(); + } else { + target = mHorizontal ? getHeight() : getWidth(); + } + int distance = target - (mHorizontal ? v.getTop() : v.getLeft()); + long duration = (long) (Math.abs(distance) * 1000 / Math.abs(velocity)); + int scroll = 0; + int translate = 0; + int gap = mHorizontal ? v.getWidth() : v.getHeight(); + int centerView = getViewCenter(v); + int centerScreen = getScreenCenter(); + int newpos = INVALID_POSITION; + if (centerView < centerScreen - gap / 2) { + // top view + scroll = - (centerScreen - centerView - gap); + translate = (position > 0) ? gap : 0; + newpos = position; + } else if (centerView > centerScreen + gap / 2) { + // bottom view + scroll = - (centerScreen + gap - centerView); + if (position < mAdapter.getCount() - 1) { + translate = -gap; + } + } else { + // center view + scroll = - (centerScreen - centerView); + if (position < mAdapter.getCount() - 1) { + translate = -gap; + } else { + scroll -= gap; + } + } + mGapPosition = position; + final int pos = newpos; + ObjectAnimator trans = ObjectAnimator.ofFloat(v, + (mHorizontal ? TRANSLATION_Y : TRANSLATION_X), start, target); + ObjectAnimator alpha = ObjectAnimator.ofFloat(v, ALPHA, getAlpha(v,start), + getAlpha(v,target)); + AnimatorSet set1 = new AnimatorSet(); + set1.playTogether(trans, alpha); + set1.setDuration(duration); + mAnimator = new AnimatorSet(); + ObjectAnimator trans2 = null; + ObjectAnimator scroll1 = null; + if (scroll != 0) { + if (mHorizontal) { + scroll1 = ObjectAnimator.ofInt(this, "scrollX", getScrollX(), getScrollX() + scroll); + } else { + scroll1 = ObjectAnimator.ofInt(this, "scrollY", getScrollY(), getScrollY() + scroll); + } + } + if (translate != 0) { + trans2 = ObjectAnimator.ofInt(this, "gap", 0, translate); + } + final int duration2 = 200; + if (scroll1 != null) { + if (trans2 != null) { + AnimatorSet set2 = new AnimatorSet(); + set2.playTogether(scroll1, trans2); + set2.setDuration(duration2); + mAnimator.playSequentially(set1, set2); + } else { + scroll1.setDuration(duration2); + mAnimator.playSequentially(set1, scroll1); + } + } else { + if (trans2 != null) { + trans2.setDuration(duration2); + mAnimator.playSequentially(set1, trans2); + } + } + mAnimator.addListener(new AnimatorListenerAdapter() { + public void onAnimationEnd(Animator a) { + if (mRemoveListener != null) { + mRemoveListener.onRemovePosition(position); + mAnimator = null; + mGapPosition = INVALID_POSITION; + mGap = 0; + handleDataChanged(pos); } - super.setOrientation(orientation); - } - - @Override - protected void onMeasure(int wspec, int hspec) { - super.onMeasure(wspec, hspec); - calcPadding(); - } - - private void calcPadding() { - if (mAdapter.getCount() > 0) { - View v = mContentView.getChildAt(0); - if (mHorizontal) { - int pad = (getMeasuredWidth() - v.getMeasuredWidth()) / 2 + 2; - mContentView.setPadding(pad, 0, pad, 0); - } else { - int pad = (getMeasuredHeight() - v.getMeasuredHeight()) / 2 + 2; - mContentView.setPadding(0, pad, 0, pad); - } + } + }); + mAnimator.start(); + } + + public void setGap(int gap) { + if (mGapPosition != INVALID_POSITION) { + mGap = gap; + postInvalidate(); + } + } + + public int getGap() { + return mGap; + } + + void adjustGap() { + for (int i = 0; i < mContentView.getChildCount(); i++) { + final View child = mContentView.getChildAt(i); + adjustViewGap(child, i); + } + } + + private void adjustViewGap(View view, int pos) { + if ((mGap < 0 && pos > mGapPosition) + || (mGap > 0 && pos < mGapPosition)) { + if (mHorizontal) { + view.setTranslationX(mGap); + } else { + view.setTranslationY(mGap); + } + } + } + + private int getViewCenter(View v) { + if (mHorizontal) { + return v.getLeft() + v.getWidth() / 2; + } else { + return v.getTop() + v.getHeight() / 2; + } + } + + private int getScreenCenter() { + if (mHorizontal) { + return getScrollX() + getWidth() / 2; + } else { + return getScrollY() + getHeight() / 2; + } + } + + @Override + public void draw(Canvas canvas) { + if (mGapPosition > INVALID_POSITION) { + adjustGap(); + } + super.draw(canvas); + } + + @Override + protected View findViewAt(int x, int y) { + x += mScrollX; + y += mScrollY; + final int count = mContentView.getChildCount(); + for (int i = count - 1; i >= 0; i--) { + View child = mContentView.getChildAt(i); + if (child.getVisibility() == View.VISIBLE) { + if ((x >= child.getLeft()) && (x < child.getRight()) + && (y >= child.getTop()) && (y < child.getBottom())) { + return child; } - } - - public void setAdapter(BaseAdapter adapter) { - setAdapter(adapter, 0); - } - - - public void setOnRemoveListener(OnRemoveListener l) { - mRemoveListener = l; - } - - public void setOnLayoutListener(OnLayoutListener l) { - mLayoutListener = l; - } - - protected void setAdapter(BaseAdapter adapter, int selection) { - mAdapter = adapter; - mAdapter.registerDataSetObserver(new DataSetObserver() { - - @Override - public void onChanged() { - super.onChanged(); - handleDataChanged(); - } - - @Override - public void onInvalidated() { - super.onInvalidated(); - } - }); - handleDataChanged(selection); - } - - protected ViewGroup getContentView() { - return mContentView; - } - - protected int getRelativeChildTop(int ix) { - return mContentView.getChildAt(ix).getTop() - mScrollY; - } - - protected void handleDataChanged() { - handleDataChanged(INVALID_POSITION); - } - - void handleDataChanged(int newscroll) { - int scroll = getScrollValue(); - if (mGapAnimator != null) { - mGapAnimator.cancel(); - } - mContentView.removeAllViews(); - for (int i = 0; i < mAdapter.getCount(); i++) { - View v = mAdapter.getView(i, null, mContentView); - LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams( - LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT); - lp.gravity = (mHorizontal ? Gravity.CENTER_VERTICAL : Gravity.CENTER_HORIZONTAL); - mContentView.addView(v, lp); - if (mGapPosition > INVALID_POSITION){ - adjustViewGap(v, i); - } - } - if (newscroll > INVALID_POSITION) { - newscroll = Math.min(mAdapter.getCount() - 1, newscroll); - mNeedsScroll = true; - mScrollPosition = newscroll; - requestLayout(); - } else { - setScrollValue(scroll); - } - } - - protected void finishScroller() { - mScroller.forceFinished(true); + } + } + return null; + } + + @Override + protected void onOrthoDrag(View v, float distance) { + if ((v != null) && (mAnimator == null)) { + offsetView(v, distance); + } + } + + @Override + protected void onOrthoDragFinished(View downView) { + if (mAnimator != null) return; + if (mIsOrthoDragged && downView != null) { + // offset + float diff = mHorizontal ? downView.getTranslationY() : downView.getTranslationX(); + if (Math.abs(diff) > (mHorizontal ? downView.getHeight() : downView.getWidth()) / 2) { + // remove it + animateOut(downView, Math.signum(diff) * mFlingVelocity, diff); + } else { + // snap back + offsetView(downView, 0); + } + } + } + + @Override + protected void onOrthoFling(View v, float velocity) { + if (v == null) return; + if (mAnimator == null && Math.abs(velocity) > mFlingVelocity / 2) { + animateOut(v, velocity); + } else { + offsetView(v, 0); + } + } + + private void offsetView(View v, float distance) { + v.setAlpha(getAlpha(v, distance)); + if (mHorizontal) { + v.setTranslationY(distance); + } else { + v.setTranslationX(distance); + } + } + + private float getAlpha(View v, float distance) { + return 1 - (float) Math.abs(distance) / (mHorizontal ? v.getHeight() : v.getWidth()); + } + + private float ease(DecelerateInterpolator inter, float value, float start, + float dist, float duration) { + return start + dist * inter.getInterpolation(value / duration); + } + + @Override + protected void onPull(int delta) { + boolean layer = false; + int count = 2; + if (delta == 0 && mPullValue == 0) return; + if (delta == 0 && mPullValue != 0) { + // reset + for (int i = 0; i < count; i++) { + View child = mContentView.getChildAt((mPullValue < 0) + ? i + : mContentView.getChildCount() - 1 - i); + if (child == null) break; + ObjectAnimator trans = ObjectAnimator.ofFloat(child, + mHorizontal ? "translationX" : "translationY", + mHorizontal ? getTranslationX() : getTranslationY(), + 0); + ObjectAnimator rot = ObjectAnimator.ofFloat(child, + mHorizontal ? "rotationY" : "rotationX", + mHorizontal ? getRotationY() : getRotationX(), + 0); + AnimatorSet set = new AnimatorSet(); + set.playTogether(trans, rot); + set.setDuration(100); + set.start(); + } + mPullValue = 0; + } else { + if (mPullValue == 0) { + layer = true; + } + mPullValue += delta; + } + final int height = mHorizontal ? getWidth() : getHeight(); + int oscroll = Math.abs(mPullValue); + int factor = (mPullValue <= 0) ? 1 : -1; + for (int i = 0; i < count; i++) { + View child = mContentView.getChildAt((mPullValue < 0) + ? i + : mContentView.getChildCount() - 1 - i); + if (child == null) break; + if (layer) { + } + float k = PULL_FACTOR[i]; + float rot = -factor * ease(mCubic, oscroll, 0, k * 2, height); + int y = factor * (int) ease(mCubic, oscroll, 0, k*20, height); + if (mHorizontal) { + child.setTranslationX(y); + } else { + child.setTranslationY(y); + } + if (mHorizontal) { + child.setRotationY(-rot); + } else { + child.setRotationX(rot); + } + } + } + + static class ContentLayout extends LinearLayout { + + NavTabScroller mScroller; + + public ContentLayout(Context context, NavTabScroller scroller) { + super(context); + mScroller = scroller; } @Override - protected void onLayout(boolean changed, int l, int t, int r, int b) { - super.onLayout(changed, l, t, r, b); - if (mNeedsScroll) { - mScroller.forceFinished(true); - snapToSelected(mScrollPosition, false); - mNeedsScroll = false; + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + super.onMeasure(widthMeasureSpec, heightMeasureSpec); + if (mScroller.getGap() != 0) { + View v = getChildAt(0); + if (v != null) { + if (mScroller.isHorizontal()) { + int total = v.getMeasuredWidth() + getMeasuredWidth(); + setMeasuredDimension(total, getMeasuredHeight()); + } else { + int total = v.getMeasuredHeight() + getMeasuredHeight(); + setMeasuredDimension(getMeasuredWidth(), total); + } } - if (mLayoutListener != null) { - mLayoutListener.onLayout(l, t, r, b); - mLayoutListener = null; - } - } - void clearTabs() { - mContentView.removeAllViews(); + } } - void snapToSelected(int pos, boolean smooth) { - if (pos < 0) return; - View v = mContentView.getChildAt(pos); - if (v == null) return; - int sx = 0; - int sy = 0; - if (mHorizontal) { - sx = (v.getLeft() + v.getRight() - getWidth()) / 2; - } else { - sy = (v.getTop() + v.getBottom() - getHeight()) / 2; - } - if ((sx != mScrollX) || (sy != mScrollY)) { - if (smooth) { - smoothScrollTo(sx,sy); - } else { - scrollTo(sx, sy); - } - } - } - - protected void animateOut(View v) { - if (v == null) return; - animateOut(v, -mFlingVelocity); - } - - private void animateOut(final View v, float velocity) { - float start = mHorizontal ? v.getTranslationY() : v.getTranslationX(); - animateOut(v, velocity, start); - } - - private void animateOut(final View v, float velocity, float start) { - if ((v == null) || (mAnimator != null)) return; - final int position = mContentView.indexOfChild(v); - int target = 0; - if (velocity < 0) { - target = mHorizontal ? -getHeight() : -getWidth(); - } else { - target = mHorizontal ? getHeight() : getWidth(); - } - int distance = target - (mHorizontal ? v.getTop() : v.getLeft()); - long duration = (long) (Math.abs(distance) * 1000 / Math.abs(velocity)); - int scroll = 0; - int translate = 0; - int gap = mHorizontal ? v.getWidth() : v.getHeight(); - int centerView = getViewCenter(v); - int centerScreen = getScreenCenter(); - int newpos = INVALID_POSITION; - if (centerView < centerScreen - gap / 2) { - // top view - scroll = - (centerScreen - centerView - gap); - translate = (position > 0) ? gap : 0; - newpos = position; - } else if (centerView > centerScreen + gap / 2) { - // bottom view - scroll = - (centerScreen + gap - centerView); - if (position < mAdapter.getCount() - 1) { - translate = -gap; - } - } else { - // center view - scroll = - (centerScreen - centerView); - if (position < mAdapter.getCount() - 1) { - translate = -gap; - } else { - scroll -= gap; - } - } - mGapPosition = position; - final int pos = newpos; - ObjectAnimator trans = ObjectAnimator.ofFloat(v, - (mHorizontal ? TRANSLATION_Y : TRANSLATION_X), start, target); - ObjectAnimator alpha = ObjectAnimator.ofFloat(v, ALPHA, getAlpha(v,start), - getAlpha(v,target)); - AnimatorSet set1 = new AnimatorSet(); - set1.playTogether(trans, alpha); - set1.setDuration(duration); - mAnimator = new AnimatorSet(); - ObjectAnimator trans2 = null; - ObjectAnimator scroll1 = null; - if (scroll != 0) { - if (mHorizontal) { - scroll1 = ObjectAnimator.ofInt(this, "scrollX", getScrollX(), getScrollX() + scroll); - } else { - scroll1 = ObjectAnimator.ofInt(this, "scrollY", getScrollY(), getScrollY() + scroll); - } - } - if (translate != 0) { - trans2 = ObjectAnimator.ofInt(this, "gap", 0, translate); - } - final int duration2 = 200; - if (scroll1 != null) { - if (trans2 != null) { - AnimatorSet set2 = new AnimatorSet(); - set2.playTogether(scroll1, trans2); - set2.setDuration(duration2); - mAnimator.playSequentially(set1, set2); - } else { - scroll1.setDuration(duration2); - mAnimator.playSequentially(set1, scroll1); - } - } else { - if (trans2 != null) { - trans2.setDuration(duration2); - mAnimator.playSequentially(set1, trans2); - } - } - mAnimator.addListener(new AnimatorListenerAdapter() { - public void onAnimationEnd(Animator a) { - if (mRemoveListener != null) { - mRemoveListener.onRemovePosition(position); - mAnimator = null; - mGapPosition = INVALID_POSITION; - mGap = 0; - handleDataChanged(pos); - } - } - }); - mAnimator.start(); - } - - public void setGap(int gap) { - if (mGapPosition != INVALID_POSITION) { - mGap = gap; - postInvalidate(); - } - } - - public int getGap() { - return mGap; - } - - void adjustGap() { - for (int i = 0; i < mContentView.getChildCount(); i++) { - final View child = mContentView.getChildAt(i); - adjustViewGap(child, i); - } - } - - private void adjustViewGap(View view, int pos) { - if ((mGap < 0 && pos > mGapPosition) - || (mGap > 0 && pos < mGapPosition)) { - if (mHorizontal) { - view.setTranslationX(mGap); - } else { - view.setTranslationY(mGap); - } - } - } - - private int getViewCenter(View v) { - if (mHorizontal) { - return v.getLeft() + v.getWidth() / 2; - } else { - return v.getTop() + v.getHeight() / 2; - } - } - - private int getScreenCenter() { - if (mHorizontal) { - return getScrollX() + getWidth() / 2; - } else { - return getScrollY() + getHeight() / 2; - } - } - - @Override - public void draw(Canvas canvas) { - if (mGapPosition > INVALID_POSITION) { - adjustGap(); - } - super.draw(canvas); - } - - @Override - protected View findViewAt(int x, int y) { - x += mScrollX; - y += mScrollY; - final int count = mContentView.getChildCount(); - for (int i = count - 1; i >= 0; i--) { - View child = mContentView.getChildAt(i); - if (child.getVisibility() == View.VISIBLE) { - if ((x >= child.getLeft()) && (x < child.getRight()) - && (y >= child.getTop()) && (y < child.getBottom())) { - return child; - } - } - } - return null; - } - - @Override - protected void onOrthoDrag(View v, float distance) { - if ((v != null) && (mAnimator == null)) { - offsetView(v, distance); - } - } - - @Override - protected void onOrthoDragFinished(View downView) { - if (mAnimator != null) return; - if (mIsOrthoDragged && downView != null) { - // offset - float diff = mHorizontal ? downView.getTranslationY() : downView.getTranslationX(); - if (Math.abs(diff) > (mHorizontal ? downView.getHeight() : downView.getWidth()) / 2) { - // remove it - animateOut(downView, Math.signum(diff) * mFlingVelocity, diff); - } else { - // snap back - offsetView(downView, 0); - } - } - } - - @Override - protected void onOrthoFling(View v, float velocity) { - if (v == null) return; - if (mAnimator == null && Math.abs(velocity) > mFlingVelocity / 2) { - animateOut(v, velocity); - } else { - offsetView(v, 0); - } - } - - private void offsetView(View v, float distance) { - v.setAlpha(getAlpha(v, distance)); - if (mHorizontal) { - v.setTranslationY(distance); - } else { - v.setTranslationX(distance); - } - } - - private float getAlpha(View v, float distance) { - return 1 - (float) Math.abs(distance) / (mHorizontal ? v.getHeight() : v.getWidth()); - } - - private float ease(DecelerateInterpolator inter, float value, float start, - float dist, float duration) { - return start + dist * inter.getInterpolation(value / duration); - } - - @Override - protected void onPull(int delta) { - boolean layer = false; - int count = 2; - if (delta == 0 && mPullValue == 0) return; - if (delta == 0 && mPullValue != 0) { - // reset - for (int i = 0; i < count; i++) { - View child = mContentView.getChildAt((mPullValue < 0) - ? i - : mContentView.getChildCount() - 1 - i); - if (child == null) break; - ObjectAnimator trans = ObjectAnimator.ofFloat(child, - mHorizontal ? "translationX" : "translationY", - mHorizontal ? getTranslationX() : getTranslationY(), - 0); - ObjectAnimator rot = ObjectAnimator.ofFloat(child, - mHorizontal ? "rotationY" : "rotationX", - mHorizontal ? getRotationY() : getRotationX(), - 0); - AnimatorSet set = new AnimatorSet(); - set.playTogether(trans, rot); - set.setDuration(100); - set.start(); - } - mPullValue = 0; - } else { - if (mPullValue == 0) { - layer = true; - } - mPullValue += delta; - } - final int height = mHorizontal ? getWidth() : getHeight(); - int oscroll = Math.abs(mPullValue); - int factor = (mPullValue <= 0) ? 1 : -1; - for (int i = 0; i < count; i++) { - View child = mContentView.getChildAt((mPullValue < 0) - ? i - : mContentView.getChildCount() - 1 - i); - if (child == null) break; - if (layer) { - } - float k = PULL_FACTOR[i]; - float rot = -factor * ease(mCubic, oscroll, 0, k * 2, height); - int y = factor * (int) ease(mCubic, oscroll, 0, k*20, height); - if (mHorizontal) { - child.setTranslationX(y); - } else { - child.setTranslationY(y); - } - if (mHorizontal) { - child.setRotationY(-rot); - } else { - child.setRotationX(rot); - } - } - } - - static class ContentLayout extends LinearLayout { - - NavTabScroller mScroller; - - public ContentLayout(Context context, NavTabScroller scroller) { - super(context); - mScroller = scroller; - } - - @Override - protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { - super.onMeasure(widthMeasureSpec, heightMeasureSpec); - if (mScroller.getGap() != 0) { - View v = getChildAt(0); - if (v != null) { - if (mScroller.isHorizontal()) { - int total = v.getMeasuredWidth() + getMeasuredWidth(); - setMeasuredDimension(total, getMeasuredHeight()); - } else { - int total = v.getMeasuredHeight() + getMeasuredHeight(); - setMeasuredDimension(getMeasuredWidth(), total); - } - } - - } - } - - } + } -}
\ No newline at end of file +} diff --git a/src/com/android/browser/NavTabView.java b/src/com/android/browser/NavTabView.java index b15e828..91f074c 100644 --- a/src/com/android/browser/NavTabView.java +++ b/src/com/android/browser/NavTabView.java @@ -86,9 +86,9 @@ public class NavTabView extends LinearLayout { mTitle.setText(txt); } if (mTab.isSnapshot()) { - setTitleIcon(R.drawable.ic_history_holo_dark); + setTitleIcon(R.drawable.ic_history_dark); } else if (mTab.isPrivateBrowsingEnabled()) { - setTitleIcon(R.drawable.ic_incognito_holo_dark); + setTitleIcon(R.drawable.ic_incognito_dark); } else { setTitleIcon(0); } diff --git a/src/com/android/browser/NavigationBarPhone.java b/src/com/android/browser/NavigationBarPhone.java index 6bdbf7d..cdf73c7 100644 --- a/src/com/android/browser/NavigationBarPhone.java +++ b/src/com/android/browser/NavigationBarPhone.java @@ -83,8 +83,8 @@ public class NavigationBarPhone extends NavigationBarBase implements mTitleContainer = findViewById(R.id.title_bg); setFocusState(false); Resources res = getContext().getResources(); - mStopDrawable = res.getDrawable(R.drawable.ic_stop_holo_dark); - mRefreshDrawable = res.getDrawable(R.drawable.ic_refresh_holo_dark); + mStopDrawable = res.getDrawable(R.drawable.ic_stop_dark); + mRefreshDrawable = res.getDrawable(R.drawable.ic_refresh_dark); mStopDescription = res.getString(R.string.accessibility_button_stop); mRefreshDescription = res.getString(R.string.accessibility_button_refresh); mTextfieldBgDrawable = res.getDrawable(R.drawable.textfield_active_holo_dark); diff --git a/src/com/android/browser/NavigationBarTablet.java b/src/com/android/browser/NavigationBarTablet.java index adfd5e7..d66553f 100644 --- a/src/com/android/browser/NavigationBarTablet.java +++ b/src/com/android/browser/NavigationBarTablet.java @@ -74,8 +74,8 @@ public class NavigationBarTablet extends NavigationBarBase implements StateListe private void init(Context context) { Resources resources = context.getResources(); - mStopDrawable = resources.getDrawable(R.drawable.ic_stop_holo_dark); - mReloadDrawable = resources.getDrawable(R.drawable.ic_refresh_holo_dark); + mStopDrawable = resources.getDrawable(R.drawable.ic_stop_dark); + mReloadDrawable = resources.getDrawable(R.drawable.ic_refresh_dark); mStopDescription = resources.getString(R.string.accessibility_button_stop); mRefreshDescription = resources.getString(R.string.accessibility_button_refresh); mFocusDrawable = resources.getDrawable( @@ -140,11 +140,11 @@ public class NavigationBarTablet extends NavigationBarBase implements StateListe void updateNavigationState(Tab tab) { if (tab != null) { mBackButton.setImageResource(tab.canGoBack() - ? R.drawable.ic_back_holo_dark - : R.drawable.ic_back_disabled_holo_dark); + ? R.drawable.ic_back_dark + : R.drawable.ic_back_disabled_dark); mForwardButton.setImageResource(tab.canGoForward() - ? R.drawable.ic_forward_holo_dark - : R.drawable.ic_forward_disabled_holo_dark); + ? R.drawable.ic_forward_dark + : R.drawable.ic_forward_disabled_dark); } updateUrlIcon(); } @@ -204,7 +204,7 @@ public class NavigationBarTablet extends NavigationBarBase implements StateListe void updateUrlIcon() { if (mUrlInput.hasFocus()) { - mUrlIcon.setImageResource(R.drawable.ic_search_holo_dark); + mUrlIcon.setImageResource(R.drawable.ic_search_dark); } else { if (mFaviconDrawable == null) { mFaviconDrawable = mBaseUi.getFaviconDrawable(null); @@ -222,7 +222,7 @@ public class NavigationBarTablet extends NavigationBarBase implements StateListe } mSearchButton.setVisibility(View.GONE); mStar.setVisibility(View.GONE); - mUrlIcon.setImageResource(R.drawable.ic_search_holo_dark); + mUrlIcon.setImageResource(R.drawable.ic_search_dark); } else { if (mHideNavButtons) { showNavButtons(); diff --git a/src/com/android/browser/PieControl.java b/src/com/android/browser/PieControl.java index d853808..18c348e 100644 --- a/src/com/android/browser/PieControl.java +++ b/src/com/android/browser/PieControl.java @@ -125,30 +125,30 @@ public class PieControl implements PieMenu.PieController, OnClickListener { if (mUiController.getSettings().hasDesktopUseragent(view)) { icon.setImageResource(R.drawable.ic_mobile); } else { - icon.setImageResource(R.drawable.ic_desktop_holo_dark); + icon.setImageResource(R.drawable.ic_desktop_dark); } } return true; } protected void populateMenu() { - mBack = makeItem(R.drawable.ic_back_holo_dark, 1); - mUrl = makeItem(R.drawable.ic_web_holo_dark, 1); - mBookmarks = makeItem(R.drawable.ic_bookmarks_holo_dark, 1); - mHistory = makeItem(R.drawable.ic_history_holo_dark, 1); - mAddBookmark = makeItem(R.drawable.ic_bookmark_on_holo_dark, 1); - mRefresh = makeItem(R.drawable.ic_refresh_holo_dark, 1); - mForward = makeItem(R.drawable.ic_forward_holo_dark, 1); - mNewTab = makeItem(R.drawable.ic_new_window_holo_dark, 1); - mIncognito = makeItem(R.drawable.ic_new_incognito_holo_dark, 1); - mClose = makeItem(R.drawable.ic_close_window_holo_dark, 1); + mBack = makeItem(R.drawable.ic_back_dark, 1); + mUrl = makeItem(R.drawable.ic_web_dark, 1); + mBookmarks = makeItem(R.drawable.ic_bookmarks_dark, 1); + mHistory = makeItem(R.drawable.ic_history_dark, 1); + mAddBookmark = makeItem(R.drawable.ic_bookmark_on_dark, 1); + mRefresh = makeItem(R.drawable.ic_refresh_dark, 1); + mForward = makeItem(R.drawable.ic_forward_dark, 1); + mNewTab = makeItem(R.drawable.ic_new_window_dark, 1); + mIncognito = makeItem(R.drawable.ic_new_incognito_dark, 1); + mClose = makeItem(R.drawable.ic_close_window_dark, 1); mInfo = makeItem(android.R.drawable.ic_menu_info_details, 1); - mFind = makeItem(R.drawable.ic_search_holo_dark, 1); - mShare = makeItem(R.drawable.ic_share_holo_dark, 1); + mFind = makeItem(R.drawable.ic_search_dark, 1); + mShare = makeItem(R.drawable.ic_share_dark, 1); View tabs = makeTabsView(); mShowTabs = new PieItem(tabs, 1); - mOptions = makeItem(R.drawable.ic_settings_holo_dark, 1); - mRDS = makeItem(R.drawable.ic_desktop_holo_dark, 1); + mOptions = makeItem(R.drawable.ic_settings_dark, 1); + mRDS = makeItem(R.drawable.ic_desktop_dark, 1); mTabAdapter = new TabAdapter(mActivity, mUiController); PieStackView stack = new PieStackView(mActivity); stack.setLayoutListener(new OnLayoutListener() { @@ -272,7 +272,7 @@ public class PieControl implements PieMenu.PieController, OnClickListener { mTabsCount = (TextView) v.findViewById(R.id.label); mTabsCount.setText("1"); ImageView image = (ImageView) v.findViewById(R.id.icon); - image.setImageResource(R.drawable.ic_windows_holo_dark); + image.setImageResource(R.drawable.ic_windows_dark); image.setScaleType(ScaleType.CENTER); LayoutParams lp = new LayoutParams(mItemSize, mItemSize); v.setLayoutParams(lp); diff --git a/src/com/android/browser/addbookmark/FolderSpinnerAdapter.java b/src/com/android/browser/addbookmark/FolderSpinnerAdapter.java index f86c9c6..1cad1dd 100644 --- a/src/com/android/browser/addbookmark/FolderSpinnerAdapter.java +++ b/src/com/android/browser/addbookmark/FolderSpinnerAdapter.java @@ -69,17 +69,17 @@ public class FolderSpinnerAdapter extends BaseAdapter { switch (position) { case HOME_SCREEN: labelResource = R.string.add_to_homescreen_menu_option; - drawableResource = R.drawable.ic_home_holo_dark; + drawableResource = R.drawable.ic_home_dark; break; case ROOT_FOLDER: labelResource = R.string.add_to_bookmarks_menu_option; - drawableResource = R.drawable.ic_bookmarks_holo_dark; + drawableResource = R.drawable.ic_bookmarks_dark; break; case RECENT_FOLDER: // Fall through and use the same icon resource case OTHER_FOLDER: labelResource = R.string.add_to_other_folder_menu_option; - drawableResource = R.drawable.ic_folder_holo_dark; + drawableResource = R.drawable.ic_folder_dark; break; default: labelResource = 0; diff --git a/src/com/android/browser/preferences/WebsiteSettingsFragment.java b/src/com/android/browser/preferences/WebsiteSettingsFragment.java index c84c669..be38f3e 100644 --- a/src/com/android/browser/preferences/WebsiteSettingsFragment.java +++ b/src/com/android/browser/preferences/WebsiteSettingsFragment.java @@ -219,9 +219,9 @@ public class WebsiteSettingsFragment extends ListFragment implements OnClickList mUsageHighIcon = BitmapFactory.decodeResource(getResources(), R.drawable.ic_list_data_large); mLocationAllowedIcon = BitmapFactory.decodeResource(getResources(), - R.drawable.ic_gps_on_holo_dark); + R.drawable.ic_gps_on_dark); mLocationDisallowedIcon = BitmapFactory.decodeResource(getResources(), - R.drawable.ic_gps_denied_holo_dark); + R.drawable.ic_gps_denied_dark); mCurrentSite = site; if (mCurrentSite == null) { askForOrigins(); diff --git a/src/com/android/browser/provider/BrowserProvider2.java b/src/com/android/browser/provider/BrowserProvider2.java index 97efb3f..e791a98 100644 --- a/src/com/android/browser/provider/BrowserProvider2.java +++ b/src/com/android/browser/provider/BrowserProvider2.java @@ -129,8 +129,8 @@ public class BrowserProvider2 extends SQLiteContentProvider { qualifyColumn(TABLE_HISTORY, History.URL), bookmarkOrHistoryColumn(Combined.TITLE), bookmarkOrHistoryLiteral(Combined.URL, - Integer.toString(R.drawable.ic_bookmark_off_holo_dark), - Integer.toString(R.drawable.ic_history_holo_dark)), + Integer.toString(R.drawable.ic_bookmark_off_dark), + Integer.toString(R.drawable.ic_history_dark)), qualifyColumn(TABLE_HISTORY, History.DATE_LAST_VISITED)}; private static final String SUGGEST_SELECTION = diff --git a/src/com/android/browser/view/StopProgressView.java b/src/com/android/browser/view/StopProgressView.java index 64fa5d0..5da3e15 100644 --- a/src/com/android/browser/view/StopProgressView.java +++ b/src/com/android/browser/view/StopProgressView.java @@ -58,7 +58,7 @@ public class StopProgressView extends ProgressBar { private void init(AttributeSet attrs) { mProgressDrawable = getIndeterminateDrawable(); setImageDrawable(mContext.getResources() - .getDrawable(R.drawable.ic_stop_holo_dark)); + .getDrawable(R.drawable.ic_stop_dark)); } public void hideProgress() { diff --git a/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java b/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java index 209faad..3c40645 100644 --- a/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java +++ b/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java @@ -246,7 +246,7 @@ public class BookmarkThumbnailWidgetService extends RemoteViewsService { } else { views.setImageViewResource(R.id.thumb, R.drawable.thumb_bookmark_widget_folder_holo); } - views.setImageViewResource(R.id.favicon, R.drawable.ic_bookmark_widget_bookmark_holo_dark); + views.setImageViewResource(R.id.favicon, R.drawable.ic_bookmark_widget_bookmark_dark); views.setDrawableParameters(R.id.thumb, true, 0, -1, null, -1); } else { // RemoteViews require a valid bitmap config |
