diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/CustomScrollView.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/CustomScrollView.java index 66e219e3d..c223c5d4a 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/CustomScrollView.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/CustomScrollView.java @@ -62,7 +62,7 @@ private void createScrollDelegate(Context context, AttributeSet attrs, int defSt TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.CustomScrollView, 0, defStyle); mThumbDrawable = a.getDrawable(R.styleable.CustomScrollView_android_fastScrollThumbDrawable); if (mThumbDrawable == null) { - mThumbDrawable = getResources().getDrawable(R.drawable.fast_scroll_thumb, getContext().getTheme()); + mThumbDrawable = getResources().getDrawable(R.drawable.scrollbar_thumb, getContext().getTheme()); } mIsAlwaysVisible = a.getBoolean(R.styleable.CustomScrollView_android_fastScrollAlwaysVisible, false); mThumbDynamicHeight = a.getBoolean(R.styleable.CustomScrollView_dynamicHeight, true); diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java index f1c78e64c..77f3a553e 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java @@ -317,6 +317,10 @@ private void initialize(@NonNull Context aContext) { mPrefs = PreferenceManager.getDefaultSharedPreferences(mAppContext); mPrefs.registerOnSharedPreferenceChangeListener(this); + + for (CustomUIButton button : mButtons) { + button.setPrivateMode(true); + } } @Override @@ -734,8 +738,6 @@ public void onCanGoBack(GeckoSession aSession, boolean canGoBack) { Log.d(LOGTAG, "Got onCanGoBack: " + (enableBackButton ? "true" : "false")); mBackButton.setEnabled(enableBackButton); - mBackButton.setHovered(false); - mBackButton.setClickable(enableBackButton); } } @@ -744,8 +746,6 @@ public void onCanGoForward(GeckoSession aSession, boolean canGoForward) { if (mForwardButton != null) { Log.d(LOGTAG, "Got onCanGoForward: " + (canGoForward ? "true" : "false")); mForwardButton.setEnabled(canGoForward); - mForwardButton.setHovered(false); - mForwardButton.setClickable(canGoForward); } } diff --git a/app/src/main/res/color/fog_void_tint.xml b/app/src/main/res/color/fog_void_tint.xml index 8ddbd75ee..7bc860bce 100644 --- a/app/src/main/res/color/fog_void_tint.xml +++ b/app/src/main/res/color/fog_void_tint.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/color/library_panel_button_text_color.xml b/app/src/main/res/color/library_panel_button_text_color.xml index 08f85705a..7b0eb1784 100644 --- a/app/src/main/res/color/library_panel_button_text_color.xml +++ b/app/src/main/res/color/library_panel_button_text_color.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/color/library_panel_context_menu_item_color.xml b/app/src/main/res/color/library_panel_context_menu_item_color.xml index c944e626d..7874cdfcf 100644 --- a/app/src/main/res/color/library_panel_context_menu_item_color.xml +++ b/app/src/main/res/color/library_panel_context_menu_item_color.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/color/library_panel_description_color.xml b/app/src/main/res/color/library_panel_description_color.xml index 863ea1a6e..07deb1020 100644 --- a/app/src/main/res/color/library_panel_description_color.xml +++ b/app/src/main/res/color/library_panel_description_color.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/color/library_panel_icon_color.xml b/app/src/main/res/color/library_panel_icon_color.xml index 0d8615217..1b8ba77f5 100644 --- a/app/src/main/res/color/library_panel_icon_color.xml +++ b/app/src/main/res/color/library_panel_icon_color.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/color/library_panel_title_text_color.xml b/app/src/main/res/color/library_panel_title_text_color.xml index 93a26e2d7..0c4b800c5 100644 --- a/app/src/main/res/color/library_panel_title_text_color.xml +++ b/app/src/main/res/color/library_panel_title_text_color.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/color/rhino_void_tint.xml b/app/src/main/res/color/rhino_void_tint.xml index bc67a9dd5..096117c90 100644 --- a/app/src/main/res/color/rhino_void_tint.xml +++ b/app/src/main/res/color/rhino_void_tint.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/color/void_fog_tint.xml b/app/src/main/res/color/void_fog_tint.xml index e3c37f612..69ca800b7 100644 --- a/app/src/main/res/color/void_fog_tint.xml +++ b/app/src/main/res/color/void_fog_tint.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/autocompletion_item_active_color.xml b/app/src/main/res/drawable/autocompletion_item_active_color.xml index 5f9d4e672..7627665e0 100644 --- a/app/src/main/res/drawable/autocompletion_item_active_color.xml +++ b/app/src/main/res/drawable/autocompletion_item_active_color.xml @@ -1,3 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/autocompletion_item_background.xml b/app/src/main/res/drawable/autocompletion_item_background.xml index 7025a479f..0f0e82ea2 100644 --- a/app/src/main/res/drawable/autocompletion_item_background.xml +++ b/app/src/main/res/drawable/autocompletion_item_background.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/autocompletion_item_background_first.xml b/app/src/main/res/drawable/autocompletion_item_background_first.xml index ffb1fb13b..af7b2f4f0 100644 --- a/app/src/main/res/drawable/autocompletion_item_background_first.xml +++ b/app/src/main/res/drawable/autocompletion_item_background_first.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/autocompletion_item_background_last.xml b/app/src/main/res/drawable/autocompletion_item_background_last.xml index 1e8544bc4..1a3b15ba0 100644 --- a/app/src/main/res/drawable/autocompletion_item_background_last.xml +++ b/app/src/main/res/drawable/autocompletion_item_background_last.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/checkbox.xml b/app/src/main/res/drawable/checkbox.xml index bb70f3999..a3d03a68e 100644 --- a/app/src/main/res/drawable/checkbox.xml +++ b/app/src/main/res/drawable/checkbox.xml @@ -1,5 +1,7 @@ - + - + diff --git a/app/src/main/res/drawable/context_menu_item_background_color.xml b/app/src/main/res/drawable/context_menu_item_background_color.xml index 5c7b25fa1..51687024e 100644 --- a/app/src/main/res/drawable/context_menu_item_background_color.xml +++ b/app/src/main/res/drawable/context_menu_item_background_color.xml @@ -1,6 +1,7 @@ + android:enterFadeDuration="@integer/ui_fadeAnimTime" + android:exitFadeDuration="@integer/ui_fadeAnimTime"> diff --git a/app/src/main/res/drawable/dialog_button_text_color.xml b/app/src/main/res/drawable/dialog_button_text_color.xml index e25a30918..67c3365cb 100644 --- a/app/src/main/res/drawable/dialog_button_text_color.xml +++ b/app/src/main/res/drawable/dialog_button_text_color.xml @@ -1,5 +1,7 @@ - + - + diff --git a/app/src/main/res/drawable/dialog_close_button_icon_color.xml b/app/src/main/res/drawable/dialog_close_button_icon_color.xml index af1298c81..c5c901e82 100644 --- a/app/src/main/res/drawable/dialog_close_button_icon_color.xml +++ b/app/src/main/res/drawable/dialog_close_button_icon_color.xml @@ -1,4 +1,6 @@ - + - + diff --git a/app/src/main/res/drawable/dialog_regular_button_background.xml b/app/src/main/res/drawable/dialog_regular_button_background.xml index ebbe02690..76599eeff 100644 --- a/app/src/main/res/drawable/dialog_regular_button_background.xml +++ b/app/src/main/res/drawable/dialog_regular_button_background.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/edittext_textcolor.xml b/app/src/main/res/drawable/edittext_textcolor.xml index cfd780220..cf352e838 100644 --- a/app/src/main/res/drawable/edittext_textcolor.xml +++ b/app/src/main/res/drawable/edittext_textcolor.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/empty_drawable.xml b/app/src/main/res/drawable/empty_drawable.xml index b56e31ded..55453b8ac 100644 --- a/app/src/main/res/drawable/empty_drawable.xml +++ b/app/src/main/res/drawable/empty_drawable.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/fast_scroll_thumb.xml b/app/src/main/res/drawable/fast_scroll_thumb.xml index 2720ed110..ef7e25b2e 100644 --- a/app/src/main/res/drawable/fast_scroll_thumb.xml +++ b/app/src/main/res/drawable/fast_scroll_thumb.xml @@ -1,5 +1,7 @@ - + - + + + + diff --git a/app/src/main/res/drawable/fullscreen_button_first.xml b/app/src/main/res/drawable/fullscreen_button_first.xml index 901222966..eddde7126 100644 --- a/app/src/main/res/drawable/fullscreen_button_first.xml +++ b/app/src/main/res/drawable/fullscreen_button_first.xml @@ -1,7 +1,10 @@ - + + @@ -9,6 +12,7 @@ + + + - + + @@ -9,6 +12,7 @@ + + + - + diff --git a/app/src/main/res/drawable/fullscreen_button_private_first.xml b/app/src/main/res/drawable/fullscreen_button_private_first.xml index a27b82c5d..ec5157991 100644 --- a/app/src/main/res/drawable/fullscreen_button_private_first.xml +++ b/app/src/main/res/drawable/fullscreen_button_private_first.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/fullscreen_button_private_last.xml b/app/src/main/res/drawable/fullscreen_button_private_last.xml index 9dc160b90..782f51ac6 100644 --- a/app/src/main/res/drawable/fullscreen_button_private_last.xml +++ b/app/src/main/res/drawable/fullscreen_button_private_last.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/ic_icon_empty.xml b/app/src/main/res/drawable/ic_icon_empty.xml index a853dcfd8..7fb20b222 100644 --- a/app/src/main/res/drawable/ic_icon_empty.xml +++ b/app/src/main/res/drawable/ic_icon_empty.xml @@ -1,5 +1,7 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_icon_language_add.xml b/app/src/main/res/drawable/ic_icon_language_add.xml index 5ca999837..edcb72f55 100644 --- a/app/src/main/res/drawable/ic_icon_language_add.xml +++ b/app/src/main/res/drawable/ic_icon_language_add.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/ic_icon_language_delete.xml b/app/src/main/res/drawable/ic_icon_language_delete.xml index dd429375d..cf446f48d 100644 --- a/app/src/main/res/drawable/ic_icon_language_delete.xml +++ b/app/src/main/res/drawable/ic_icon_language_delete.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/ic_icon_language_move_down.xml b/app/src/main/res/drawable/ic_icon_language_move_down.xml index 7b8832c12..224e469c8 100644 --- a/app/src/main/res/drawable/ic_icon_language_move_down.xml +++ b/app/src/main/res/drawable/ic_icon_language_move_down.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/ic_icon_language_move_up.xml b/app/src/main/res/drawable/ic_icon_language_move_up.xml index 07bdc2552..44dbe6acf 100644 --- a/app/src/main/res/drawable/ic_icon_language_move_up.xml +++ b/app/src/main/res/drawable/ic_icon_language_move_up.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/ic_settings_honeycomb_fill.xml b/app/src/main/res/drawable/ic_settings_honeycomb_fill.xml deleted file mode 100644 index 83359ad31..000000000 --- a/app/src/main/res/drawable/ic_settings_honeycomb_fill.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/keyboard_button_background.xml b/app/src/main/res/drawable/keyboard_button_background.xml new file mode 100644 index 000000000..4aff5fe82 --- /dev/null +++ b/app/src/main/res/drawable/keyboard_button_background.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/lang_selector_button_background.xml b/app/src/main/res/drawable/lang_selector_button_background.xml index ccad4ff22..e4aa03a86 100644 --- a/app/src/main/res/drawable/lang_selector_button_background.xml +++ b/app/src/main/res/drawable/lang_selector_button_background.xml @@ -1,17 +1,19 @@ - + - > + - > + diff --git a/app/src/main/res/drawable/lang_selector_button_color.xml b/app/src/main/res/drawable/lang_selector_button_color.xml index bdfb33755..170015bb1 100644 --- a/app/src/main/res/drawable/lang_selector_button_color.xml +++ b/app/src/main/res/drawable/lang_selector_button_color.xml @@ -1,4 +1,6 @@ - + - + diff --git a/app/src/main/res/drawable/library_context_menu_item_background_middle.xml b/app/src/main/res/drawable/library_context_menu_item_background_middle.xml index 0c7d42ab7..c4005075b 100644 --- a/app/src/main/res/drawable/library_context_menu_item_background_middle.xml +++ b/app/src/main/res/drawable/library_context_menu_item_background_middle.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/library_context_menu_item_background_single.xml b/app/src/main/res/drawable/library_context_menu_item_background_single.xml index 7c243ee02..e1d451561 100644 --- a/app/src/main/res/drawable/library_context_menu_item_background_single.xml +++ b/app/src/main/res/drawable/library_context_menu_item_background_single.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/library_context_menu_item_background_top.xml b/app/src/main/res/drawable/library_context_menu_item_background_top.xml index 93fbfdd02..76ebb51e1 100644 --- a/app/src/main/res/drawable/library_context_menu_item_background_top.xml +++ b/app/src/main/res/drawable/library_context_menu_item_background_top.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/library_item_background_color.xml b/app/src/main/res/drawable/library_item_background_color.xml index 15ac09af7..4dc6d05c8 100644 --- a/app/src/main/res/drawable/library_item_background_color.xml +++ b/app/src/main/res/drawable/library_item_background_color.xml @@ -1,6 +1,7 @@ + android:enterFadeDuration="@integer/ui_fadeAnimTime" + android:exitFadeDuration="@integer/ui_fadeAnimTime"> diff --git a/app/src/main/res/drawable/main_button.xml b/app/src/main/res/drawable/main_button.xml index e990b0455..b9c9177a0 100644 --- a/app/src/main/res/drawable/main_button.xml +++ b/app/src/main/res/drawable/main_button.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/main_button_icon_color.xml b/app/src/main/res/drawable/main_button_icon_color.xml index af1298c81..c5c901e82 100644 --- a/app/src/main/res/drawable/main_button_icon_color.xml +++ b/app/src/main/res/drawable/main_button_icon_color.xml @@ -1,4 +1,6 @@ - + + + + - + + + + + diff --git a/app/src/main/res/drawable/media_button.xml b/app/src/main/res/drawable/media_button.xml index 9670c7f13..3a9464926 100644 --- a/app/src/main/res/drawable/media_button.xml +++ b/app/src/main/res/drawable/media_button.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/media_seekbar_thumb.xml b/app/src/main/res/drawable/media_seekbar_thumb.xml index 2c3f670db..8b9edcd6b 100644 --- a/app/src/main/res/drawable/media_seekbar_thumb.xml +++ b/app/src/main/res/drawable/media_seekbar_thumb.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/menu_item_background.xml b/app/src/main/res/drawable/menu_item_background.xml index ae8c5b2bd..6c6a3af90 100644 --- a/app/src/main/res/drawable/menu_item_background.xml +++ b/app/src/main/res/drawable/menu_item_background.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/menu_item_background_first.xml b/app/src/main/res/drawable/menu_item_background_first.xml index d29b41d7f..b9d687151 100644 --- a/app/src/main/res/drawable/menu_item_background_first.xml +++ b/app/src/main/res/drawable/menu_item_background_first.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/menu_item_background_last.xml b/app/src/main/res/drawable/menu_item_background_last.xml index 718283cce..a4d29cfbf 100644 --- a/app/src/main/res/drawable/menu_item_background_last.xml +++ b/app/src/main/res/drawable/menu_item_background_last.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/menu_item_color.xml b/app/src/main/res/drawable/menu_item_color.xml index 253d1fe39..d306a0f9e 100644 --- a/app/src/main/res/drawable/menu_item_color.xml +++ b/app/src/main/res/drawable/menu_item_color.xml @@ -1,5 +1,7 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/navigation_button_color.xml b/app/src/main/res/drawable/navigation_button_color.xml index 2e065ccfe..d9ed0e8b2 100644 --- a/app/src/main/res/drawable/navigation_button_color.xml +++ b/app/src/main/res/drawable/navigation_button_color.xml @@ -1,5 +1,7 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/prompt_button_background.xml b/app/src/main/res/drawable/prompt_button_background.xml index 2f757f0b4..ac6759f7e 100644 --- a/app/src/main/res/drawable/prompt_button_background.xml +++ b/app/src/main/res/drawable/prompt_button_background.xml @@ -1,28 +1,30 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/prompt_button_text_color.xml b/app/src/main/res/drawable/prompt_button_text_color.xml index 123067ff4..98adb7c34 100644 --- a/app/src/main/res/drawable/prompt_button_text_color.xml +++ b/app/src/main/res/drawable/prompt_button_text_color.xml @@ -1,5 +1,7 @@ - + - + + android:viewportWidth="200" android:width="24dp"> + android:viewportWidth="200" android:width="24dp"> + android:viewportWidth="200" android:width="24dp"> + android:viewportWidth="200" android:width="24dp"> + android:viewportWidth="200" android:width="24dp"> + android:viewportWidth="200" android:width="24dp"> diff --git a/app/src/main/res/drawable/prompt_item_text_color.xml b/app/src/main/res/drawable/prompt_item_text_color.xml index 20c3b800d..98d47b968 100644 --- a/app/src/main/res/drawable/prompt_item_text_color.xml +++ b/app/src/main/res/drawable/prompt_item_text_color.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/radio.xml b/app/src/main/res/drawable/radio.xml index 03bd3176b..7f9fe5fdb 100644 --- a/app/src/main/res/drawable/radio.xml +++ b/app/src/main/res/drawable/radio.xml @@ -1,5 +1,7 @@ - + - + - + - + - + - + - + - + diff --git a/app/src/main/res/drawable/setting_help_button_background.xml b/app/src/main/res/drawable/setting_help_button_background.xml index 7dc5098f2..93c32d82f 100644 --- a/app/src/main/res/drawable/setting_help_button_background.xml +++ b/app/src/main/res/drawable/setting_help_button_background.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/settings_button_color.xml b/app/src/main/res/drawable/settings_button_color.xml deleted file mode 100644 index ff6ff90f2..000000000 --- a/app/src/main/res/drawable/settings_button_color.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/settings_honeycomb_background.xml b/app/src/main/res/drawable/settings_honeycomb_background.xml new file mode 100644 index 000000000..016ce1e12 --- /dev/null +++ b/app/src/main/res/drawable/settings_honeycomb_background.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/settings_list_row_background_color.xml b/app/src/main/res/drawable/settings_list_row_background_color.xml index 15ac09af7..4dc6d05c8 100644 --- a/app/src/main/res/drawable/settings_list_row_background_color.xml +++ b/app/src/main/res/drawable/settings_list_row_background_color.xml @@ -1,6 +1,7 @@ + android:enterFadeDuration="@integer/ui_fadeAnimTime" + android:exitFadeDuration="@integer/ui_fadeAnimTime"> diff --git a/app/src/main/res/drawable/suggestion_background_color.xml b/app/src/main/res/drawable/suggestion_background_color.xml index 4c95f4310..40ac6d216 100644 --- a/app/src/main/res/drawable/suggestion_background_color.xml +++ b/app/src/main/res/drawable/suggestion_background_color.xml @@ -1,6 +1,7 @@ + android:enterFadeDuration="@integer/ui_fadeAnimTime" + android:exitFadeDuration="@integer/ui_fadeAnimTime"> diff --git a/app/src/main/res/drawable/suggestion_description_color.xml b/app/src/main/res/drawable/suggestion_description_color.xml index 577450005..0c39d1180 100644 --- a/app/src/main/res/drawable/suggestion_description_color.xml +++ b/app/src/main/res/drawable/suggestion_description_color.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/suggestion_icon_color.xml b/app/src/main/res/drawable/suggestion_icon_color.xml index 0eac69513..e35e82146 100644 --- a/app/src/main/res/drawable/suggestion_icon_color.xml +++ b/app/src/main/res/drawable/suggestion_icon_color.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/suggestion_text_color.xml b/app/src/main/res/drawable/suggestion_text_color.xml index 5ec95bdf3..b9dc27e84 100644 --- a/app/src/main/res/drawable/suggestion_text_color.xml +++ b/app/src/main/res/drawable/suggestion_text_color.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/switch_thumb.xml b/app/src/main/res/drawable/switch_thumb.xml index f8442af02..0029ed72c 100644 --- a/app/src/main/res/drawable/switch_thumb.xml +++ b/app/src/main/res/drawable/switch_thumb.xml @@ -1,5 +1,7 @@ - + - + diff --git a/app/src/main/res/drawable/text_button.xml b/app/src/main/res/drawable/text_button.xml index 29fcc68c3..1ba2f2622 100644 --- a/app/src/main/res/drawable/text_button.xml +++ b/app/src/main/res/drawable/text_button.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/text_button_private.xml b/app/src/main/res/drawable/text_button_private.xml index 0ae770fc7..bfd809e63 100644 --- a/app/src/main/res/drawable/text_button_private.xml +++ b/app/src/main/res/drawable/text_button_private.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/title_bar_background.xml b/app/src/main/res/drawable/title_bar_background.xml index 516f3cbc8..f83cfb45d 100644 --- a/app/src/main/res/drawable/title_bar_background.xml +++ b/app/src/main/res/drawable/title_bar_background.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/title_bar_background_private.xml b/app/src/main/res/drawable/title_bar_background_private.xml index 4912daf8b..475866940 100644 --- a/app/src/main/res/drawable/title_bar_background_private.xml +++ b/app/src/main/res/drawable/title_bar_background_private.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/tray_background_checked_middle.xml b/app/src/main/res/drawable/tray_background_checked_middle.xml index 5e7e7583c..ca1784612 100644 --- a/app/src/main/res/drawable/tray_background_checked_middle.xml +++ b/app/src/main/res/drawable/tray_background_checked_middle.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/tray_background_checked_start.xml b/app/src/main/res/drawable/tray_background_checked_start.xml index 4a9529630..1ff4f0fda 100644 --- a/app/src/main/res/drawable/tray_background_checked_start.xml +++ b/app/src/main/res/drawable/tray_background_checked_start.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/tray_background_ckecked_end.xml b/app/src/main/res/drawable/tray_background_ckecked_end.xml index 4bfd617f7..ebefc41c1 100644 --- a/app/src/main/res/drawable/tray_background_ckecked_end.xml +++ b/app/src/main/res/drawable/tray_background_ckecked_end.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/tray_background_end_private.xml b/app/src/main/res/drawable/tray_background_end_private.xml index c8207f6bf..32d13aecf 100644 --- a/app/src/main/res/drawable/tray_background_end_private.xml +++ b/app/src/main/res/drawable/tray_background_end_private.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/tray_background_middle_private.xml b/app/src/main/res/drawable/tray_background_middle_private.xml index 938f560ae..904f63b5e 100644 --- a/app/src/main/res/drawable/tray_background_middle_private.xml +++ b/app/src/main/res/drawable/tray_background_middle_private.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/tray_background_start_private.xml b/app/src/main/res/drawable/tray_background_start_private.xml index c3c15887f..a81fe0d13 100644 --- a/app/src/main/res/drawable/tray_background_start_private.xml +++ b/app/src/main/res/drawable/tray_background_start_private.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/tray_background_unchecked_middle.xml b/app/src/main/res/drawable/tray_background_unchecked_middle.xml index ea11cb5c1..cc7c0af0b 100644 --- a/app/src/main/res/drawable/tray_background_unchecked_middle.xml +++ b/app/src/main/res/drawable/tray_background_unchecked_middle.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/tray_background_unchecked_start.xml b/app/src/main/res/drawable/tray_background_unchecked_start.xml index e8627011a..c431a7101 100644 --- a/app/src/main/res/drawable/tray_background_unchecked_start.xml +++ b/app/src/main/res/drawable/tray_background_unchecked_start.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/tray_background_unckecked_end.xml b/app/src/main/res/drawable/tray_background_unckecked_end.xml index 4da301bb9..36d504b2c 100644 --- a/app/src/main/res/drawable/tray_background_unckecked_end.xml +++ b/app/src/main/res/drawable/tray_background_unckecked_end.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/url_background.xml b/app/src/main/res/drawable/url_background.xml index bddd63a98..14df2cb36 100644 --- a/app/src/main/res/drawable/url_background.xml +++ b/app/src/main/res/drawable/url_background.xml @@ -1,22 +1,24 @@ - + - + - + - + - + @@ -24,16 +26,16 @@ - - + + - + - + @@ -41,8 +43,8 @@ - - + + diff --git a/app/src/main/res/drawable/url_background_private.xml b/app/src/main/res/drawable/url_background_private.xml index 30633d196..d589f1620 100644 --- a/app/src/main/res/drawable/url_background_private.xml +++ b/app/src/main/res/drawable/url_background_private.xml @@ -1,27 +1,29 @@ - + - + - + - + - + diff --git a/app/src/main/res/drawable/url_bar_hint_fading_edge.xml b/app/src/main/res/drawable/url_bar_hint_fading_edge.xml index e9f78e4b9..e8e90cce3 100644 --- a/app/src/main/res/drawable/url_bar_hint_fading_edge.xml +++ b/app/src/main/res/drawable/url_bar_hint_fading_edge.xml @@ -1,6 +1,17 @@ - - + + + + + + + - + + + + + + - + diff --git a/app/src/main/res/drawable/url_button_end.xml b/app/src/main/res/drawable/url_button_end.xml index 4360f6f1c..75d10af5c 100644 --- a/app/src/main/res/drawable/url_button_end.xml +++ b/app/src/main/res/drawable/url_button_end.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/url_button_end_private.xml b/app/src/main/res/drawable/url_button_end_private.xml index de9ec0b5e..90c917a7d 100644 --- a/app/src/main/res/drawable/url_button_end_private.xml +++ b/app/src/main/res/drawable/url_button_end_private.xml @@ -1,5 +1,7 @@ - + diff --git a/app/src/main/res/drawable/url_button_icon_color.xml b/app/src/main/res/drawable/url_button_icon_color.xml index af1298c81..c5c901e82 100644 --- a/app/src/main/res/drawable/url_button_icon_color.xml +++ b/app/src/main/res/drawable/url_button_icon_color.xml @@ -1,4 +1,6 @@ - + - + diff --git a/app/src/main/res/layout/keyboard.xml b/app/src/main/res/layout/keyboard.xml index e31ab1b53..325669625 100644 --- a/app/src/main/res/layout/keyboard.xml +++ b/app/src/main/res/layout/keyboard.xml @@ -25,7 +25,7 @@ android:padding="10dp" android:src="@drawable/ic_icon_exit" android:scaleType="fitCenter" - android:background="@drawable/keyboard_key_background"/> + android:background="@drawable/keyboard_button_background"/> + android:background="@drawable/keyboard_button_background"/> + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 7ed4f3f89..1b2e67c86 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -15,6 +15,7 @@ #ee513f #f7ce4d #45236d + #8045236d #232426 #80232426 #3d3d3d @@ -29,6 +30,7 @@ #cc332f #932525 #25003e + #8025003e #ff921e #5d5d5d #805d5d5d diff --git a/app/src/main/res/values/integer.xml b/app/src/main/res/values/integer.xml index a6b3daec9..5ac333283 100644 --- a/app/src/main/res/values/integer.xml +++ b/app/src/main/res/values/integer.xml @@ -1,2 +1,5 @@ - \ No newline at end of file + + + 100 + \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 1122ff535..3d8543a7e 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -118,10 +118,9 @@ vertical 136dp 136dp - @drawable/ic_settings_honeycomb_fill + @drawable/settings_honeycomb_background fitCenter center - @drawable/settings_button_color @drawable/ic_settings_privacypolicy