summaryrefslogtreecommitdiffstats
path: root/mobile/android/base/resources
diff options
context:
space:
mode:
Diffstat (limited to 'mobile/android/base/resources')
-rw-r--r--mobile/android/base/resources/anim/grow_fade_in.xml21
-rw-r--r--mobile/android/base/resources/anim/overlay_check_entry.xml10
-rw-r--r--mobile/android/base/resources/anim/overlay_check_exit.xml11
-rw-r--r--mobile/android/base/resources/anim/overlay_pop.xml25
-rw-r--r--mobile/android/base/resources/anim/overlay_slide_down.xml10
-rw-r--r--mobile/android/base/resources/anim/overlay_slide_up.xml9
-rw-r--r--mobile/android/base/resources/anim/popup_hide.xml16
-rw-r--r--mobile/android/base/resources/anim/popup_show.xml16
-rw-r--r--mobile/android/base/resources/color/action_bar_menu_item_colors.xml26
-rw-r--r--mobile/android/base/resources/color/action_bar_secondary_menu_item_colors.xml15
-rw-r--r--mobile/android/base/resources/color/facet_button_text_color.xml9
-rw-r--r--mobile/android/base/resources/color/pressed_about_page_header_grey.xml12
-rw-r--r--mobile/android/base/resources/color/primary_text.xml7
-rw-r--r--mobile/android/base/resources/color/primary_text_selector.xml7
-rw-r--r--mobile/android/base/resources/color/recyclerview_selector.xml12
-rw-r--r--mobile/android/base/resources/color/secondary_text.xml7
-rw-r--r--mobile/android/base/resources/color/select_item_multichoice.xml7
-rw-r--r--mobile/android/base/resources/color/state_pressed_toolbar_grey_pressed.xml12
-rw-r--r--mobile/android/base/resources/color/tab_item_title.xml12
-rw-r--r--mobile/android/base/resources/color/tab_new_tab_strip_colors.xml14
-rw-r--r--mobile/android/base/resources/color/tab_strip_item_bg.xml48
-rw-r--r--mobile/android/base/resources/color/tab_strip_item_title.xml18
-rw-r--r--mobile/android/base/resources/color/tab_text_color.xml7
-rw-r--r--mobile/android/base/resources/color/tabs_counter_text_color.xml14
-rw-r--r--mobile/android/base/resources/color/tertiary_text.xml7
-rw-r--r--mobile/android/base/resources/color/toolbar_display_layout_bg.xml11
-rw-r--r--mobile/android/base/resources/color/top_sites_grid_item_title.xml14
-rw-r--r--mobile/android/base/resources/color/url_bar_title.xml21
-rw-r--r--mobile/android/base/resources/color/url_bar_title_hint.xml15
-rw-r--r--mobile/android/base/resources/drawable-hdpi-v11/alert_camera.pngbin0 -> 181 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi-v11/alert_download.pngbin0 -> 273 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi-v11/alert_guest.pngbin0 -> 761 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi-v11/alert_mic.pngbin0 -> 327 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi-v11/alert_mic_camera.pngbin0 -> 242 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi-v11/ic_menu_back.pngbin0 -> 292 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi-v11/ic_menu_bookmark_add.pngbin0 -> 1405 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi-v11/ic_menu_forward.pngbin0 -> 291 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi-v11/ic_menu_reload.pngbin0 -> 663 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi-v11/ic_status_logo.pngbin0 -> 528 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi-v11/star_blue.pngbin0 -> 1050 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/ab_add_search_engine.pngbin0 -> 593 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/ab_copy.pngbin0 -> 148 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/ab_cut.pngbin0 -> 508 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/ab_done.pngbin0 -> 379 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/ab_mic.pngbin0 -> 363 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/ab_paste.pngbin0 -> 253 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/ab_qrcode.pngbin0 -> 169 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/ab_search.pngbin0 -> 799 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/ab_select_all.pngbin0 -> 143 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/alert_camera.pngbin0 -> 206 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/alert_download.pngbin0 -> 218 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/alert_download_animation_1.pngbin0 -> 266 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/alert_download_animation_2.pngbin0 -> 267 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/alert_download_animation_3.pngbin0 -> 268 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/alert_download_animation_4.pngbin0 -> 267 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/alert_download_animation_5.pngbin0 -> 270 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/alert_download_animation_6.pngbin0 -> 270 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/alert_guest.pngbin0 -> 878 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/alert_mic.pngbin0 -> 278 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/alert_mic_camera.pngbin0 -> 247 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/arrow_up.pngbin0 -> 276 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/blank.pngbin0 -> 82 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/casting.pngbin0 -> 244 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/casting_active.pngbin0 -> 302 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/close.pngbin0 -> 296 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/close_edit_mode_dark.pngbin0 -> 234 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/close_edit_mode_light.pngbin0 -> 235 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/color_picker_row_bg.9.pngbin0 -> 121 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/device_desktop.pngbin0 -> 217 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/device_mobile.pngbin0 -> 165 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/dropshadow.9.pngbin0 -> 367 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/favicon_globe.pngbin0 -> 1227 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/find_close.pngbin0 -> 234 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/find_next.pngbin0 -> 176 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/find_prev.pngbin0 -> 167 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/firefox_settings_alert.pngbin0 -> 412 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/flat_icon.pngbin0 -> 620 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/folder_closed.pngbin0 -> 339 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/globe_light.pngbin0 -> 2014 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/grid_icon_bg_activated.9.pngbin0 -> 105 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/grid_icon_bg_focused.9.pngbin0 -> 139 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/handle_end.pngbin0 -> 570 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/handle_middle.pngbin0 -> 692 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/handle_start.pngbin0 -> 581 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/helper_readerview_bookmark.webpbin0 -> 1710 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/home_bg.pngbin0 -> 1645 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/home_group_collapsed.pngbin0 -> 228 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/home_star.pngbin0 -> 3167 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/home_tab_menu_strip.9.pngbin0 -> 88 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/homepage_banner_firstrun.pngbin0 -> 530 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/ic_action_settings.pngbin0 -> 446 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/ic_media_pause.pngbin0 -> 107 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/ic_media_play.pngbin0 -> 230 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/ic_menu_share.pngbin0 -> 494 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/ic_status_logo.pngbin0 -> 537 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/ic_url_bar_tab.pngbin0 -> 195 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/ic_widget_new_tab.pngbin0 -> 173 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/ic_widget_search.pngbin0 -> 396 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/icon_bookmarks_empty.pngbin0 -> 926 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/icon_home_empty_firefox.pngbin0 -> 2579 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/icon_key.pngbin0 -> 922 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/icon_most_recent_empty.pngbin0 -> 1508 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/icon_openinapp.pngbin0 -> 307 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/icon_pageaction.pngbin0 -> 152 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/icon_remote_tabs_empty.pngbin0 -> 742 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/icon_search_empty_firefox.pngbin0 -> 1741 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/icon_shareplane.pngbin0 -> 1449 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/img_check.pngbin0 -> 669 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/location.pngbin0 -> 851 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/lock_disabled.pngbin0 -> 790 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/lock_inactive.pngbin0 -> 535 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/lock_secure.pngbin0 -> 535 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/media_bar_pause.pngbin0 -> 166 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/media_bar_play.pngbin0 -> 336 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/media_bar_stop.pngbin0 -> 401 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/menu.pngbin0 -> 138 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/menu_item_check.pngbin0 -> 502 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/menu_item_more.pngbin0 -> 96 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/menu_item_uncheck.pngbin0 -> 254 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/network_error.pngbin0 -> 1160 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/notification_media.webpbin0 -> 484 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/open_in_browser.pngbin0 -> 194 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/overlay_bookmark_icon.pngbin0 -> 1181 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/overlay_bookmarked_already_icon.pngbin0 -> 578 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/overlay_check.pngbin0 -> 1194 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/pause.pngbin0 -> 231 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/phone.pngbin0 -> 528 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/pin.pngbin0 -> 201 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/play.pngbin0 -> 300 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/private_masq.pngbin0 -> 1660 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/progress.9.pngbin0 -> 343 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/reader.pngbin0 -> 315 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/reader_active.pngbin0 -> 316 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/reading_list_folder.pngbin0 -> 424 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/search_clear.pngbin0 -> 238 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/search_history.pngbin0 -> 419 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/search_icon_active.pngbin0 -> 450 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/search_icon_inactive.pngbin0 -> 456 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/search_launcher.pngbin0 -> 3473 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/search_plus.pngbin0 -> 213 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/settings_notifications.pngbin0 -> 385 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/shareplane.pngbin0 -> 947 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/shield_disabled.pngbin0 -> 1683 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/shield_enabled.pngbin0 -> 1508 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/status_icon_readercache.pngbin0 -> 445 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/suggestedsites_amazon.pngbin0 -> 4253 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/suggestedsites_facebook.pngbin0 -> 603 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/suggestedsites_twitter.pngbin0 -> 1304 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/suggestedsites_wikipedia.pngbin0 -> 2037 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/suggestedsites_youtube.pngbin0 -> 2773 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/switch_button_icon.pngbin0 -> 186 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/tab_audio_playing.pngbin0 -> 290 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/tab_close.pngbin0 -> 178 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/tab_close_active.pngbin0 -> 186 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/tab_indicator_background.9.pngbin0 -> 107 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/tab_indicator_divider.9.pngbin0 -> 75 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/tab_indicator_selected.9.pngbin0 -> 88 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/tab_indicator_selected_focused.9.pngbin0 -> 93 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/tab_new.pngbin0 -> 219 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/tab_preview_masq.pngbin0 -> 1131 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/tabs_count.pngbin0 -> 145 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/tabs_count_foreground.pngbin0 -> 146 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/tabs_normal.pngbin0 -> 216 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/tabs_panel_nav_back.pngbin0 -> 453 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/tabs_private.pngbin0 -> 429 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/tip_addsearch.pngbin0 -> 2606 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/top_site_add.pngbin0 -> 113 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/tracking_protection_toolbar_illustration.pngbin0 -> 2474 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/undo_button_icon.pngbin0 -> 436 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/url_bar_entry_default.9.pngbin0 -> 217 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/url_bar_entry_default_pb.9.pngbin0 -> 252 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/url_bar_entry_pressed.9.pngbin0 -> 252 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/url_bar_entry_pressed_pb.9.pngbin0 -> 259 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/urlbar_stop.pngbin0 -> 276 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/validation_arrow.pngbin0 -> 221 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/validation_arrow_inverted.pngbin0 -> 240 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/validation_bg.9.pngbin0 -> 409 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/warning_major.pngbin0 -> 283 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/warning_minor.pngbin0 -> 283 bytes
-rw-r--r--mobile/android/base/resources/drawable-hdpi/widget_bg.9.pngbin0 -> 354 bytes
-rw-r--r--mobile/android/base/resources/drawable-large-hdpi-v11/ic_menu_back.pngbin0 -> 471 bytes
-rw-r--r--mobile/android/base/resources/drawable-large-hdpi-v11/ic_menu_forward.pngbin0 -> 360 bytes
-rw-r--r--mobile/android/base/resources/drawable-large-hdpi-v11/ic_menu_reload.pngbin0 -> 779 bytes
-rw-r--r--mobile/android/base/resources/drawable-large-hdpi-v11/tabs_count.pngbin0 -> 171 bytes
-rw-r--r--mobile/android/base/resources/drawable-large-hdpi-v11/tabs_count_foreground.pngbin0 -> 144 bytes
-rw-r--r--mobile/android/base/resources/drawable-large-hdpi-v11/toolbar_favicon_default.pngbin0 -> 134 bytes
-rw-r--r--mobile/android/base/resources/drawable-large-hdpi-v11/url_bar_entry_default.9.pngbin0 -> 261 bytes
-rw-r--r--mobile/android/base/resources/drawable-large-hdpi-v11/url_bar_entry_default_pb.9.pngbin0 -> 281 bytes
-rw-r--r--mobile/android/base/resources/drawable-large-hdpi-v11/url_bar_entry_pressed.9.pngbin0 -> 281 bytes
-rw-r--r--mobile/android/base/resources/drawable-large-hdpi-v11/url_bar_entry_pressed_pb.9.pngbin0 -> 281 bytes
-rw-r--r--mobile/android/base/resources/drawable-large-v11/browser_toolbar_action_bar_button.xml77
-rw-r--r--mobile/android/base/resources/drawable-large-v11/url_bar_nav_button.xml36
-rw-r--r--mobile/android/base/resources/drawable-large-xhdpi-v11/ic_menu_back.pngbin0 -> 598 bytes
-rw-r--r--mobile/android/base/resources/drawable-large-xhdpi-v11/ic_menu_forward.pngbin0 -> 393 bytes
-rw-r--r--mobile/android/base/resources/drawable-large-xhdpi-v11/ic_menu_reload.pngbin0 -> 998 bytes
-rw-r--r--mobile/android/base/resources/drawable-large-xhdpi-v11/tabs_count.pngbin0 -> 196 bytes
-rw-r--r--mobile/android/base/resources/drawable-large-xhdpi-v11/tabs_count_foreground.pngbin0 -> 163 bytes
-rw-r--r--mobile/android/base/resources/drawable-large-xhdpi-v11/toolbar_favicon_default.pngbin0 -> 153 bytes
-rw-r--r--mobile/android/base/resources/drawable-large-xhdpi-v11/url_bar_entry_default.9.pngbin0 -> 351 bytes
-rw-r--r--mobile/android/base/resources/drawable-large-xhdpi-v11/url_bar_entry_default_pb.9.pngbin0 -> 367 bytes
-rw-r--r--mobile/android/base/resources/drawable-large-xhdpi-v11/url_bar_entry_pressed.9.pngbin0 -> 373 bytes
-rw-r--r--mobile/android/base/resources/drawable-large-xhdpi-v11/url_bar_entry_pressed_pb.9.pngbin0 -> 367 bytes
-rw-r--r--mobile/android/base/resources/drawable-large-xxhdpi-v11/ic_menu_back.pngbin0 -> 845 bytes
-rw-r--r--mobile/android/base/resources/drawable-large-xxhdpi-v11/ic_menu_forward.pngbin0 -> 544 bytes
-rw-r--r--mobile/android/base/resources/drawable-large-xxhdpi-v11/ic_menu_reload.pngbin0 -> 1324 bytes
-rw-r--r--mobile/android/base/resources/drawable-large-xxhdpi-v11/tabs_count.pngbin0 -> 232 bytes
-rw-r--r--mobile/android/base/resources/drawable-large-xxhdpi-v11/tabs_count_foreground.pngbin0 -> 196 bytes
-rw-r--r--mobile/android/base/resources/drawable-large-xxhdpi-v11/toolbar_favicon_default.pngbin0 -> 193 bytes
-rw-r--r--mobile/android/base/resources/drawable-large-xxhdpi-v11/url_bar_entry_default.9.pngbin0 -> 497 bytes
-rw-r--r--mobile/android/base/resources/drawable-large-xxhdpi-v11/url_bar_entry_default_pb.9.pngbin0 -> 499 bytes
-rw-r--r--mobile/android/base/resources/drawable-large-xxhdpi-v11/url_bar_entry_pressed.9.pngbin0 -> 497 bytes
-rw-r--r--mobile/android/base/resources/drawable-large-xxhdpi-v11/url_bar_entry_pressed_pb.9.pngbin0 -> 500 bytes
-rw-r--r--mobile/android/base/resources/drawable-nodpi/cloud.pngbin0 -> 2188 bytes
-rw-r--r--mobile/android/base/resources/drawable-nodpi/firstrun_account.pngbin0 -> 8733 bytes
-rw-r--r--mobile/android/base/resources/drawable-nodpi/firstrun_bookmarks.pngbin0 -> 19817 bytes
-rw-r--r--mobile/android/base/resources/drawable-nodpi/firstrun_data_off.pngbin0 -> 18905 bytes
-rw-r--r--mobile/android/base/resources/drawable-nodpi/firstrun_data_on.pngbin0 -> 16918 bytes
-rw-r--r--mobile/android/base/resources/drawable-nodpi/firstrun_readerview.pngbin0 -> 9895 bytes
-rw-r--r--mobile/android/base/resources/drawable-nodpi/firstrun_signin.pngbin0 -> 39900 bytes
-rw-r--r--mobile/android/base/resources/drawable-nodpi/firstrun_sync.pngbin0 -> 16191 bytes
-rw-r--r--mobile/android/base/resources/drawable-nodpi/firstrun_tabqueue_off.pngbin0 -> 8779 bytes
-rw-r--r--mobile/android/base/resources/drawable-nodpi/firstrun_tabqueue_on.pngbin0 -> 9444 bytes
-rw-r--r--mobile/android/base/resources/drawable-nodpi/firstrun_urlbar.pngbin0 -> 12926 bytes
-rwxr-xr-xmobile/android/base/resources/drawable-nodpi/icon_recent.pngbin0 -> 774 bytes
-rw-r--r--mobile/android/base/resources/drawable-v12/toast_button_background.xml27
-rw-r--r--mobile/android/base/resources/drawable-v21/logo.xml15
-rw-r--r--mobile/android/base/resources/drawable-xhdpi-v11/alert_camera.pngbin0 -> 204 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi-v11/alert_download.pngbin0 -> 273 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi-v11/alert_guest.pngbin0 -> 1016 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi-v11/alert_mic.pngbin0 -> 345 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi-v11/alert_mic_camera.pngbin0 -> 268 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_back.pngbin0 -> 361 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_bookmark_add.pngbin0 -> 1910 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_forward.pngbin0 -> 368 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_reload.pngbin0 -> 777 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi-v11/ic_status_logo.pngbin0 -> 728 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi-v11/star_blue.pngbin0 -> 1418 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/ab_add_search_engine.pngbin0 -> 672 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/ab_copy.pngbin0 -> 174 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/ab_cut.pngbin0 -> 602 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/ab_done.pngbin0 -> 501 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/ab_mic.pngbin0 -> 412 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/ab_paste.pngbin0 -> 300 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/ab_qrcode.pngbin0 -> 177 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/ab_search.pngbin0 -> 989 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/ab_select_all.pngbin0 -> 138 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/alert_camera.pngbin0 -> 269 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/alert_download.pngbin0 -> 294 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/alert_download_animation_1.pngbin0 -> 266 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/alert_download_animation_2.pngbin0 -> 267 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/alert_download_animation_3.pngbin0 -> 268 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/alert_download_animation_4.pngbin0 -> 267 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/alert_download_animation_5.pngbin0 -> 270 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/alert_download_animation_6.pngbin0 -> 270 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/alert_guest.pngbin0 -> 289 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/alert_mic.pngbin0 -> 404 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/alert_mic_camera.pngbin0 -> 337 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/arrow_up.pngbin0 -> 247 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/blank.pngbin0 -> 81 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/casting.pngbin0 -> 370 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/casting_active.pngbin0 -> 442 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/close.pngbin0 -> 373 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/close_edit_mode_dark.pngbin0 -> 283 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/close_edit_mode_light.pngbin0 -> 288 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/color_picker_row_bg.9.pngbin0 -> 123 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/device_desktop.pngbin0 -> 246 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/device_mobile.pngbin0 -> 215 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/dropshadow.9.pngbin0 -> 463 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/favicon_globe.pngbin0 -> 1617 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/find_close.pngbin0 -> 293 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/find_next.pngbin0 -> 216 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/find_prev.pngbin0 -> 212 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/firefox_settings_alert.pngbin0 -> 622 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/flat_icon.pngbin0 -> 810 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/folder_closed.pngbin0 -> 445 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/globe_light.pngbin0 -> 2597 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/grid_icon_bg_activated.9.pngbin0 -> 116 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/grid_icon_bg_focused.9.pngbin0 -> 165 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/handle_end.pngbin0 -> 707 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/handle_middle.pngbin0 -> 890 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/handle_start.pngbin0 -> 725 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/helper_readerview_bookmark.webpbin0 -> 2042 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/home_group_collapsed.pngbin0 -> 204 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/home_tab_menu_strip.9.pngbin0 -> 96 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/homepage_banner_firstrun.pngbin0 -> 707 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/ic_action_settings.pngbin0 -> 629 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/ic_media_pause.pngbin0 -> 113 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/ic_media_play.pngbin0 -> 282 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/ic_menu_share.pngbin0 -> 713 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/ic_status_logo.pngbin0 -> 691 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/ic_url_bar_tab.pngbin0 -> 243 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/ic_widget_new_tab.pngbin0 -> 184 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/ic_widget_search.pngbin0 -> 516 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/icon_bookmarks_empty.pngbin0 -> 1131 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/icon_home_empty_firefox.pngbin0 -> 3271 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/icon_key.pngbin0 -> 1212 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/icon_most_recent_empty.pngbin0 -> 1927 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/icon_openinapp.pngbin0 -> 420 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/icon_pageaction.pngbin0 -> 244 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/icon_remote_tabs_empty.pngbin0 -> 841 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/icon_search_empty_firefox.pngbin0 -> 2323 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/icon_shareplane.pngbin0 -> 1823 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/img_check.pngbin0 -> 907 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/location.pngbin0 -> 1019 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/lock_disabled.pngbin0 -> 821 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/lock_inactive.pngbin0 -> 465 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/lock_secure.pngbin0 -> 465 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/media_bar_pause.pngbin0 -> 161 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/media_bar_play.pngbin0 -> 390 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/media_bar_stop.pngbin0 -> 509 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/menu.pngbin0 -> 162 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/menu_item_check.pngbin0 -> 555 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/menu_item_more.pngbin0 -> 111 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/menu_item_uncheck.pngbin0 -> 315 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/network_error.pngbin0 -> 1677 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/notification_media.webpbin0 -> 616 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/open_in_browser.pngbin0 -> 212 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/overlay_bookmark_icon.pngbin0 -> 1513 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/overlay_bookmarked_already_icon.pngbin0 -> 755 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/overlay_check.pngbin0 -> 1586 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/pause.pngbin0 -> 220 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/phone.pngbin0 -> 689 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/pin.pngbin0 -> 227 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/play.pngbin0 -> 244 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/private_masq.pngbin0 -> 2007 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/progress.9.pngbin0 -> 425 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/push_notification.pngbin0 -> 446 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/reader.pngbin0 -> 355 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/reader_active.pngbin0 -> 360 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/reading_list_folder.pngbin0 -> 542 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/search_clear.pngbin0 -> 292 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/search_history.pngbin0 -> 561 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/search_icon_active.pngbin0 -> 575 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/search_icon_inactive.pngbin0 -> 593 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/search_launcher.pngbin0 -> 4931 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/search_plus.pngbin0 -> 231 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/settings_notifications.pngbin0 -> 493 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/shareplane.pngbin0 -> 1215 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/shield_disabled.pngbin0 -> 2222 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/shield_enabled.pngbin0 -> 2097 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/status_icon_readercache.pngbin0 -> 531 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/suggestedsites_amazon.pngbin0 -> 5924 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/suggestedsites_facebook.pngbin0 -> 775 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/suggestedsites_restricted_fxsupport.pngbin0 -> 2269 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/suggestedsites_restricted_mozilla.pngbin0 -> 2324 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/suggestedsites_twitter.pngbin0 -> 1769 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/suggestedsites_webmaker.pngbin0 -> 4712 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/suggestedsites_wikipedia.pngbin0 -> 2874 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/suggestedsites_youtube.pngbin0 -> 3686 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/switch_button_icon.pngbin0 -> 222 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/tab_audio_playing.pngbin0 -> 341 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/tab_close.pngbin0 -> 190 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/tab_close_active.pngbin0 -> 204 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/tab_indicator_background.9.pngbin0 -> 110 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/tab_indicator_divider.9.pngbin0 -> 75 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/tab_indicator_selected.9.pngbin0 -> 97 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/tab_indicator_selected_focused.9.pngbin0 -> 103 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/tab_new.pngbin0 -> 293 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/tab_preview_masq.pngbin0 -> 1460 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/tabs_count.pngbin0 -> 165 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/tabs_count_foreground.pngbin0 -> 172 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/tabs_normal.pngbin0 -> 248 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/tabs_panel_nav_back.pngbin0 -> 589 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/tabs_private.pngbin0 -> 554 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/tip_addsearch.pngbin0 -> 3120 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/top_site_add.pngbin0 -> 118 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/tracking_protection_toolbar_illustration.pngbin0 -> 3450 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/undo_button_icon.pngbin0 -> 552 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/url_bar_entry_default.9.pngbin0 -> 285 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/url_bar_entry_default_pb.9.pngbin0 -> 318 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/url_bar_entry_pressed.9.pngbin0 -> 309 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/url_bar_entry_pressed_pb.9.pngbin0 -> 310 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/urlbar_stop.pngbin0 -> 341 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/validation_arrow.pngbin0 -> 262 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/validation_arrow_inverted.pngbin0 -> 272 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/validation_bg.9.pngbin0 -> 487 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/warning_major.pngbin0 -> 507 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/warning_minor.pngbin0 -> 516 bytes
-rw-r--r--mobile/android/base/resources/drawable-xhdpi/widget_bg.9.pngbin0 -> 1224 bytes
-rw-r--r--mobile/android/base/resources/drawable-xlarge-hdpi-v11/ic_menu_bookmark_add.pngbin0 -> 765 bytes
-rw-r--r--mobile/android/base/resources/drawable-xlarge-hdpi-v11/star_blue.pngbin0 -> 685 bytes
-rw-r--r--mobile/android/base/resources/drawable-xlarge-xhdpi-v11/ic_menu_bookmark_add.pngbin0 -> 958 bytes
-rw-r--r--mobile/android/base/resources/drawable-xlarge-xhdpi-v11/star_blue.pngbin0 -> 794 bytes
-rw-r--r--mobile/android/base/resources/drawable-xlarge-xxhdpi-v11/ic_menu_bookmark_add.pngbin0 -> 1419 bytes
-rw-r--r--mobile/android/base/resources/drawable-xlarge-xxhdpi-v11/star_blue.pngbin0 -> 1193 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi-v11/ic_status_logo.pngbin0 -> 1343 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/ab_mic.pngbin0 -> 587 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/ab_qrcode.pngbin0 -> 230 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/arrow_up.pngbin0 -> 372 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/close_edit_mode_dark.pngbin0 -> 377 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/close_edit_mode_light.pngbin0 -> 377 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/device_desktop.pngbin0 -> 298 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/device_mobile.pngbin0 -> 238 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/dropshadow.9.pngbin0 -> 672 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/exit_fullscreen.pngbin0 -> 842 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/flat_icon.pngbin0 -> 1240 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/folder_closed.pngbin0 -> 635 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/fullscreen.pngbin0 -> 842 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/globe_light.pngbin0 -> 3642 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/helper_readerview_bookmark.webpbin0 -> 3048 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/home_group_collapsed.pngbin0 -> 293 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/homepage_banner_firstrun.pngbin0 -> 985 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/ic_action_settings.pngbin0 -> 818 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/ic_media_pause.pngbin0 -> 135 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/ic_media_play.pngbin0 -> 374 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/ic_menu_share.pngbin0 -> 832 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/ic_widget_new_tab.pngbin0 -> 238 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/ic_widget_search.pngbin0 -> 717 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/icon_key.pngbin0 -> 1789 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/icon_search_empty_firefox.pngbin0 -> 3465 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/icon_shareplane.pngbin0 -> 2610 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/img_check.pngbin0 -> 1276 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/location.pngbin0 -> 1533 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/lock_disabled.pngbin0 -> 1215 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/lock_inactive.pngbin0 -> 777 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/lock_secure.pngbin0 -> 777 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/menu.pngbin0 -> 217 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/menu_item_check.pngbin0 -> 688 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/menu_item_uncheck.pngbin0 -> 391 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/network_error.pngbin0 -> 1944 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/notification_media.webpbin0 -> 974 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/overlay_bookmark_icon.pngbin0 -> 2143 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/overlay_bookmarked_already_icon.pngbin0 -> 1113 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/overlay_check.pngbin0 -> 2144 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/private_masq.pngbin0 -> 2872 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/push_notification.pngbin0 -> 611 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/reading_list_folder.pngbin0 -> 726 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/search_clear.pngbin0 -> 370 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/search_history.pngbin0 -> 781 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/search_icon_active.pngbin0 -> 856 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/search_icon_inactive.pngbin0 -> 858 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/search_launcher.pngbin0 -> 8383 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/search_plus.pngbin0 -> 273 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/shareplane.pngbin0 -> 1774 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/shield_disabled.pngbin0 -> 2926 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/shield_enabled.pngbin0 -> 2789 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/status_icon_readercache.pngbin0 -> 712 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/suggestedsites_amazon.pngbin0 -> 9225 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/suggestedsites_facebook.pngbin0 -> 1152 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/suggestedsites_twitter.pngbin0 -> 2932 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/suggestedsites_wikipedia.pngbin0 -> 4456 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/suggestedsites_youtube.pngbin0 -> 5537 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/tab_close.pngbin0 -> 278 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/tab_close_active.pngbin0 -> 292 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/tab_new.pngbin0 -> 348 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/tab_preview_masq.pngbin0 -> 2075 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/tabs_panel_nav_back.pngbin0 -> 816 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/tracking_protection_toolbar_illustration.pngbin0 -> 5660 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/url_bar_entry_default.9.pngbin0 -> 406 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/url_bar_entry_default_pb.9.pngbin0 -> 418 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/url_bar_entry_pressed.9.pngbin0 -> 425 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/url_bar_entry_pressed_pb.9.pngbin0 -> 423 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/urlbar_stop.pngbin0 -> 318 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/warning_major.pngbin0 -> 408 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxhdpi/warning_minor.pngbin0 -> 407 bytes
-rw-r--r--mobile/android/base/resources/drawable-xxxhdpi/search_launcher.pngbin0 -> 12725 bytes
-rw-r--r--mobile/android/base/resources/drawable/action_bar_button.xml24
-rw-r--r--mobile/android/base/resources/drawable/action_bar_button_inverse.xml23
-rw-r--r--mobile/android/base/resources/drawable/action_bar_button_negative.xml20
-rw-r--r--mobile/android/base/resources/drawable/action_bar_button_positive.xml20
-rw-r--r--mobile/android/base/resources/drawable/alert_download_animation.xml16
-rw-r--r--mobile/android/base/resources/drawable/arrow_down.xml10
-rw-r--r--mobile/android/base/resources/drawable/as_bin.xml9
-rw-r--r--mobile/android/base/resources/drawable/as_bookmark.xml9
-rw-r--r--mobile/android/base/resources/drawable/as_contextmenu_divider.xml9
-rw-r--r--mobile/android/base/resources/drawable/as_copy.xml9
-rw-r--r--mobile/android/base/resources/drawable/as_dimiss.xml9
-rw-r--r--mobile/android/base/resources/drawable/as_home.xml9
-rw-r--r--mobile/android/base/resources/drawable/as_private.xml9
-rw-r--r--mobile/android/base/resources/drawable/as_share.xml9
-rw-r--r--mobile/android/base/resources/drawable/as_tab.xml9
-rw-r--r--mobile/android/base/resources/drawable/autocomplete_list_bg.xml14
-rw-r--r--mobile/android/base/resources/drawable/bookmark_folder_arrow_up.xml14
-rw-r--r--mobile/android/base/resources/drawable/button_background_action_blue_round.xml11
-rw-r--r--mobile/android/base/resources/drawable/button_background_action_orange_round.xml11
-rw-r--r--mobile/android/base/resources/drawable/button_enabled_action_blue_round.xml11
-rw-r--r--mobile/android/base/resources/drawable/button_enabled_action_orange_round.xml11
-rw-r--r--mobile/android/base/resources/drawable/button_pressed_action_blue_round.xml11
-rw-r--r--mobile/android/base/resources/drawable/button_pressed_action_orange_round.xml11
-rw-r--r--mobile/android/base/resources/drawable/close_edit_mode_selector.xml17
-rw-r--r--mobile/android/base/resources/drawable/color_picker_checkmark.xml12
-rw-r--r--mobile/android/base/resources/drawable/divider_vertical.xml12
-rw-r--r--mobile/android/base/resources/drawable/edit_text_default.xml24
-rw-r--r--mobile/android/base/resources/drawable/edit_text_focused.xml25
-rw-r--r--mobile/android/base/resources/drawable/facet_button_background.xml15
-rw-r--r--mobile/android/base/resources/drawable/facet_button_background_default.xml8
-rw-r--r--mobile/android/base/resources/drawable/facet_button_background_pressed.xml8
-rw-r--r--mobile/android/base/resources/drawable/home_banner.xml38
-rw-r--r--mobile/android/base/resources/drawable/home_history_clear_button_bg.xml23
-rw-r--r--mobile/android/base/resources/drawable/home_pager_empty_state.xml16
-rw-r--r--mobile/android/base/resources/drawable/ic_as_bookmarked.xml9
-rw-r--r--mobile/android/base/resources/drawable/ic_as_visited.xml9
-rw-r--r--mobile/android/base/resources/drawable/icon_grid_item_bg.xml28
-rw-r--r--mobile/android/base/resources/drawable/logo.xml9
-rw-r--r--mobile/android/base/resources/drawable/menu_item_action_bar_bg.xml24
-rw-r--r--mobile/android/base/resources/drawable/menu_item_state.xml24
-rw-r--r--mobile/android/base/resources/drawable/overlay_share_bookmark_button.xml12
-rw-r--r--mobile/android/base/resources/drawable/overlay_share_button_background.xml15
-rw-r--r--mobile/android/base/resources/drawable/overlay_share_button_background_first.xml29
-rw-r--r--mobile/android/base/resources/drawable/panel_auth_button.xml38
-rw-r--r--mobile/android/base/resources/drawable/progressbar.xml9
-rw-r--r--mobile/android/base/resources/drawable/push_notification.pngbin0 -> 391 bytes
-rw-r--r--mobile/android/base/resources/drawable/remote_tabs_setup_button_background.xml20
-rw-r--r--mobile/android/base/resources/drawable/search_row_background.xml10
-rw-r--r--mobile/android/base/resources/drawable/search_suggestion_button.xml19
-rw-r--r--mobile/android/base/resources/drawable/search_suggestion_prompt_no.xml20
-rw-r--r--mobile/android/base/resources/drawable/search_suggestion_prompt_yes.xml20
-rw-r--r--mobile/android/base/resources/drawable/shaped_button.xml19
-rw-r--r--mobile/android/base/resources/drawable/site_security_level.xml18
-rw-r--r--mobile/android/base/resources/drawable/site_security_unknown.xml12
-rw-r--r--mobile/android/base/resources/drawable/tab_history_bg.xml27
-rw-r--r--mobile/android/base/resources/drawable/tab_history_icon_state.xml24
-rw-r--r--mobile/android/base/resources/drawable/tab_item_close_button.xml18
-rw-r--r--mobile/android/base/resources/drawable/tab_panel_tab_background.xml38
-rw-r--r--mobile/android/base/resources/drawable/tab_queue_dismiss_button_foreground.xml14
-rw-r--r--mobile/android/base/resources/drawable/tab_row.xml16
-rw-r--r--mobile/android/base/resources/drawable/tab_strip_button.xml45
-rw-r--r--mobile/android/base/resources/drawable/tab_strip_divider.xml18
-rw-r--r--mobile/android/base/resources/drawable/tab_thumbnail.xml87
-rw-r--r--mobile/android/base/resources/drawable/tabs_panel_indicator.xml55
-rw-r--r--mobile/android/base/resources/drawable/tabs_panel_indicator_selected.xml9
-rw-r--r--mobile/android/base/resources/drawable/tabs_panel_indicator_selected_private.xml9
-rw-r--r--mobile/android/base/resources/drawable/tabs_strip_indicator.xml48
-rw-r--r--mobile/android/base/resources/drawable/toast_background.xml10
-rw-r--r--mobile/android/base/resources/drawable/toast_button_background.xml30
-rw-r--r--mobile/android/base/resources/drawable/toolbar_favicon_default.xml7
-rw-r--r--mobile/android/base/resources/drawable/toolbar_grey_round.xml10
-rw-r--r--mobile/android/base/resources/drawable/top_sites_thumbnail_bg.xml12
-rw-r--r--mobile/android/base/resources/drawable/url_bar_bg.xml15
-rw-r--r--mobile/android/base/resources/drawable/url_bar_entry.xml37
-rw-r--r--mobile/android/base/resources/drawable/url_bar_nav_button.xml9
-rw-r--r--mobile/android/base/resources/drawable/url_bar_translating_edge.xml9
-rw-r--r--mobile/android/base/resources/drawable/widget_button_left.xml14
-rw-r--r--mobile/android/base/resources/drawable/widget_button_left_default.xml19
-rw-r--r--mobile/android/base/resources/drawable/widget_button_left_pressed.xml19
-rw-r--r--mobile/android/base/resources/drawable/widget_button_middle.xml13
-rw-r--r--mobile/android/base/resources/drawable/widget_button_middle_pressed.xml15
-rw-r--r--mobile/android/base/resources/drawable/widget_button_right.xml13
-rw-r--r--mobile/android/base/resources/drawable/widget_button_right_pressed.xml19
-rw-r--r--mobile/android/base/resources/layout-large-v11/browser_toolbar.xml153
-rw-r--r--mobile/android/base/resources/layout-large-v11/tabs_counter.xml16
-rw-r--r--mobile/android/base/resources/layout-xlarge-v11/font_size_preference.xml52
-rw-r--r--mobile/android/base/resources/layout/actionbar.xml31
-rw-r--r--mobile/android/base/resources/layout/activity_stream.xml6
-rw-r--r--mobile/android/base/resources/layout/activity_stream_card_history_item.xml123
-rw-r--r--mobile/android/base/resources/layout/activity_stream_contextmenu_bottomsheet.xml78
-rw-r--r--mobile/android/base/resources/layout/activity_stream_contextmenu_popupmenu.xml21
-rw-r--r--mobile/android/base/resources/layout/activity_stream_main_highlightstitle.xml28
-rw-r--r--mobile/android/base/resources/layout/activity_stream_main_toppanel.xml26
-rw-r--r--mobile/android/base/resources/layout/activity_stream_topsites_card.xml61
-rw-r--r--mobile/android/base/resources/layout/activity_stream_topsites_page.xml6
-rw-r--r--mobile/android/base/resources/layout/anchored_popup.xml25
-rw-r--r--mobile/android/base/resources/layout/as_content.xml8
-rw-r--r--mobile/android/base/resources/layout/autocomplete_list.xml11
-rw-r--r--mobile/android/base/resources/layout/autocomplete_list_item.xml14
-rw-r--r--mobile/android/base/resources/layout/basic_color_picker_dialog.xml21
-rw-r--r--mobile/android/base/resources/layout/bookmark_edit.xml51
-rw-r--r--mobile/android/base/resources/layout/bookmark_folder_row.xml13
-rw-r--r--mobile/android/base/resources/layout/bookmark_item_row.xml10
-rw-r--r--mobile/android/base/resources/layout/bookmark_screenshot_row.xml35
-rw-r--r--mobile/android/base/resources/layout/browser_search.xml35
-rw-r--r--mobile/android/base/resources/layout/browser_toolbar.xml112
-rw-r--r--mobile/android/base/resources/layout/button_toast.xml19
-rw-r--r--mobile/android/base/resources/layout/color_picker_row.xml13
-rw-r--r--mobile/android/base/resources/layout/customtabs_activity.xml50
-rw-r--r--mobile/android/base/resources/layout/datetime_picker.xml138
-rw-r--r--mobile/android/base/resources/layout/default_doorhanger.xml34
-rw-r--r--mobile/android/base/resources/layout/doorhanger.xml76
-rw-r--r--mobile/android/base/resources/layout/doorhanger_security.xml31
-rw-r--r--mobile/android/base/resources/layout/find_in_page_content.xml49
-rw-r--r--mobile/android/base/resources/layout/firstrun_animation_container.xml30
-rw-r--r--mobile/android/base/resources/layout/firstrun_basepanel_checkable_fragment.xml58
-rw-r--r--mobile/android/base/resources/layout/firstrun_sync_fragment.xml54
-rw-r--r--mobile/android/base/resources/layout/font_size_preference.xml54
-rw-r--r--mobile/android/base/resources/layout/gecko_app.xml177
-rw-r--r--mobile/android/base/resources/layout/history_sync_setup.xml35
-rw-r--r--mobile/android/base/resources/layout/home_banner.xml15
-rw-r--r--mobile/android/base/resources/layout/home_banner_content.xml36
-rw-r--r--mobile/android/base/resources/layout/home_bookmarks_panel.xml20
-rw-r--r--mobile/android/base/resources/layout/home_combined_back_item.xml13
-rw-r--r--mobile/android/base/resources/layout/home_combined_history_panel.xml52
-rw-r--r--mobile/android/base/resources/layout/home_empty_panel.xml45
-rw-r--r--mobile/android/base/resources/layout/home_header_row.xml7
-rw-r--r--mobile/android/base/resources/layout/home_item_row.xml10
-rw-r--r--mobile/android/base/resources/layout/home_pager.xml25
-rw-r--r--mobile/android/base/resources/layout/home_remote_tabs_group.xml60
-rw-r--r--mobile/android/base/resources/layout/home_remote_tabs_hidden_devices.xml17
-rw-r--r--mobile/android/base/resources/layout/home_search_item_row.xml12
-rw-r--r--mobile/android/base/resources/layout/home_smartfolder.xml50
-rw-r--r--mobile/android/base/resources/layout/home_suggestion_prompt.xml56
-rw-r--r--mobile/android/base/resources/layout/home_top_sites_panel.xml10
-rw-r--r--mobile/android/base/resources/layout/icon_grid.xml10
-rw-r--r--mobile/android/base/resources/layout/icon_grid_item.xml55
-rw-r--r--mobile/android/base/resources/layout/list_item_header.xml14
-rw-r--r--mobile/android/base/resources/layout/login_doorhanger.xml17
-rw-r--r--mobile/android/base/resources/layout/login_edit_dialog.xml31
-rw-r--r--mobile/android/base/resources/layout/media_casting.xml41
-rw-r--r--mobile/android/base/resources/layout/menu_action_bar.xml15
-rw-r--r--mobile/android/base/resources/layout/menu_item_switcher_layout.xml32
-rw-r--r--mobile/android/base/resources/layout/menu_popup.xml18
-rw-r--r--mobile/android/base/resources/layout/menu_secondary_action_bar.xml14
-rw-r--r--mobile/android/base/resources/layout/overlay_share_button.xml24
-rw-r--r--mobile/android/base/resources/layout/overlay_share_dialog.xml83
-rw-r--r--mobile/android/base/resources/layout/overlay_share_send_tab_item.xml10
-rw-r--r--mobile/android/base/resources/layout/panel_article_item.xml35
-rw-r--r--mobile/android/base/resources/layout/panel_auth_layout.xml39
-rw-r--r--mobile/android/base/resources/layout/panel_back_item.xml26
-rw-r--r--mobile/android/base/resources/layout/panel_icon_item.xml36
-rw-r--r--mobile/android/base/resources/layout/panel_image_item.xml44
-rw-r--r--mobile/android/base/resources/layout/panel_item_container.xml8
-rw-r--r--mobile/android/base/resources/layout/pin_site_dialog.xml43
-rw-r--r--mobile/android/base/resources/layout/preference_checkbox.xml24
-rw-r--r--mobile/android/base/resources/layout/preference_panels.xml30
-rw-r--r--mobile/android/base/resources/layout/preference_rightalign_icon.xml43
-rw-r--r--mobile/android/base/resources/layout/preference_search_engine.xml48
-rw-r--r--mobile/android/base/resources/layout/preference_search_tip.xml34
-rw-r--r--mobile/android/base/resources/layout/preference_set_homepage.xml38
-rw-r--r--mobile/android/base/resources/layout/private_tabs_panel.xml25
-rw-r--r--mobile/android/base/resources/layout/restricted_firstrun_welcome_fragment.xml73
-rw-r--r--mobile/android/base/resources/layout/search_activity_main.xml65
-rw-r--r--mobile/android/base/resources/layout/search_bar.xml43
-rw-r--r--mobile/android/base/resources/layout/search_empty.xml51
-rw-r--r--mobile/android/base/resources/layout/search_engine_bar_item.xml32
-rw-r--r--mobile/android/base/resources/layout/search_engine_bar_label.xml23
-rw-r--r--mobile/android/base/resources/layout/search_engine_row.xml30
-rw-r--r--mobile/android/base/resources/layout/search_fragment_post_search.xml30
-rw-r--r--mobile/android/base/resources/layout/search_fragment_pre_search.xml27
-rw-r--r--mobile/android/base/resources/layout/search_history_row.xml14
-rw-r--r--mobile/android/base/resources/layout/search_sugestions.xml12
-rw-r--r--mobile/android/base/resources/layout/search_suggestions_row.xml31
-rw-r--r--mobile/android/base/resources/layout/search_widget.xml67
-rw-r--r--mobile/android/base/resources/layout/select_dialog_list.xml13
-rw-r--r--mobile/android/base/resources/layout/select_dialog_multichoice.xml22
-rw-r--r--mobile/android/base/resources/layout/select_dialog_singlechoice.xml24
-rw-r--r--mobile/android/base/resources/layout/site_identity.xml101
-rw-r--r--mobile/android/base/resources/layout/site_setting_item.xml53
-rw-r--r--mobile/android/base/resources/layout/suggestion_item.xml31
-rw-r--r--mobile/android/base/resources/layout/tab_history_item_row.xml58
-rw-r--r--mobile/android/base/resources/layout/tab_history_layout.xml17
-rw-r--r--mobile/android/base/resources/layout/tab_menu_strip.xml15
-rw-r--r--mobile/android/base/resources/layout/tab_prompt_input.xml32
-rw-r--r--mobile/android/base/resources/layout/tab_queue_prompt.xml142
-rw-r--r--mobile/android/base/resources/layout/tab_queue_toast.xml38
-rw-r--r--mobile/android/base/resources/layout/tab_strip.xml10
-rw-r--r--mobile/android/base/resources/layout/tab_strip_inner.xml28
-rw-r--r--mobile/android/base/resources/layout/tab_strip_item.xml13
-rw-r--r--mobile/android/base/resources/layout/tab_strip_item_view.xml42
-rw-r--r--mobile/android/base/resources/layout/tabs_counter.xml17
-rw-r--r--mobile/android/base/resources/layout/tabs_layout_item_view.xml71
-rw-r--r--mobile/android/base/resources/layout/tabs_list_item_view.xml68
-rw-r--r--mobile/android/base/resources/layout/tabs_panel_default.xml100
-rw-r--r--mobile/android/base/resources/layout/tabs_panel_indicator.xml13
-rw-r--r--mobile/android/base/resources/layout/tabs_panel_view.xml14
-rw-r--r--mobile/android/base/resources/layout/toolbar_display_layout.xml52
-rw-r--r--mobile/android/base/resources/layout/toolbar_edit_layout.xml49
-rw-r--r--mobile/android/base/resources/layout/top_sites_grid_item_view.xml25
-rw-r--r--mobile/android/base/resources/layout/tracking_protection_prompt.xml106
-rw-r--r--mobile/android/base/resources/layout/two_line_folder_row.xml43
-rw-r--r--mobile/android/base/resources/layout/two_line_page_row.xml51
-rw-r--r--mobile/android/base/resources/layout/validation_message.xml42
-rw-r--r--mobile/android/base/resources/layout/zoomed_view.xml51
-rw-r--r--mobile/android/base/resources/menu-large/browser_app_menu.xml116
-rw-r--r--mobile/android/base/resources/menu-v11/preferences_search_menu.xml11
-rw-r--r--mobile/android/base/resources/menu-v11/tabs_menu.xml20
-rw-r--r--mobile/android/base/resources/menu-v11/titlebar_contextmenu.xml20
-rw-r--r--mobile/android/base/resources/menu-xlarge/browser_app_menu.xml117
-rw-r--r--mobile/android/base/resources/menu/activitystream_contextmenu.xml47
-rw-r--r--mobile/android/base/resources/menu/browser_app_menu.xml116
-rw-r--r--mobile/android/base/resources/menu/browsersearch_contextmenu.xml11
-rw-r--r--mobile/android/base/resources/menu/gecko_app_menu.xml10
-rw-r--r--mobile/android/base/resources/menu/home_contextmenu.xml38
-rw-r--r--mobile/android/base/resources/menu/home_remote_tabs_client_contextmenu.xml11
-rw-r--r--mobile/android/base/resources/menu/preferences_search_menu.xml10
-rw-r--r--mobile/android/base/resources/menu/tabs_menu.xml20
-rw-r--r--mobile/android/base/resources/menu/titlebar_contextmenu.xml26
-rw-r--r--mobile/android/base/resources/raw/bookmarkdefaults_favicon_addons.pngbin0 -> 1815 bytes
-rw-r--r--mobile/android/base/resources/raw/bookmarkdefaults_favicon_restricted_support.pngbin0 -> 20144 bytes
-rw-r--r--mobile/android/base/resources/raw/bookmarkdefaults_favicon_restricted_webmaker.pngbin0 -> 5455 bytes
-rw-r--r--mobile/android/base/resources/raw/bookmarkdefaults_favicon_support.pngbin0 -> 19290 bytes
-rw-r--r--mobile/android/base/resources/raw/fake_home_items.json15
-rw-r--r--mobile/android/base/resources/raw/topdomains.txt455
-rw-r--r--mobile/android/base/resources/values-land/dimens.xml11
-rw-r--r--mobile/android/base/resources/values-land/integers.xml11
-rw-r--r--mobile/android/base/resources/values-land/styles.xml32
-rw-r--r--mobile/android/base/resources/values-large-land-v11/dimens.xml12
-rw-r--r--mobile/android/base/resources/values-large-land-v11/styles.xml34
-rw-r--r--mobile/android/base/resources/values-large-v16/dimens.xml8
-rw-r--r--mobile/android/base/resources/values-large-v16/styles.xml13
-rw-r--r--mobile/android/base/resources/values-large/bool.xml11
-rw-r--r--mobile/android/base/resources/values-large/dimens.xml37
-rw-r--r--mobile/android/base/resources/values-large/integers.xml12
-rw-r--r--mobile/android/base/resources/values-large/styles.xml89
-rw-r--r--mobile/android/base/resources/values-sw240dp/dimens.xml10
-rw-r--r--mobile/android/base/resources/values-sw360dp/dimens.xml13
-rw-r--r--mobile/android/base/resources/values-sw400dp/dimens.xml10
-rw-r--r--mobile/android/base/resources/values-v11/dimens.xml13
-rw-r--r--mobile/android/base/resources/values-v11/styles.xml112
-rw-r--r--mobile/android/base/resources/values-v11/themes.xml45
-rw-r--r--mobile/android/base/resources/values-v13/search_styles.xml20
-rw-r--r--mobile/android/base/resources/values-v13/styles.xml15
-rw-r--r--mobile/android/base/resources/values-v14/themes.xml27
-rw-r--r--mobile/android/base/resources/values-v16/search_styles.xml19
-rw-r--r--mobile/android/base/resources/values-v16/styles.xml29
-rw-r--r--mobile/android/base/resources/values-v19/dimens.xml8
-rw-r--r--mobile/android/base/resources/values-v19/styles.xml41
-rw-r--r--mobile/android/base/resources/values-v21/dimens.xml8
-rw-r--r--mobile/android/base/resources/values-v21/integers.xml10
-rw-r--r--mobile/android/base/resources/values-v21/styles.xml12
-rw-r--r--mobile/android/base/resources/values-v21/themes.xml40
-rw-r--r--mobile/android/base/resources/values-w400dp/styles.xml12
-rw-r--r--mobile/android/base/resources/values-xlarge-land-v11/dimens.xml10
-rw-r--r--mobile/android/base/resources/values-xlarge-land-v11/styles.xml23
-rw-r--r--mobile/android/base/resources/values-xlarge-v11/dimens.xml11
-rw-r--r--mobile/android/base/resources/values-xlarge-v11/integers.xml13
-rw-r--r--mobile/android/base/resources/values-xlarge-v11/styles.xml27
-rw-r--r--mobile/android/base/resources/values/arrays.xml176
-rw-r--r--mobile/android/base/resources/values/attrs.xml188
-rw-r--r--mobile/android/base/resources/values/bool.xml18
-rw-r--r--mobile/android/base/resources/values/colors.xml148
-rw-r--r--mobile/android/base/resources/values/dimens.xml227
-rw-r--r--mobile/android/base/resources/values/ids.xml23
-rw-r--r--mobile/android/base/resources/values/integers.xml17
-rw-r--r--mobile/android/base/resources/values/search_attrs.xml12
-rw-r--r--mobile/android/base/resources/values/search_colors.xml24
-rw-r--r--mobile/android/base/resources/values/search_dimens.xml30
-rw-r--r--mobile/android/base/resources/values/search_styles.xml40
-rw-r--r--mobile/android/base/resources/values/styles.xml832
-rw-r--r--mobile/android/base/resources/values/themes.xml123
-rw-r--r--mobile/android/base/resources/values/vpi__attrs.xml59
-rw-r--r--mobile/android/base/resources/values/vpi__defaults.xml26
-rw-r--r--mobile/android/base/resources/xml-v11/preference_headers.xml74
-rw-r--r--mobile/android/base/resources/xml-v11/preferences_default_browser_tablet.xml11
-rw-r--r--mobile/android/base/resources/xml-v11/preferences_privacy_clear_tablet.xml16
-rw-r--r--mobile/android/base/resources/xml-v11/preferences_search.xml33
-rw-r--r--mobile/android/base/resources/xml/preference_headers.xml25
-rw-r--r--mobile/android/base/resources/xml/preferences.xml85
-rw-r--r--mobile/android/base/resources/xml/preferences_accessibility.xml35
-rw-r--r--mobile/android/base/resources/xml/preferences_advanced.xml100
-rw-r--r--mobile/android/base/resources/xml/preferences_general.xml37
-rw-r--r--mobile/android/base/resources/xml/preferences_general_tablet.xml43
-rw-r--r--mobile/android/base/resources/xml/preferences_home.xml34
-rw-r--r--mobile/android/base/resources/xml/preferences_locale.xml19
-rw-r--r--mobile/android/base/resources/xml/preferences_notifications.xml16
-rw-r--r--mobile/android/base/resources/xml/preferences_privacy.xml113
-rw-r--r--mobile/android/base/resources/xml/preferences_search.xml40
-rw-r--r--mobile/android/base/resources/xml/preferences_vendor.xml24
-rw-r--r--mobile/android/base/resources/xml/search_preferences.xml9
-rw-r--r--mobile/android/base/resources/xml/search_widget_info.xml12
-rw-r--r--mobile/android/base/resources/xml/searchable.xml7
749 files changed, 11432 insertions, 0 deletions
diff --git a/mobile/android/base/resources/anim/grow_fade_in.xml b/mobile/android/base/resources/anim/grow_fade_in.xml
new file mode 100644
index 000000000..bf7a3f23d
--- /dev/null
+++ b/mobile/android/base/resources/anim/grow_fade_in.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <scale android:fromXScale="1.0"
+ android:toXScale="1.0"
+ android:fromYScale="0.3"
+ android:toYScale="1.0"
+ android:pivotX="0%"
+ android:pivotY="0%"
+ android:duration="150"/>
+
+ <alpha android:interpolator="@android:anim/decelerate_interpolator"
+ android:fromAlpha="0.0"
+ android:toAlpha="1.0"
+ android:duration="150"/>
+
+</set>
diff --git a/mobile/android/base/resources/anim/overlay_check_entry.xml b/mobile/android/base/resources/anim/overlay_check_entry.xml
new file mode 100644
index 000000000..5a80612a7
--- /dev/null
+++ b/mobile/android/base/resources/anim/overlay_check_entry.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<alpha
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:duration="250"
+ android:fromAlpha="0.0"
+ android:toAlpha="1.0" />
diff --git a/mobile/android/base/resources/anim/overlay_check_exit.xml b/mobile/android/base/resources/anim/overlay_check_exit.xml
new file mode 100644
index 000000000..9c42eaa0b
--- /dev/null
+++ b/mobile/android/base/resources/anim/overlay_check_exit.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<alpha
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:duration="250"
+ android:fromAlpha="1.0"
+ android:toAlpha="0.0"
+ android:fillAfter="true" />
diff --git a/mobile/android/base/resources/anim/overlay_pop.xml b/mobile/android/base/resources/anim/overlay_pop.xml
new file mode 100644
index 000000000..6b5c412dc
--- /dev/null
+++ b/mobile/android/base/resources/anim/overlay_pop.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+ android:fillAfter="true" >
+
+ <scale
+ android:duration="300"
+ android:fromXScale="1"
+ android:fromYScale="1"
+ android:pivotX="50%"
+ android:pivotY="50%"
+ android:toXScale="2"
+ android:toYScale="2" >
+ </scale>
+
+ <scale
+ android:duration="300"
+ android:fromXScale="1"
+ android:fromYScale="1"
+ android:pivotX="50%"
+ android:pivotY="50%"
+ android:toXScale="0.5"
+ android:toYScale="0.5" >
+ </scale>
+
+</set>
diff --git a/mobile/android/base/resources/anim/overlay_slide_down.xml b/mobile/android/base/resources/anim/overlay_slide_down.xml
new file mode 100644
index 000000000..c7007458c
--- /dev/null
+++ b/mobile/android/base/resources/anim/overlay_slide_down.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+ android:duration="@android:integer/config_longAnimTime"
+ android:fromYDelta="0"
+ android:toYDelta="100%p"
+ android:fillAfter="true" />
diff --git a/mobile/android/base/resources/anim/overlay_slide_up.xml b/mobile/android/base/resources/anim/overlay_slide_up.xml
new file mode 100644
index 000000000..2541493ed
--- /dev/null
+++ b/mobile/android/base/resources/anim/overlay_slide_up.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+ android:duration="@android:integer/config_longAnimTime"
+ android:fromYDelta="100%p"
+ android:toYDelta="0" />
diff --git a/mobile/android/base/resources/anim/popup_hide.xml b/mobile/android/base/resources/anim/popup_hide.xml
new file mode 100644
index 000000000..5ea5bc2cb
--- /dev/null
+++ b/mobile/android/base/resources/anim/popup_hide.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+ android:interpolator="@android:anim/decelerate_interpolator"
+ android:duration="150">
+
+ <translate android:fromYDelta="-0"
+ android:toYDelta="-20"/>
+
+ <alpha android:fromAlpha="1.0"
+ android:toAlpha="0.0"/>
+
+</set>
diff --git a/mobile/android/base/resources/anim/popup_show.xml b/mobile/android/base/resources/anim/popup_show.xml
new file mode 100644
index 000000000..6057b9063
--- /dev/null
+++ b/mobile/android/base/resources/anim/popup_show.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+ android:interpolator="@android:anim/decelerate_interpolator"
+ android:duration="150">
+
+ <translate android:fromYDelta="-20"
+ android:toYDelta="0"/>
+
+ <alpha android:fromAlpha="0.0"
+ android:toAlpha="1.0"/>
+
+</set>
diff --git a/mobile/android/base/resources/color/action_bar_menu_item_colors.xml b/mobile/android/base/resources/color/action_bar_menu_item_colors.xml
new file mode 100644
index 000000000..756463d68
--- /dev/null
+++ b/mobile/android/base/resources/color/action_bar_menu_item_colors.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+ <item gecko:state_private="true"
+ android:state_enabled="false"
+ android:color="@color/toolbar_icon_grey"
+ />
+
+ <item gecko:state_private="true"
+ android:state_enabled="true"
+ android:color="@color/tabs_tray_icon_grey"
+ />
+
+ <item gecko:state_private="false"
+ android:state_enabled="false"
+ android:color="@color/disabled_grey"
+ />
+
+ <item android:color="@color/toolbar_icon_grey" />
+
+</selector>
diff --git a/mobile/android/base/resources/color/action_bar_secondary_menu_item_colors.xml b/mobile/android/base/resources/color/action_bar_secondary_menu_item_colors.xml
new file mode 100644
index 000000000..c72ce0923
--- /dev/null
+++ b/mobile/android/base/resources/color/action_bar_secondary_menu_item_colors.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+ <item android:state_enabled="false"
+ android:color="@color/disabled_grey"
+ />
+
+ <item android:color="@color/toolbar_icon_grey" />
+
+</selector>
diff --git a/mobile/android/base/resources/color/facet_button_text_color.xml b/mobile/android/base/resources/color/facet_button_text_color.xml
new file mode 100644
index 000000000..90da6e324
--- /dev/null
+++ b/mobile/android/base/resources/color/facet_button_text_color.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <!-- facet is selected -->
+ <item android:state_checked="true" android:color="@color/facet_button_text_color_selected" />
+
+ <!-- default -->
+ <item android:color="@color/facet_button_text_color_default" />
+</selector>
diff --git a/mobile/android/base/resources/color/pressed_about_page_header_grey.xml b/mobile/android/base/resources/color/pressed_about_page_header_grey.xml
new file mode 100644
index 000000000..18533ff67
--- /dev/null
+++ b/mobile/android/base/resources/color/pressed_about_page_header_grey.xml
@@ -0,0 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_pressed="true"
+ android:drawable="@color/about_page_header_grey" />
+
+ <item android:drawable="@android:color/transparent"/>
+
+</selector>
diff --git a/mobile/android/base/resources/color/primary_text.xml b/mobile/android/base/resources/color/primary_text.xml
new file mode 100644
index 000000000..59d5699db
--- /dev/null
+++ b/mobile/android/base/resources/color/primary_text.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_enabled="false" android:color="@color/text_color_primary_disable_only" />
+ <item android:color="@color/placeholder_active_grey"/>
+
+</selector>
diff --git a/mobile/android/base/resources/color/primary_text_selector.xml b/mobile/android/base/resources/color/primary_text_selector.xml
new file mode 100644
index 000000000..d21a60880
--- /dev/null
+++ b/mobile/android/base/resources/color/primary_text_selector.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_enabled="false" android:color="@color/disabled_grey" />
+ <item android:color="@color/text_and_tabs_tray_grey" />
+
+</selector>
diff --git a/mobile/android/base/resources/color/recyclerview_selector.xml b/mobile/android/base/resources/color/recyclerview_selector.xml
new file mode 100644
index 000000000..6ecc3c5e2
--- /dev/null
+++ b/mobile/android/base/resources/color/recyclerview_selector.xml
@@ -0,0 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_pressed="true"
+ android:drawable="@color/highlight" />
+
+ <item android:drawable="@android:color/transparent"/>
+
+</selector>
diff --git a/mobile/android/base/resources/color/secondary_text.xml b/mobile/android/base/resources/color/secondary_text.xml
new file mode 100644
index 000000000..73bebcd15
--- /dev/null
+++ b/mobile/android/base/resources/color/secondary_text.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_enabled="false" android:color="@color/text_color_primary_disable_only" />
+ <item android:color="@color/placeholder_grey"/>
+
+</selector>
diff --git a/mobile/android/base/resources/color/select_item_multichoice.xml b/mobile/android/base/resources/color/select_item_multichoice.xml
new file mode 100644
index 000000000..9eb9e2178
--- /dev/null
+++ b/mobile/android/base/resources/color/select_item_multichoice.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_enabled="false" android:color="#999" />
+ <item android:color="#000"/>
+
+</selector>
diff --git a/mobile/android/base/resources/color/state_pressed_toolbar_grey_pressed.xml b/mobile/android/base/resources/color/state_pressed_toolbar_grey_pressed.xml
new file mode 100644
index 000000000..41eb992de
--- /dev/null
+++ b/mobile/android/base/resources/color/state_pressed_toolbar_grey_pressed.xml
@@ -0,0 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_pressed="true"
+ android:drawable="@color/toolbar_grey_pressed" />
+
+ <item android:drawable="@android:color/transparent"/>
+
+</selector>
diff --git a/mobile/android/base/resources/color/tab_item_title.xml b/mobile/android/base/resources/color/tab_item_title.xml
new file mode 100644
index 000000000..443d4c11d
--- /dev/null
+++ b/mobile/android/base/resources/color/tab_item_title.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_checked="true"
+ android:color="@color/about_page_header_grey"/>
+
+ <item android:state_pressed="true"
+ android:color="@color/about_page_header_grey"/>
+
+ <item android:color="@color/tabs_tray_icon_grey"/>
+
+</selector>
diff --git a/mobile/android/base/resources/color/tab_new_tab_strip_colors.xml b/mobile/android/base/resources/color/tab_new_tab_strip_colors.xml
new file mode 100644
index 000000000..fd7a97b21
--- /dev/null
+++ b/mobile/android/base/resources/color/tab_new_tab_strip_colors.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+ <item gecko:state_light="true"
+ android:color="@color/toolbar_icon_grey"/>
+
+ <item android:color="@color/tabs_tray_icon_grey"/>
+
+</selector> \ No newline at end of file
diff --git a/mobile/android/base/resources/color/tab_strip_item_bg.xml b/mobile/android/base/resources/color/tab_strip_item_bg.xml
new file mode 100644
index 000000000..b8e7e298b
--- /dev/null
+++ b/mobile/android/base/resources/color/tab_strip_item_bg.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+ <item android:state_pressed="true"
+ android:state_checked="true"
+ gecko:state_private="true"
+ android:color="@color/highlight_nav_pb" />
+
+ <item android:state_checked="true"
+ gecko:state_private="true"
+ android:color="@color/tabs_tray_grey_pressed" />
+
+ <item android:state_pressed="true"
+ gecko:state_private="true"
+ android:color="@color/highlight_dark_focused" />
+
+ <item android:state_pressed="true"
+ android:state_checked="true"
+ android:color="@color/toolbar_grey_pressed" />
+
+ <!-- Lightweight Themes -->
+ <item android:state_checked="true"
+ gecko:state_light="true"
+ android:color="@color/background_normal_lwt" />
+ <item android:state_checked="true"
+ gecko:state_dark="true"
+ android:color="@color/background_normal_lwt" />
+ <item android:state_pressed="true"
+ gecko:state_light="true"
+ android:color="@color/tablet_highlight_lwt" />
+ <item android:state_pressed="true"
+ gecko:state_dark="true"
+ android:color="@color/tablet_highlight_dark_lwt" />
+
+ <item android:state_checked="true"
+ android:color="@color/toolbar_grey" />
+
+ <item android:state_pressed="true"
+ android:color="@color/tabs_tray_grey_pressed" />
+
+ <item android:color="@android:color/transparent"/>
+
+</selector>
diff --git a/mobile/android/base/resources/color/tab_strip_item_title.xml b/mobile/android/base/resources/color/tab_strip_item_title.xml
new file mode 100644
index 000000000..f4fca9750
--- /dev/null
+++ b/mobile/android/base/resources/color/tab_strip_item_title.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+ <item android:state_checked="true"
+ gecko:state_private="true"
+ android:color="@color/about_page_header_grey"/>
+
+ <item android:state_checked="true"
+ android:color="@color/placeholder_grey"/>
+
+ <item android:state_checked="false"
+ gecko:state_dark="true"
+ android:color="@color/about_page_header_grey"/>
+
+ <item android:color="@color/placeholder_grey"/>
+
+</selector>
diff --git a/mobile/android/base/resources/color/tab_text_color.xml b/mobile/android/base/resources/color/tab_text_color.xml
new file mode 100644
index 000000000..51aba7e2a
--- /dev/null
+++ b/mobile/android/base/resources/color/tab_text_color.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_pressed="true"
+ android:color="@color/placeholder_grey" />
+
+ <item android:color="@color/panel_tab_text_normal"/>
+</selector> \ No newline at end of file
diff --git a/mobile/android/base/resources/color/tabs_counter_text_color.xml b/mobile/android/base/resources/color/tabs_counter_text_color.xml
new file mode 100644
index 000000000..945634b7a
--- /dev/null
+++ b/mobile/android/base/resources/color/tabs_counter_text_color.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+ <item gecko:state_private="true"
+ android:color="@color/tabs_tray_grey_pressed"/>
+
+ <item android:color="@color/toolbar_grey"/>
+
+</selector> \ No newline at end of file
diff --git a/mobile/android/base/resources/color/tertiary_text.xml b/mobile/android/base/resources/color/tertiary_text.xml
new file mode 100644
index 000000000..54884519c
--- /dev/null
+++ b/mobile/android/base/resources/color/tertiary_text.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_enabled="false" android:color="@color/text_color_primary_disable_only" />
+ <item android:color="@color/text_color_tertiary"/>
+
+</selector>
diff --git a/mobile/android/base/resources/color/toolbar_display_layout_bg.xml b/mobile/android/base/resources/color/toolbar_display_layout_bg.xml
new file mode 100644
index 000000000..9a99e0858
--- /dev/null
+++ b/mobile/android/base/resources/color/toolbar_display_layout_bg.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- These colors are defined from the drawables url_bar_entry_default_* -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+ <item gecko:state_private="true" android:color="@color/placeholder_active_grey"/>
+
+ <item android:color="#FFFFFF"/>
+
+</selector>
diff --git a/mobile/android/base/resources/color/top_sites_grid_item_title.xml b/mobile/android/base/resources/color/top_sites_grid_item_title.xml
new file mode 100644
index 000000000..89ca50294
--- /dev/null
+++ b/mobile/android/base/resources/color/top_sites_grid_item_title.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <!-- empty with no url -->
+ <item android:state_empty="true" android:color="#80777777" />
+
+ <!-- default -->
+ <item android:color="@color/placeholder_grey"/>
+
+</selector>
diff --git a/mobile/android/base/resources/color/url_bar_title.xml b/mobile/android/base/resources/color/url_bar_title.xml
new file mode 100644
index 000000000..473bee41d
--- /dev/null
+++ b/mobile/android/base/resources/color/url_bar_title.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+ <!-- private browsing mode -->
+ <item gecko:state_private="true" android:color="@color/private_active_text" />
+
+ <!-- dark theme -->
+ <item gecko:state_dark="true" android:color="@color/private_active_text"/>
+
+ <!-- light theme -->
+ <item gecko:state_light="true" android:color="@color/placeholder_active_grey"/>
+
+ <!-- normal mode -->
+ <item android:color="@color/placeholder_active_grey"/>
+
+</selector>
diff --git a/mobile/android/base/resources/color/url_bar_title_hint.xml b/mobile/android/base/resources/color/url_bar_title_hint.xml
new file mode 100644
index 000000000..0c748ac0b
--- /dev/null
+++ b/mobile/android/base/resources/color/url_bar_title_hint.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+ <!-- private browsing mode -->
+ <item gecko:state_private="true" android:color="#FF7F828A" />
+
+ <!-- normal mode -->
+ <item android:color="#FF666666"/>
+
+</selector>
diff --git a/mobile/android/base/resources/drawable-hdpi-v11/alert_camera.png b/mobile/android/base/resources/drawable-hdpi-v11/alert_camera.png
new file mode 100644
index 000000000..11800d0f1
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi-v11/alert_camera.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi-v11/alert_download.png b/mobile/android/base/resources/drawable-hdpi-v11/alert_download.png
new file mode 100644
index 000000000..1b8f59e56
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi-v11/alert_download.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi-v11/alert_guest.png b/mobile/android/base/resources/drawable-hdpi-v11/alert_guest.png
new file mode 100644
index 000000000..650b8246d
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi-v11/alert_guest.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi-v11/alert_mic.png b/mobile/android/base/resources/drawable-hdpi-v11/alert_mic.png
new file mode 100644
index 000000000..4b0248b8b
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi-v11/alert_mic.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi-v11/alert_mic_camera.png b/mobile/android/base/resources/drawable-hdpi-v11/alert_mic_camera.png
new file mode 100644
index 000000000..091ec077d
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi-v11/alert_mic_camera.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_back.png b/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_back.png
new file mode 100644
index 000000000..d0ec44a96
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_back.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_bookmark_add.png b/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_bookmark_add.png
new file mode 100644
index 000000000..a58abd2f1
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_bookmark_add.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_forward.png b/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_forward.png
new file mode 100644
index 000000000..3a8db422f
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_forward.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_reload.png b/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_reload.png
new file mode 100644
index 000000000..d0ae488c7
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_reload.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi-v11/ic_status_logo.png b/mobile/android/base/resources/drawable-hdpi-v11/ic_status_logo.png
new file mode 100644
index 000000000..5524dd072
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi-v11/ic_status_logo.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi-v11/star_blue.png b/mobile/android/base/resources/drawable-hdpi-v11/star_blue.png
new file mode 100644
index 000000000..fc292debb
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi-v11/star_blue.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/ab_add_search_engine.png b/mobile/android/base/resources/drawable-hdpi/ab_add_search_engine.png
new file mode 100644
index 000000000..77b99cdc7
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/ab_add_search_engine.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/ab_copy.png b/mobile/android/base/resources/drawable-hdpi/ab_copy.png
new file mode 100644
index 000000000..6bf796c4f
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/ab_copy.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/ab_cut.png b/mobile/android/base/resources/drawable-hdpi/ab_cut.png
new file mode 100644
index 000000000..0b41f5431
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/ab_cut.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/ab_done.png b/mobile/android/base/resources/drawable-hdpi/ab_done.png
new file mode 100644
index 000000000..6b81da3c0
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/ab_done.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/ab_mic.png b/mobile/android/base/resources/drawable-hdpi/ab_mic.png
new file mode 100644
index 000000000..13f8eb356
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/ab_mic.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/ab_paste.png b/mobile/android/base/resources/drawable-hdpi/ab_paste.png
new file mode 100644
index 000000000..58fb8a31e
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/ab_paste.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/ab_qrcode.png b/mobile/android/base/resources/drawable-hdpi/ab_qrcode.png
new file mode 100644
index 000000000..727201a2c
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/ab_qrcode.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/ab_search.png b/mobile/android/base/resources/drawable-hdpi/ab_search.png
new file mode 100644
index 000000000..0d217f11a
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/ab_search.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/ab_select_all.png b/mobile/android/base/resources/drawable-hdpi/ab_select_all.png
new file mode 100644
index 000000000..7488ed571
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/ab_select_all.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/alert_camera.png b/mobile/android/base/resources/drawable-hdpi/alert_camera.png
new file mode 100644
index 000000000..6ae4be078
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/alert_camera.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/alert_download.png b/mobile/android/base/resources/drawable-hdpi/alert_download.png
new file mode 100644
index 000000000..b55e779fc
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/alert_download.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/alert_download_animation_1.png b/mobile/android/base/resources/drawable-hdpi/alert_download_animation_1.png
new file mode 100644
index 000000000..22d6288ea
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/alert_download_animation_1.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/alert_download_animation_2.png b/mobile/android/base/resources/drawable-hdpi/alert_download_animation_2.png
new file mode 100644
index 000000000..dc402e9b8
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/alert_download_animation_2.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/alert_download_animation_3.png b/mobile/android/base/resources/drawable-hdpi/alert_download_animation_3.png
new file mode 100644
index 000000000..719bcbdab
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/alert_download_animation_3.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/alert_download_animation_4.png b/mobile/android/base/resources/drawable-hdpi/alert_download_animation_4.png
new file mode 100644
index 000000000..4319d0039
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/alert_download_animation_4.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/alert_download_animation_5.png b/mobile/android/base/resources/drawable-hdpi/alert_download_animation_5.png
new file mode 100644
index 000000000..f8d1a15d6
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/alert_download_animation_5.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/alert_download_animation_6.png b/mobile/android/base/resources/drawable-hdpi/alert_download_animation_6.png
new file mode 100644
index 000000000..dffe36338
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/alert_download_animation_6.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/alert_guest.png b/mobile/android/base/resources/drawable-hdpi/alert_guest.png
new file mode 100644
index 000000000..17fc059c3
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/alert_guest.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/alert_mic.png b/mobile/android/base/resources/drawable-hdpi/alert_mic.png
new file mode 100644
index 000000000..d218bc88c
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/alert_mic.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/alert_mic_camera.png b/mobile/android/base/resources/drawable-hdpi/alert_mic_camera.png
new file mode 100644
index 000000000..ef33012b5
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/alert_mic_camera.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/arrow_up.png b/mobile/android/base/resources/drawable-hdpi/arrow_up.png
new file mode 100644
index 000000000..dfa79aaff
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/arrow_up.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/blank.png b/mobile/android/base/resources/drawable-hdpi/blank.png
new file mode 100644
index 000000000..56535e7ef
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/blank.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/casting.png b/mobile/android/base/resources/drawable-hdpi/casting.png
new file mode 100644
index 000000000..3da63dc55
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/casting.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/casting_active.png b/mobile/android/base/resources/drawable-hdpi/casting_active.png
new file mode 100644
index 000000000..baf55c4cc
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/casting_active.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/close.png b/mobile/android/base/resources/drawable-hdpi/close.png
new file mode 100644
index 000000000..b14612fa0
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/close.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/close_edit_mode_dark.png b/mobile/android/base/resources/drawable-hdpi/close_edit_mode_dark.png
new file mode 100644
index 000000000..1e28f00c5
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/close_edit_mode_dark.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/close_edit_mode_light.png b/mobile/android/base/resources/drawable-hdpi/close_edit_mode_light.png
new file mode 100644
index 000000000..4c82e5696
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/close_edit_mode_light.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/color_picker_row_bg.9.png b/mobile/android/base/resources/drawable-hdpi/color_picker_row_bg.9.png
new file mode 100644
index 000000000..50460696a
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/color_picker_row_bg.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/device_desktop.png b/mobile/android/base/resources/drawable-hdpi/device_desktop.png
new file mode 100644
index 000000000..ef5300abd
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/device_desktop.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/device_mobile.png b/mobile/android/base/resources/drawable-hdpi/device_mobile.png
new file mode 100644
index 000000000..6e58c9449
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/device_mobile.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/dropshadow.9.png b/mobile/android/base/resources/drawable-hdpi/dropshadow.9.png
new file mode 100644
index 000000000..1273996c5
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/dropshadow.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/favicon_globe.png b/mobile/android/base/resources/drawable-hdpi/favicon_globe.png
new file mode 100644
index 000000000..235af2720
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/favicon_globe.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/find_close.png b/mobile/android/base/resources/drawable-hdpi/find_close.png
new file mode 100644
index 000000000..e98f59e68
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/find_close.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/find_next.png b/mobile/android/base/resources/drawable-hdpi/find_next.png
new file mode 100644
index 000000000..788f45c7e
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/find_next.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/find_prev.png b/mobile/android/base/resources/drawable-hdpi/find_prev.png
new file mode 100644
index 000000000..4c40a1e8a
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/find_prev.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/firefox_settings_alert.png b/mobile/android/base/resources/drawable-hdpi/firefox_settings_alert.png
new file mode 100644
index 000000000..7094c9aad
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/firefox_settings_alert.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/flat_icon.png b/mobile/android/base/resources/drawable-hdpi/flat_icon.png
new file mode 100644
index 000000000..d4b946f08
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/flat_icon.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/folder_closed.png b/mobile/android/base/resources/drawable-hdpi/folder_closed.png
new file mode 100644
index 000000000..87adf55bf
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/folder_closed.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/globe_light.png b/mobile/android/base/resources/drawable-hdpi/globe_light.png
new file mode 100644
index 000000000..39098f776
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/globe_light.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/grid_icon_bg_activated.9.png b/mobile/android/base/resources/drawable-hdpi/grid_icon_bg_activated.9.png
new file mode 100644
index 000000000..d2ca3fdd4
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/grid_icon_bg_activated.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/grid_icon_bg_focused.9.png b/mobile/android/base/resources/drawable-hdpi/grid_icon_bg_focused.9.png
new file mode 100644
index 000000000..510d297ea
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/grid_icon_bg_focused.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/handle_end.png b/mobile/android/base/resources/drawable-hdpi/handle_end.png
new file mode 100644
index 000000000..9cb9d6fbb
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/handle_end.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/handle_middle.png b/mobile/android/base/resources/drawable-hdpi/handle_middle.png
new file mode 100644
index 000000000..075a30029
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/handle_middle.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/handle_start.png b/mobile/android/base/resources/drawable-hdpi/handle_start.png
new file mode 100644
index 000000000..ccbc1767d
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/handle_start.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/helper_readerview_bookmark.webp b/mobile/android/base/resources/drawable-hdpi/helper_readerview_bookmark.webp
new file mode 100644
index 000000000..f1f22df5c
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/helper_readerview_bookmark.webp
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/home_bg.png b/mobile/android/base/resources/drawable-hdpi/home_bg.png
new file mode 100644
index 000000000..6cde34825
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/home_bg.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/home_group_collapsed.png b/mobile/android/base/resources/drawable-hdpi/home_group_collapsed.png
new file mode 100644
index 000000000..ca2f764f1
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/home_group_collapsed.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/home_star.png b/mobile/android/base/resources/drawable-hdpi/home_star.png
new file mode 100644
index 000000000..29ff5b0f1
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/home_star.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/home_tab_menu_strip.9.png b/mobile/android/base/resources/drawable-hdpi/home_tab_menu_strip.9.png
new file mode 100644
index 000000000..319cc773c
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/home_tab_menu_strip.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/homepage_banner_firstrun.png b/mobile/android/base/resources/drawable-hdpi/homepage_banner_firstrun.png
new file mode 100644
index 000000000..915eac7de
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/homepage_banner_firstrun.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/ic_action_settings.png b/mobile/android/base/resources/drawable-hdpi/ic_action_settings.png
new file mode 100644
index 000000000..de96174a3
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/ic_action_settings.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/ic_media_pause.png b/mobile/android/base/resources/drawable-hdpi/ic_media_pause.png
new file mode 100644
index 000000000..3f4f2b316
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/ic_media_pause.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/ic_media_play.png b/mobile/android/base/resources/drawable-hdpi/ic_media_play.png
new file mode 100644
index 000000000..172dfd9d6
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/ic_media_play.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/ic_menu_share.png b/mobile/android/base/resources/drawable-hdpi/ic_menu_share.png
new file mode 100644
index 000000000..66a0ad198
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/ic_menu_share.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/ic_status_logo.png b/mobile/android/base/resources/drawable-hdpi/ic_status_logo.png
new file mode 100644
index 000000000..4cd8e3c07
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/ic_status_logo.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/ic_url_bar_tab.png b/mobile/android/base/resources/drawable-hdpi/ic_url_bar_tab.png
new file mode 100644
index 000000000..97272c7f8
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/ic_url_bar_tab.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/ic_widget_new_tab.png b/mobile/android/base/resources/drawable-hdpi/ic_widget_new_tab.png
new file mode 100644
index 000000000..48a966414
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/ic_widget_new_tab.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/ic_widget_search.png b/mobile/android/base/resources/drawable-hdpi/ic_widget_search.png
new file mode 100644
index 000000000..c885787b6
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/ic_widget_search.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/icon_bookmarks_empty.png b/mobile/android/base/resources/drawable-hdpi/icon_bookmarks_empty.png
new file mode 100644
index 000000000..a3645a054
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/icon_bookmarks_empty.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/icon_home_empty_firefox.png b/mobile/android/base/resources/drawable-hdpi/icon_home_empty_firefox.png
new file mode 100644
index 000000000..2a490d7ac
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/icon_home_empty_firefox.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/icon_key.png b/mobile/android/base/resources/drawable-hdpi/icon_key.png
new file mode 100644
index 000000000..bc742e161
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/icon_key.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/icon_most_recent_empty.png b/mobile/android/base/resources/drawable-hdpi/icon_most_recent_empty.png
new file mode 100644
index 000000000..92b41a224
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/icon_most_recent_empty.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/icon_openinapp.png b/mobile/android/base/resources/drawable-hdpi/icon_openinapp.png
new file mode 100644
index 000000000..0527956da
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/icon_openinapp.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/icon_pageaction.png b/mobile/android/base/resources/drawable-hdpi/icon_pageaction.png
new file mode 100644
index 000000000..2b4b09003
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/icon_pageaction.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/icon_remote_tabs_empty.png b/mobile/android/base/resources/drawable-hdpi/icon_remote_tabs_empty.png
new file mode 100644
index 000000000..e520d2db8
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/icon_remote_tabs_empty.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/icon_search_empty_firefox.png b/mobile/android/base/resources/drawable-hdpi/icon_search_empty_firefox.png
new file mode 100644
index 000000000..fd271d423
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/icon_search_empty_firefox.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/icon_shareplane.png b/mobile/android/base/resources/drawable-hdpi/icon_shareplane.png
new file mode 100644
index 000000000..cdc6e01ae
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/icon_shareplane.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/img_check.png b/mobile/android/base/resources/drawable-hdpi/img_check.png
new file mode 100644
index 000000000..bb01e0771
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/img_check.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/location.png b/mobile/android/base/resources/drawable-hdpi/location.png
new file mode 100644
index 000000000..18c54718a
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/location.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/lock_disabled.png b/mobile/android/base/resources/drawable-hdpi/lock_disabled.png
new file mode 100644
index 000000000..e7f3eb56c
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/lock_disabled.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/lock_inactive.png b/mobile/android/base/resources/drawable-hdpi/lock_inactive.png
new file mode 100644
index 000000000..f1bfe63cc
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/lock_inactive.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/lock_secure.png b/mobile/android/base/resources/drawable-hdpi/lock_secure.png
new file mode 100644
index 000000000..c1e95f3d8
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/lock_secure.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/media_bar_pause.png b/mobile/android/base/resources/drawable-hdpi/media_bar_pause.png
new file mode 100644
index 000000000..46e838347
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/media_bar_pause.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/media_bar_play.png b/mobile/android/base/resources/drawable-hdpi/media_bar_play.png
new file mode 100644
index 000000000..36f0797f7
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/media_bar_play.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/media_bar_stop.png b/mobile/android/base/resources/drawable-hdpi/media_bar_stop.png
new file mode 100644
index 000000000..db971c20f
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/media_bar_stop.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/menu.png b/mobile/android/base/resources/drawable-hdpi/menu.png
new file mode 100644
index 000000000..0e028bb79
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/menu.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/menu_item_check.png b/mobile/android/base/resources/drawable-hdpi/menu_item_check.png
new file mode 100644
index 000000000..e13d6288a
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/menu_item_check.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/menu_item_more.png b/mobile/android/base/resources/drawable-hdpi/menu_item_more.png
new file mode 100644
index 000000000..509e8de55
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/menu_item_more.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/menu_item_uncheck.png b/mobile/android/base/resources/drawable-hdpi/menu_item_uncheck.png
new file mode 100644
index 000000000..2fa5d5251
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/menu_item_uncheck.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/network_error.png b/mobile/android/base/resources/drawable-hdpi/network_error.png
new file mode 100644
index 000000000..bdaa961d3
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/network_error.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/notification_media.webp b/mobile/android/base/resources/drawable-hdpi/notification_media.webp
new file mode 100644
index 000000000..b4fae6846
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/notification_media.webp
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/open_in_browser.png b/mobile/android/base/resources/drawable-hdpi/open_in_browser.png
new file mode 100644
index 000000000..e78d96665
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/open_in_browser.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/overlay_bookmark_icon.png b/mobile/android/base/resources/drawable-hdpi/overlay_bookmark_icon.png
new file mode 100644
index 000000000..6cb555993
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/overlay_bookmark_icon.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/overlay_bookmarked_already_icon.png b/mobile/android/base/resources/drawable-hdpi/overlay_bookmarked_already_icon.png
new file mode 100644
index 000000000..c5f91c58d
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/overlay_bookmarked_already_icon.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/overlay_check.png b/mobile/android/base/resources/drawable-hdpi/overlay_check.png
new file mode 100644
index 000000000..b69ed0dea
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/overlay_check.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/pause.png b/mobile/android/base/resources/drawable-hdpi/pause.png
new file mode 100644
index 000000000..17266e608
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/pause.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/phone.png b/mobile/android/base/resources/drawable-hdpi/phone.png
new file mode 100644
index 000000000..7fad6f05b
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/phone.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/pin.png b/mobile/android/base/resources/drawable-hdpi/pin.png
new file mode 100644
index 000000000..8111a04dc
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/pin.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/play.png b/mobile/android/base/resources/drawable-hdpi/play.png
new file mode 100644
index 000000000..8e599c16d
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/play.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/private_masq.png b/mobile/android/base/resources/drawable-hdpi/private_masq.png
new file mode 100644
index 000000000..8791f24bc
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/private_masq.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/progress.9.png b/mobile/android/base/resources/drawable-hdpi/progress.9.png
new file mode 100644
index 000000000..5293a77d4
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/progress.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/reader.png b/mobile/android/base/resources/drawable-hdpi/reader.png
new file mode 100644
index 000000000..2ac1b8d46
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/reader.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/reader_active.png b/mobile/android/base/resources/drawable-hdpi/reader_active.png
new file mode 100644
index 000000000..99851ae7c
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/reader_active.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/reading_list_folder.png b/mobile/android/base/resources/drawable-hdpi/reading_list_folder.png
new file mode 100644
index 000000000..052994110
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/reading_list_folder.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/search_clear.png b/mobile/android/base/resources/drawable-hdpi/search_clear.png
new file mode 100644
index 000000000..4dbefcb68
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/search_clear.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/search_history.png b/mobile/android/base/resources/drawable-hdpi/search_history.png
new file mode 100644
index 000000000..a552fef20
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/search_history.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/search_icon_active.png b/mobile/android/base/resources/drawable-hdpi/search_icon_active.png
new file mode 100644
index 000000000..65e921896
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/search_icon_active.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/search_icon_inactive.png b/mobile/android/base/resources/drawable-hdpi/search_icon_inactive.png
new file mode 100644
index 000000000..b777bc3be
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/search_icon_inactive.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/search_launcher.png b/mobile/android/base/resources/drawable-hdpi/search_launcher.png
new file mode 100644
index 000000000..70c0d7630
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/search_launcher.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/search_plus.png b/mobile/android/base/resources/drawable-hdpi/search_plus.png
new file mode 100644
index 000000000..e20d9c6d2
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/search_plus.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/settings_notifications.png b/mobile/android/base/resources/drawable-hdpi/settings_notifications.png
new file mode 100644
index 000000000..d2b23cf74
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/settings_notifications.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/shareplane.png b/mobile/android/base/resources/drawable-hdpi/shareplane.png
new file mode 100644
index 000000000..748893b49
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/shareplane.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/shield_disabled.png b/mobile/android/base/resources/drawable-hdpi/shield_disabled.png
new file mode 100644
index 000000000..90f669af2
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/shield_disabled.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/shield_enabled.png b/mobile/android/base/resources/drawable-hdpi/shield_enabled.png
new file mode 100644
index 000000000..ff6fb6d80
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/shield_enabled.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/status_icon_readercache.png b/mobile/android/base/resources/drawable-hdpi/status_icon_readercache.png
new file mode 100644
index 000000000..142ac4bdd
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/status_icon_readercache.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/suggestedsites_amazon.png b/mobile/android/base/resources/drawable-hdpi/suggestedsites_amazon.png
new file mode 100644
index 000000000..776cc4934
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/suggestedsites_amazon.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/suggestedsites_facebook.png b/mobile/android/base/resources/drawable-hdpi/suggestedsites_facebook.png
new file mode 100644
index 000000000..340b9a5e4
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/suggestedsites_facebook.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/suggestedsites_twitter.png b/mobile/android/base/resources/drawable-hdpi/suggestedsites_twitter.png
new file mode 100644
index 000000000..f3d9fd238
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/suggestedsites_twitter.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/suggestedsites_wikipedia.png b/mobile/android/base/resources/drawable-hdpi/suggestedsites_wikipedia.png
new file mode 100644
index 000000000..9c6efc14a
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/suggestedsites_wikipedia.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/suggestedsites_youtube.png b/mobile/android/base/resources/drawable-hdpi/suggestedsites_youtube.png
new file mode 100644
index 000000000..7e73e6075
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/suggestedsites_youtube.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/switch_button_icon.png b/mobile/android/base/resources/drawable-hdpi/switch_button_icon.png
new file mode 100644
index 000000000..56c4cd050
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/switch_button_icon.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/tab_audio_playing.png b/mobile/android/base/resources/drawable-hdpi/tab_audio_playing.png
new file mode 100644
index 000000000..4635cf5ae
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/tab_audio_playing.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/tab_close.png b/mobile/android/base/resources/drawable-hdpi/tab_close.png
new file mode 100644
index 000000000..7aadf4c45
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/tab_close.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/tab_close_active.png b/mobile/android/base/resources/drawable-hdpi/tab_close_active.png
new file mode 100644
index 000000000..39752bb91
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/tab_close_active.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/tab_indicator_background.9.png b/mobile/android/base/resources/drawable-hdpi/tab_indicator_background.9.png
new file mode 100644
index 000000000..e225e8ce9
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/tab_indicator_background.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/tab_indicator_divider.9.png b/mobile/android/base/resources/drawable-hdpi/tab_indicator_divider.9.png
new file mode 100644
index 000000000..f1338d803
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/tab_indicator_divider.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/tab_indicator_selected.9.png b/mobile/android/base/resources/drawable-hdpi/tab_indicator_selected.9.png
new file mode 100644
index 000000000..7ebd02f6f
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/tab_indicator_selected.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/tab_indicator_selected_focused.9.png b/mobile/android/base/resources/drawable-hdpi/tab_indicator_selected_focused.9.png
new file mode 100644
index 000000000..272bbaead
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/tab_indicator_selected_focused.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/tab_new.png b/mobile/android/base/resources/drawable-hdpi/tab_new.png
new file mode 100644
index 000000000..8e8557c83
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/tab_new.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/tab_preview_masq.png b/mobile/android/base/resources/drawable-hdpi/tab_preview_masq.png
new file mode 100644
index 000000000..69dd8a093
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/tab_preview_masq.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/tabs_count.png b/mobile/android/base/resources/drawable-hdpi/tabs_count.png
new file mode 100644
index 000000000..c8db01a1a
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/tabs_count.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/tabs_count_foreground.png b/mobile/android/base/resources/drawable-hdpi/tabs_count_foreground.png
new file mode 100644
index 000000000..c9b9c055b
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/tabs_count_foreground.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/tabs_normal.png b/mobile/android/base/resources/drawable-hdpi/tabs_normal.png
new file mode 100644
index 000000000..49b4ec8bd
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/tabs_normal.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/tabs_panel_nav_back.png b/mobile/android/base/resources/drawable-hdpi/tabs_panel_nav_back.png
new file mode 100644
index 000000000..cc74ae4d6
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/tabs_panel_nav_back.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/tabs_private.png b/mobile/android/base/resources/drawable-hdpi/tabs_private.png
new file mode 100644
index 000000000..50ff11309
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/tabs_private.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/tip_addsearch.png b/mobile/android/base/resources/drawable-hdpi/tip_addsearch.png
new file mode 100644
index 000000000..8f02949c5
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/tip_addsearch.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/top_site_add.png b/mobile/android/base/resources/drawable-hdpi/top_site_add.png
new file mode 100644
index 000000000..cbfd8e4d4
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/top_site_add.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/tracking_protection_toolbar_illustration.png b/mobile/android/base/resources/drawable-hdpi/tracking_protection_toolbar_illustration.png
new file mode 100644
index 000000000..9984d7f3e
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/tracking_protection_toolbar_illustration.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/undo_button_icon.png b/mobile/android/base/resources/drawable-hdpi/undo_button_icon.png
new file mode 100644
index 000000000..9964ccd0f
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/undo_button_icon.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/url_bar_entry_default.9.png b/mobile/android/base/resources/drawable-hdpi/url_bar_entry_default.9.png
new file mode 100644
index 000000000..1d8cc9055
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/url_bar_entry_default.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/url_bar_entry_default_pb.9.png b/mobile/android/base/resources/drawable-hdpi/url_bar_entry_default_pb.9.png
new file mode 100644
index 000000000..0bd6115fc
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/url_bar_entry_default_pb.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/url_bar_entry_pressed.9.png b/mobile/android/base/resources/drawable-hdpi/url_bar_entry_pressed.9.png
new file mode 100644
index 000000000..91be77476
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/url_bar_entry_pressed.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/url_bar_entry_pressed_pb.9.png b/mobile/android/base/resources/drawable-hdpi/url_bar_entry_pressed_pb.9.png
new file mode 100644
index 000000000..6b076e75e
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/url_bar_entry_pressed_pb.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/urlbar_stop.png b/mobile/android/base/resources/drawable-hdpi/urlbar_stop.png
new file mode 100644
index 000000000..3e8ac68fc
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/urlbar_stop.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/validation_arrow.png b/mobile/android/base/resources/drawable-hdpi/validation_arrow.png
new file mode 100644
index 000000000..c0563ce94
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/validation_arrow.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/validation_arrow_inverted.png b/mobile/android/base/resources/drawable-hdpi/validation_arrow_inverted.png
new file mode 100644
index 000000000..165d3c2e1
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/validation_arrow_inverted.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/validation_bg.9.png b/mobile/android/base/resources/drawable-hdpi/validation_bg.9.png
new file mode 100644
index 000000000..bd83160e7
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/validation_bg.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/warning_major.png b/mobile/android/base/resources/drawable-hdpi/warning_major.png
new file mode 100644
index 000000000..61cd21f97
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/warning_major.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/warning_minor.png b/mobile/android/base/resources/drawable-hdpi/warning_minor.png
new file mode 100644
index 000000000..c78b77a13
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/warning_minor.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-hdpi/widget_bg.9.png b/mobile/android/base/resources/drawable-hdpi/widget_bg.9.png
new file mode 100644
index 000000000..a5df36d99
--- /dev/null
+++ b/mobile/android/base/resources/drawable-hdpi/widget_bg.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-large-hdpi-v11/ic_menu_back.png b/mobile/android/base/resources/drawable-large-hdpi-v11/ic_menu_back.png
new file mode 100644
index 000000000..d18fc9cd5
--- /dev/null
+++ b/mobile/android/base/resources/drawable-large-hdpi-v11/ic_menu_back.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-large-hdpi-v11/ic_menu_forward.png b/mobile/android/base/resources/drawable-large-hdpi-v11/ic_menu_forward.png
new file mode 100644
index 000000000..22a822d67
--- /dev/null
+++ b/mobile/android/base/resources/drawable-large-hdpi-v11/ic_menu_forward.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-large-hdpi-v11/ic_menu_reload.png b/mobile/android/base/resources/drawable-large-hdpi-v11/ic_menu_reload.png
new file mode 100644
index 000000000..7cc5d918b
--- /dev/null
+++ b/mobile/android/base/resources/drawable-large-hdpi-v11/ic_menu_reload.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-large-hdpi-v11/tabs_count.png b/mobile/android/base/resources/drawable-large-hdpi-v11/tabs_count.png
new file mode 100644
index 000000000..7db22b0ca
--- /dev/null
+++ b/mobile/android/base/resources/drawable-large-hdpi-v11/tabs_count.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-large-hdpi-v11/tabs_count_foreground.png b/mobile/android/base/resources/drawable-large-hdpi-v11/tabs_count_foreground.png
new file mode 100644
index 000000000..3875c80cc
--- /dev/null
+++ b/mobile/android/base/resources/drawable-large-hdpi-v11/tabs_count_foreground.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-large-hdpi-v11/toolbar_favicon_default.png b/mobile/android/base/resources/drawable-large-hdpi-v11/toolbar_favicon_default.png
new file mode 100644
index 000000000..9daea10b7
--- /dev/null
+++ b/mobile/android/base/resources/drawable-large-hdpi-v11/toolbar_favicon_default.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-large-hdpi-v11/url_bar_entry_default.9.png b/mobile/android/base/resources/drawable-large-hdpi-v11/url_bar_entry_default.9.png
new file mode 100644
index 000000000..a2e973ea0
--- /dev/null
+++ b/mobile/android/base/resources/drawable-large-hdpi-v11/url_bar_entry_default.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-large-hdpi-v11/url_bar_entry_default_pb.9.png b/mobile/android/base/resources/drawable-large-hdpi-v11/url_bar_entry_default_pb.9.png
new file mode 100644
index 000000000..0e91b33ab
--- /dev/null
+++ b/mobile/android/base/resources/drawable-large-hdpi-v11/url_bar_entry_default_pb.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-large-hdpi-v11/url_bar_entry_pressed.9.png b/mobile/android/base/resources/drawable-large-hdpi-v11/url_bar_entry_pressed.9.png
new file mode 100644
index 000000000..a55ad0b9c
--- /dev/null
+++ b/mobile/android/base/resources/drawable-large-hdpi-v11/url_bar_entry_pressed.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-large-hdpi-v11/url_bar_entry_pressed_pb.9.png b/mobile/android/base/resources/drawable-large-hdpi-v11/url_bar_entry_pressed_pb.9.png
new file mode 100644
index 000000000..ac6476de7
--- /dev/null
+++ b/mobile/android/base/resources/drawable-large-hdpi-v11/url_bar_entry_pressed_pb.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-large-v11/browser_toolbar_action_bar_button.xml b/mobile/android/base/resources/drawable-large-v11/browser_toolbar_action_bar_button.xml
new file mode 100644
index 000000000..e1654c1cf
--- /dev/null
+++ b/mobile/android/base/resources/drawable-large-v11/browser_toolbar_action_bar_button.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+ <item gecko:state_private="true"
+ android:state_pressed="true"
+ android:state_enabled="true">
+
+ <inset android:insetTop="@dimen/tablet_browser_toolbar_menu_item_inset_vertical"
+ android:insetBottom="@dimen/tablet_browser_toolbar_menu_item_inset_vertical"
+ android:insetLeft="@dimen/tablet_browser_toolbar_menu_item_inset_horizontal"
+ android:insetRight="@dimen/tablet_browser_toolbar_menu_item_inset_horizontal">
+ <shape android:shape="rectangle">
+ <solid android:color="@color/text_and_tabs_tray_grey"/>
+ <corners android:radius="@dimen/standard_corner_radius"/>
+ </shape>
+ </inset>
+
+ </item>
+
+ <item gecko:state_private="true"
+ android:state_focused="true"
+ android:state_pressed="false">
+
+ <inset android:insetTop="@dimen/tablet_browser_toolbar_menu_item_inset_vertical"
+ android:insetBottom="@dimen/tablet_browser_toolbar_menu_item_inset_vertical"
+ android:insetLeft="@dimen/tablet_browser_toolbar_menu_item_inset_horizontal"
+ android:insetRight="@dimen/tablet_browser_toolbar_menu_item_inset_horizontal">
+ <shape android:shape="rectangle">
+ <solid android:color="@color/placeholder_active_grey"/>
+ <corners android:radius="@dimen/standard_corner_radius"/>
+ </shape>
+ </inset>
+
+ </item>
+
+ <item android:state_pressed="true"
+ android:state_enabled="true">
+
+ <inset android:insetTop="@dimen/tablet_browser_toolbar_menu_item_inset_vertical"
+ android:insetBottom="@dimen/tablet_browser_toolbar_menu_item_inset_vertical"
+ android:insetLeft="@dimen/tablet_browser_toolbar_menu_item_inset_horizontal"
+ android:insetRight="@dimen/tablet_browser_toolbar_menu_item_inset_horizontal">
+ <shape android:shape="rectangle">
+ <solid android:color="@color/toolbar_grey_pressed"/>
+ <corners android:radius="@dimen/standard_corner_radius"/>
+ </shape>
+ </inset>
+
+ </item>
+
+ <item android:state_focused="true"
+ android:state_pressed="false">
+
+ <inset android:insetTop="@dimen/tablet_browser_toolbar_menu_item_inset_vertical"
+ android:insetBottom="@dimen/tablet_browser_toolbar_menu_item_inset_vertical"
+ android:insetLeft="@dimen/tablet_browser_toolbar_menu_item_inset_horizontal"
+ android:insetRight="@dimen/tablet_browser_toolbar_menu_item_inset_horizontal">
+ <shape android:shape="rectangle">
+ <solid android:color="@color/tablet_highlight_focused"/>
+ <corners android:radius="@dimen/standard_corner_radius"/>
+ </shape>
+ </inset>
+
+ </item>
+
+ <item>
+ <shape android:shape="rectangle">
+ <solid android:color="@android:color/transparent"/>
+ </shape>
+ </item>
+
+</selector>
diff --git a/mobile/android/base/resources/drawable-large-v11/url_bar_nav_button.xml b/mobile/android/base/resources/drawable-large-v11/url_bar_nav_button.xml
new file mode 100644
index 000000000..0a3417927
--- /dev/null
+++ b/mobile/android/base/resources/drawable-large-v11/url_bar_nav_button.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+ <!-- private pressed state -->
+ <item gecko:state_private="true"
+ android:state_pressed="true"
+ android:drawable="@color/text_and_tabs_tray_grey"/>
+
+ <!-- focused state -->
+ <item gecko:state_private="true"
+ android:state_focused="true"
+ android:state_pressed="false"
+ android:drawable="@color/placeholder_active_grey"/>
+
+ <!-- pressed state -->
+ <item android:state_pressed="true"
+ android:drawable="@color/toolbar_grey_pressed"/>
+
+ <!-- focused state -->
+ <item android:state_focused="true"
+ android:state_pressed="false"
+ android:drawable="@color/tablet_highlight_focused"/>
+
+ <!-- private browsing mode -->
+ <item gecko:state_private="true"
+ android:drawable="@color/tabs_tray_grey_pressed"/>
+
+ <!-- normal mode -->
+ <item android:drawable="@color/toolbar_grey"/>
+
+</selector>
diff --git a/mobile/android/base/resources/drawable-large-xhdpi-v11/ic_menu_back.png b/mobile/android/base/resources/drawable-large-xhdpi-v11/ic_menu_back.png
new file mode 100644
index 000000000..78a33ffab
--- /dev/null
+++ b/mobile/android/base/resources/drawable-large-xhdpi-v11/ic_menu_back.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-large-xhdpi-v11/ic_menu_forward.png b/mobile/android/base/resources/drawable-large-xhdpi-v11/ic_menu_forward.png
new file mode 100644
index 000000000..7a284903f
--- /dev/null
+++ b/mobile/android/base/resources/drawable-large-xhdpi-v11/ic_menu_forward.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-large-xhdpi-v11/ic_menu_reload.png b/mobile/android/base/resources/drawable-large-xhdpi-v11/ic_menu_reload.png
new file mode 100644
index 000000000..a9c7b3f62
--- /dev/null
+++ b/mobile/android/base/resources/drawable-large-xhdpi-v11/ic_menu_reload.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-large-xhdpi-v11/tabs_count.png b/mobile/android/base/resources/drawable-large-xhdpi-v11/tabs_count.png
new file mode 100644
index 000000000..16e41c0ce
--- /dev/null
+++ b/mobile/android/base/resources/drawable-large-xhdpi-v11/tabs_count.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-large-xhdpi-v11/tabs_count_foreground.png b/mobile/android/base/resources/drawable-large-xhdpi-v11/tabs_count_foreground.png
new file mode 100644
index 000000000..85dc05e4a
--- /dev/null
+++ b/mobile/android/base/resources/drawable-large-xhdpi-v11/tabs_count_foreground.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-large-xhdpi-v11/toolbar_favicon_default.png b/mobile/android/base/resources/drawable-large-xhdpi-v11/toolbar_favicon_default.png
new file mode 100644
index 000000000..1fb9f7386
--- /dev/null
+++ b/mobile/android/base/resources/drawable-large-xhdpi-v11/toolbar_favicon_default.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-large-xhdpi-v11/url_bar_entry_default.9.png b/mobile/android/base/resources/drawable-large-xhdpi-v11/url_bar_entry_default.9.png
new file mode 100644
index 000000000..2c8c0d80f
--- /dev/null
+++ b/mobile/android/base/resources/drawable-large-xhdpi-v11/url_bar_entry_default.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-large-xhdpi-v11/url_bar_entry_default_pb.9.png b/mobile/android/base/resources/drawable-large-xhdpi-v11/url_bar_entry_default_pb.9.png
new file mode 100644
index 000000000..670104ed3
--- /dev/null
+++ b/mobile/android/base/resources/drawable-large-xhdpi-v11/url_bar_entry_default_pb.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-large-xhdpi-v11/url_bar_entry_pressed.9.png b/mobile/android/base/resources/drawable-large-xhdpi-v11/url_bar_entry_pressed.9.png
new file mode 100644
index 000000000..26dc0221b
--- /dev/null
+++ b/mobile/android/base/resources/drawable-large-xhdpi-v11/url_bar_entry_pressed.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-large-xhdpi-v11/url_bar_entry_pressed_pb.9.png b/mobile/android/base/resources/drawable-large-xhdpi-v11/url_bar_entry_pressed_pb.9.png
new file mode 100644
index 000000000..224738af6
--- /dev/null
+++ b/mobile/android/base/resources/drawable-large-xhdpi-v11/url_bar_entry_pressed_pb.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-large-xxhdpi-v11/ic_menu_back.png b/mobile/android/base/resources/drawable-large-xxhdpi-v11/ic_menu_back.png
new file mode 100644
index 000000000..33b45b31d
--- /dev/null
+++ b/mobile/android/base/resources/drawable-large-xxhdpi-v11/ic_menu_back.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-large-xxhdpi-v11/ic_menu_forward.png b/mobile/android/base/resources/drawable-large-xxhdpi-v11/ic_menu_forward.png
new file mode 100644
index 000000000..ac5166cd8
--- /dev/null
+++ b/mobile/android/base/resources/drawable-large-xxhdpi-v11/ic_menu_forward.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-large-xxhdpi-v11/ic_menu_reload.png b/mobile/android/base/resources/drawable-large-xxhdpi-v11/ic_menu_reload.png
new file mode 100644
index 000000000..d582128a1
--- /dev/null
+++ b/mobile/android/base/resources/drawable-large-xxhdpi-v11/ic_menu_reload.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-large-xxhdpi-v11/tabs_count.png b/mobile/android/base/resources/drawable-large-xxhdpi-v11/tabs_count.png
new file mode 100644
index 000000000..af9ee4d3a
--- /dev/null
+++ b/mobile/android/base/resources/drawable-large-xxhdpi-v11/tabs_count.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-large-xxhdpi-v11/tabs_count_foreground.png b/mobile/android/base/resources/drawable-large-xxhdpi-v11/tabs_count_foreground.png
new file mode 100644
index 000000000..fa0512035
--- /dev/null
+++ b/mobile/android/base/resources/drawable-large-xxhdpi-v11/tabs_count_foreground.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-large-xxhdpi-v11/toolbar_favicon_default.png b/mobile/android/base/resources/drawable-large-xxhdpi-v11/toolbar_favicon_default.png
new file mode 100644
index 000000000..bbccd51ef
--- /dev/null
+++ b/mobile/android/base/resources/drawable-large-xxhdpi-v11/toolbar_favicon_default.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-large-xxhdpi-v11/url_bar_entry_default.9.png b/mobile/android/base/resources/drawable-large-xxhdpi-v11/url_bar_entry_default.9.png
new file mode 100644
index 000000000..1099a2d80
--- /dev/null
+++ b/mobile/android/base/resources/drawable-large-xxhdpi-v11/url_bar_entry_default.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-large-xxhdpi-v11/url_bar_entry_default_pb.9.png b/mobile/android/base/resources/drawable-large-xxhdpi-v11/url_bar_entry_default_pb.9.png
new file mode 100644
index 000000000..3aba71bae
--- /dev/null
+++ b/mobile/android/base/resources/drawable-large-xxhdpi-v11/url_bar_entry_default_pb.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-large-xxhdpi-v11/url_bar_entry_pressed.9.png b/mobile/android/base/resources/drawable-large-xxhdpi-v11/url_bar_entry_pressed.9.png
new file mode 100644
index 000000000..779f2721f
--- /dev/null
+++ b/mobile/android/base/resources/drawable-large-xxhdpi-v11/url_bar_entry_pressed.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-large-xxhdpi-v11/url_bar_entry_pressed_pb.9.png b/mobile/android/base/resources/drawable-large-xxhdpi-v11/url_bar_entry_pressed_pb.9.png
new file mode 100644
index 000000000..e15f58ab2
--- /dev/null
+++ b/mobile/android/base/resources/drawable-large-xxhdpi-v11/url_bar_entry_pressed_pb.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-nodpi/cloud.png b/mobile/android/base/resources/drawable-nodpi/cloud.png
new file mode 100644
index 000000000..22261d812
--- /dev/null
+++ b/mobile/android/base/resources/drawable-nodpi/cloud.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-nodpi/firstrun_account.png b/mobile/android/base/resources/drawable-nodpi/firstrun_account.png
new file mode 100644
index 000000000..38c77afaa
--- /dev/null
+++ b/mobile/android/base/resources/drawable-nodpi/firstrun_account.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-nodpi/firstrun_bookmarks.png b/mobile/android/base/resources/drawable-nodpi/firstrun_bookmarks.png
new file mode 100644
index 000000000..28dd68f52
--- /dev/null
+++ b/mobile/android/base/resources/drawable-nodpi/firstrun_bookmarks.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-nodpi/firstrun_data_off.png b/mobile/android/base/resources/drawable-nodpi/firstrun_data_off.png
new file mode 100644
index 000000000..5985b61c5
--- /dev/null
+++ b/mobile/android/base/resources/drawable-nodpi/firstrun_data_off.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-nodpi/firstrun_data_on.png b/mobile/android/base/resources/drawable-nodpi/firstrun_data_on.png
new file mode 100644
index 000000000..3dc037a48
--- /dev/null
+++ b/mobile/android/base/resources/drawable-nodpi/firstrun_data_on.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-nodpi/firstrun_readerview.png b/mobile/android/base/resources/drawable-nodpi/firstrun_readerview.png
new file mode 100644
index 000000000..c611f08c9
--- /dev/null
+++ b/mobile/android/base/resources/drawable-nodpi/firstrun_readerview.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-nodpi/firstrun_signin.png b/mobile/android/base/resources/drawable-nodpi/firstrun_signin.png
new file mode 100644
index 000000000..38d1c8c86
--- /dev/null
+++ b/mobile/android/base/resources/drawable-nodpi/firstrun_signin.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-nodpi/firstrun_sync.png b/mobile/android/base/resources/drawable-nodpi/firstrun_sync.png
new file mode 100644
index 000000000..9f2f3cbc8
--- /dev/null
+++ b/mobile/android/base/resources/drawable-nodpi/firstrun_sync.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-nodpi/firstrun_tabqueue_off.png b/mobile/android/base/resources/drawable-nodpi/firstrun_tabqueue_off.png
new file mode 100644
index 000000000..9e986685a
--- /dev/null
+++ b/mobile/android/base/resources/drawable-nodpi/firstrun_tabqueue_off.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-nodpi/firstrun_tabqueue_on.png b/mobile/android/base/resources/drawable-nodpi/firstrun_tabqueue_on.png
new file mode 100644
index 000000000..5439f7a5c
--- /dev/null
+++ b/mobile/android/base/resources/drawable-nodpi/firstrun_tabqueue_on.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-nodpi/firstrun_urlbar.png b/mobile/android/base/resources/drawable-nodpi/firstrun_urlbar.png
new file mode 100644
index 000000000..779cdd972
--- /dev/null
+++ b/mobile/android/base/resources/drawable-nodpi/firstrun_urlbar.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-nodpi/icon_recent.png b/mobile/android/base/resources/drawable-nodpi/icon_recent.png
new file mode 100755
index 000000000..d93658f08
--- /dev/null
+++ b/mobile/android/base/resources/drawable-nodpi/icon_recent.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-v12/toast_button_background.xml b/mobile/android/base/resources/drawable-v12/toast_button_background.xml
new file mode 100644
index 000000000..856d070c2
--- /dev/null
+++ b/mobile/android/base/resources/drawable-v12/toast_button_background.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_pressed="true">
+ <shape android:shape="rectangle">
+ <solid android:color="@color/toast_button_pressed" />
+ <corners
+ android:topRightRadius="@dimen/toast_button_corner_radius"
+ android:bottomRightRadius="@dimen/toast_button_corner_radius"
+ android:topLeftRadius="0dp"
+ android:bottomLeftRadius="0dp" />
+ </shape>
+ </item>
+ <item>
+ <shape android:shape="rectangle">
+ <solid android:color="@color/toast_button_background" />
+ <corners
+ android:topRightRadius="@dimen/toast_button_corner_radius"
+ android:bottomRightRadius="@dimen/toast_button_corner_radius"
+ android:topLeftRadius="0dp"
+ android:bottomLeftRadius="0dp" />
+ </shape>
+ </item>
+</selector>
diff --git a/mobile/android/base/resources/drawable-v21/logo.xml b/mobile/android/base/resources/drawable-v21/logo.xml
new file mode 100644
index 000000000..568cbec00
--- /dev/null
+++ b/mobile/android/base/resources/drawable-v21/logo.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- The action bar scales the application icon to be too large (bug 1132751)
+ so add some padding to prevent it from scaling so much. -->
+<inset
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:drawable="@drawable/icon"
+ android:insetTop="6dp"
+ android:insetBottom="6dp"
+ android:insetLeft="6dp"
+ android:insetRight="6dp"
+ />
diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/alert_camera.png b/mobile/android/base/resources/drawable-xhdpi-v11/alert_camera.png
new file mode 100644
index 000000000..ead824430
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi-v11/alert_camera.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/alert_download.png b/mobile/android/base/resources/drawable-xhdpi-v11/alert_download.png
new file mode 100644
index 000000000..1b8f59e56
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi-v11/alert_download.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/alert_guest.png b/mobile/android/base/resources/drawable-xhdpi-v11/alert_guest.png
new file mode 100644
index 000000000..1a17f03be
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi-v11/alert_guest.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/alert_mic.png b/mobile/android/base/resources/drawable-xhdpi-v11/alert_mic.png
new file mode 100644
index 000000000..79489919e
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi-v11/alert_mic.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/alert_mic_camera.png b/mobile/android/base/resources/drawable-xhdpi-v11/alert_mic_camera.png
new file mode 100644
index 000000000..26ba6520b
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi-v11/alert_mic_camera.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_back.png b/mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_back.png
new file mode 100644
index 000000000..c26cdd753
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_back.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_bookmark_add.png b/mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_bookmark_add.png
new file mode 100644
index 000000000..8084baf98
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_bookmark_add.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_forward.png b/mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_forward.png
new file mode 100644
index 000000000..2d6ba52ac
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_forward.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_reload.png b/mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_reload.png
new file mode 100644
index 000000000..d456630ee
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_reload.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/ic_status_logo.png b/mobile/android/base/resources/drawable-xhdpi-v11/ic_status_logo.png
new file mode 100644
index 000000000..c9045fd0e
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi-v11/ic_status_logo.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/star_blue.png b/mobile/android/base/resources/drawable-xhdpi-v11/star_blue.png
new file mode 100644
index 000000000..56c9367c0
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi-v11/star_blue.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/ab_add_search_engine.png b/mobile/android/base/resources/drawable-xhdpi/ab_add_search_engine.png
new file mode 100644
index 000000000..2ba5dc0b7
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/ab_add_search_engine.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/ab_copy.png b/mobile/android/base/resources/drawable-xhdpi/ab_copy.png
new file mode 100644
index 000000000..131b4bb1b
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/ab_copy.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/ab_cut.png b/mobile/android/base/resources/drawable-xhdpi/ab_cut.png
new file mode 100644
index 000000000..0805bbbef
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/ab_cut.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/ab_done.png b/mobile/android/base/resources/drawable-xhdpi/ab_done.png
new file mode 100644
index 000000000..0639b034e
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/ab_done.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/ab_mic.png b/mobile/android/base/resources/drawable-xhdpi/ab_mic.png
new file mode 100644
index 000000000..79c459bdb
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/ab_mic.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/ab_paste.png b/mobile/android/base/resources/drawable-xhdpi/ab_paste.png
new file mode 100644
index 000000000..744320f16
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/ab_paste.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/ab_qrcode.png b/mobile/android/base/resources/drawable-xhdpi/ab_qrcode.png
new file mode 100644
index 000000000..d0d4c3a0c
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/ab_qrcode.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/ab_search.png b/mobile/android/base/resources/drawable-xhdpi/ab_search.png
new file mode 100644
index 000000000..67063dd6c
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/ab_search.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/ab_select_all.png b/mobile/android/base/resources/drawable-xhdpi/ab_select_all.png
new file mode 100644
index 000000000..028299a83
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/ab_select_all.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/alert_camera.png b/mobile/android/base/resources/drawable-xhdpi/alert_camera.png
new file mode 100644
index 000000000..bfc736c55
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/alert_camera.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/alert_download.png b/mobile/android/base/resources/drawable-xhdpi/alert_download.png
new file mode 100644
index 000000000..283ba0867
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/alert_download.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/alert_download_animation_1.png b/mobile/android/base/resources/drawable-xhdpi/alert_download_animation_1.png
new file mode 100644
index 000000000..22d6288ea
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/alert_download_animation_1.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/alert_download_animation_2.png b/mobile/android/base/resources/drawable-xhdpi/alert_download_animation_2.png
new file mode 100644
index 000000000..dc402e9b8
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/alert_download_animation_2.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/alert_download_animation_3.png b/mobile/android/base/resources/drawable-xhdpi/alert_download_animation_3.png
new file mode 100644
index 000000000..719bcbdab
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/alert_download_animation_3.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/alert_download_animation_4.png b/mobile/android/base/resources/drawable-xhdpi/alert_download_animation_4.png
new file mode 100644
index 000000000..4319d0039
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/alert_download_animation_4.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/alert_download_animation_5.png b/mobile/android/base/resources/drawable-xhdpi/alert_download_animation_5.png
new file mode 100644
index 000000000..f8d1a15d6
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/alert_download_animation_5.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/alert_download_animation_6.png b/mobile/android/base/resources/drawable-xhdpi/alert_download_animation_6.png
new file mode 100644
index 000000000..dffe36338
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/alert_download_animation_6.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/alert_guest.png b/mobile/android/base/resources/drawable-xhdpi/alert_guest.png
new file mode 100644
index 000000000..f48ae407c
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/alert_guest.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/alert_mic.png b/mobile/android/base/resources/drawable-xhdpi/alert_mic.png
new file mode 100644
index 000000000..527d42c42
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/alert_mic.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/alert_mic_camera.png b/mobile/android/base/resources/drawable-xhdpi/alert_mic_camera.png
new file mode 100644
index 000000000..1e2c29861
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/alert_mic_camera.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/arrow_up.png b/mobile/android/base/resources/drawable-xhdpi/arrow_up.png
new file mode 100644
index 000000000..ea344e7a4
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/arrow_up.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/blank.png b/mobile/android/base/resources/drawable-xhdpi/blank.png
new file mode 100644
index 000000000..c6efe7e8e
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/blank.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/casting.png b/mobile/android/base/resources/drawable-xhdpi/casting.png
new file mode 100644
index 000000000..a20840234
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/casting.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/casting_active.png b/mobile/android/base/resources/drawable-xhdpi/casting_active.png
new file mode 100644
index 000000000..0f5d93c73
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/casting_active.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/close.png b/mobile/android/base/resources/drawable-xhdpi/close.png
new file mode 100644
index 000000000..e23ea4666
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/close.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/close_edit_mode_dark.png b/mobile/android/base/resources/drawable-xhdpi/close_edit_mode_dark.png
new file mode 100644
index 000000000..93bee42da
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/close_edit_mode_dark.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/close_edit_mode_light.png b/mobile/android/base/resources/drawable-xhdpi/close_edit_mode_light.png
new file mode 100644
index 000000000..11e9d19ce
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/close_edit_mode_light.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/color_picker_row_bg.9.png b/mobile/android/base/resources/drawable-xhdpi/color_picker_row_bg.9.png
new file mode 100644
index 000000000..106c4c0b7
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/color_picker_row_bg.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/device_desktop.png b/mobile/android/base/resources/drawable-xhdpi/device_desktop.png
new file mode 100644
index 000000000..5b0abd02d
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/device_desktop.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/device_mobile.png b/mobile/android/base/resources/drawable-xhdpi/device_mobile.png
new file mode 100644
index 000000000..ee665d2b6
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/device_mobile.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/dropshadow.9.png b/mobile/android/base/resources/drawable-xhdpi/dropshadow.9.png
new file mode 100644
index 000000000..5f346ab70
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/dropshadow.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/favicon_globe.png b/mobile/android/base/resources/drawable-xhdpi/favicon_globe.png
new file mode 100644
index 000000000..e4d594911
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/favicon_globe.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/find_close.png b/mobile/android/base/resources/drawable-xhdpi/find_close.png
new file mode 100644
index 000000000..a76c69e09
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/find_close.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/find_next.png b/mobile/android/base/resources/drawable-xhdpi/find_next.png
new file mode 100644
index 000000000..3a7dda2d9
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/find_next.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/find_prev.png b/mobile/android/base/resources/drawable-xhdpi/find_prev.png
new file mode 100644
index 000000000..9e3c8f2da
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/find_prev.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/firefox_settings_alert.png b/mobile/android/base/resources/drawable-xhdpi/firefox_settings_alert.png
new file mode 100644
index 000000000..b62d67c88
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/firefox_settings_alert.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/flat_icon.png b/mobile/android/base/resources/drawable-xhdpi/flat_icon.png
new file mode 100644
index 000000000..bc9569f47
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/flat_icon.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/folder_closed.png b/mobile/android/base/resources/drawable-xhdpi/folder_closed.png
new file mode 100644
index 000000000..63bb529a3
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/folder_closed.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/globe_light.png b/mobile/android/base/resources/drawable-xhdpi/globe_light.png
new file mode 100644
index 000000000..1bb177089
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/globe_light.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/grid_icon_bg_activated.9.png b/mobile/android/base/resources/drawable-xhdpi/grid_icon_bg_activated.9.png
new file mode 100644
index 000000000..ef25e2076
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/grid_icon_bg_activated.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/grid_icon_bg_focused.9.png b/mobile/android/base/resources/drawable-xhdpi/grid_icon_bg_focused.9.png
new file mode 100644
index 000000000..27660f0d3
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/grid_icon_bg_focused.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/handle_end.png b/mobile/android/base/resources/drawable-xhdpi/handle_end.png
new file mode 100644
index 000000000..a637c3746
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/handle_end.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/handle_middle.png b/mobile/android/base/resources/drawable-xhdpi/handle_middle.png
new file mode 100644
index 000000000..95b85bc23
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/handle_middle.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/handle_start.png b/mobile/android/base/resources/drawable-xhdpi/handle_start.png
new file mode 100644
index 000000000..05532b239
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/handle_start.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/helper_readerview_bookmark.webp b/mobile/android/base/resources/drawable-xhdpi/helper_readerview_bookmark.webp
new file mode 100644
index 000000000..c7ef9cc7d
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/helper_readerview_bookmark.webp
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/home_group_collapsed.png b/mobile/android/base/resources/drawable-xhdpi/home_group_collapsed.png
new file mode 100644
index 000000000..80aea0ddc
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/home_group_collapsed.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/home_tab_menu_strip.9.png b/mobile/android/base/resources/drawable-xhdpi/home_tab_menu_strip.9.png
new file mode 100644
index 000000000..b9847a1a3
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/home_tab_menu_strip.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/homepage_banner_firstrun.png b/mobile/android/base/resources/drawable-xhdpi/homepage_banner_firstrun.png
new file mode 100644
index 000000000..b53bcb944
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/homepage_banner_firstrun.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/ic_action_settings.png b/mobile/android/base/resources/drawable-xhdpi/ic_action_settings.png
new file mode 100644
index 000000000..c76a98b64
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/ic_action_settings.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/ic_media_pause.png b/mobile/android/base/resources/drawable-xhdpi/ic_media_pause.png
new file mode 100644
index 000000000..6174480ea
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/ic_media_pause.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/ic_media_play.png b/mobile/android/base/resources/drawable-xhdpi/ic_media_play.png
new file mode 100644
index 000000000..601f4293b
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/ic_media_play.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/ic_menu_share.png b/mobile/android/base/resources/drawable-xhdpi/ic_menu_share.png
new file mode 100644
index 000000000..31cca8e15
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/ic_menu_share.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/ic_status_logo.png b/mobile/android/base/resources/drawable-xhdpi/ic_status_logo.png
new file mode 100644
index 000000000..915d7510a
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/ic_status_logo.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/ic_url_bar_tab.png b/mobile/android/base/resources/drawable-xhdpi/ic_url_bar_tab.png
new file mode 100644
index 000000000..be2b74138
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/ic_url_bar_tab.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/ic_widget_new_tab.png b/mobile/android/base/resources/drawable-xhdpi/ic_widget_new_tab.png
new file mode 100644
index 000000000..8a5cbae01
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/ic_widget_new_tab.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/ic_widget_search.png b/mobile/android/base/resources/drawable-xhdpi/ic_widget_search.png
new file mode 100644
index 000000000..e846f008d
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/ic_widget_search.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/icon_bookmarks_empty.png b/mobile/android/base/resources/drawable-xhdpi/icon_bookmarks_empty.png
new file mode 100644
index 000000000..168e76e92
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/icon_bookmarks_empty.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/icon_home_empty_firefox.png b/mobile/android/base/resources/drawable-xhdpi/icon_home_empty_firefox.png
new file mode 100644
index 000000000..92b966071
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/icon_home_empty_firefox.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/icon_key.png b/mobile/android/base/resources/drawable-xhdpi/icon_key.png
new file mode 100644
index 000000000..747733125
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/icon_key.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/icon_most_recent_empty.png b/mobile/android/base/resources/drawable-xhdpi/icon_most_recent_empty.png
new file mode 100644
index 000000000..710fded09
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/icon_most_recent_empty.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/icon_openinapp.png b/mobile/android/base/resources/drawable-xhdpi/icon_openinapp.png
new file mode 100644
index 000000000..4caa44ea8
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/icon_openinapp.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/icon_pageaction.png b/mobile/android/base/resources/drawable-xhdpi/icon_pageaction.png
new file mode 100644
index 000000000..2dd6b052b
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/icon_pageaction.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/icon_remote_tabs_empty.png b/mobile/android/base/resources/drawable-xhdpi/icon_remote_tabs_empty.png
new file mode 100644
index 000000000..04c0f0d73
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/icon_remote_tabs_empty.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/icon_search_empty_firefox.png b/mobile/android/base/resources/drawable-xhdpi/icon_search_empty_firefox.png
new file mode 100644
index 000000000..8332271d8
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/icon_search_empty_firefox.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/icon_shareplane.png b/mobile/android/base/resources/drawable-xhdpi/icon_shareplane.png
new file mode 100644
index 000000000..f2dfe2d5a
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/icon_shareplane.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/img_check.png b/mobile/android/base/resources/drawable-xhdpi/img_check.png
new file mode 100644
index 000000000..986143b24
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/img_check.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/location.png b/mobile/android/base/resources/drawable-xhdpi/location.png
new file mode 100644
index 000000000..8a6b546bd
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/location.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/lock_disabled.png b/mobile/android/base/resources/drawable-xhdpi/lock_disabled.png
new file mode 100644
index 000000000..9a879161b
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/lock_disabled.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/lock_inactive.png b/mobile/android/base/resources/drawable-xhdpi/lock_inactive.png
new file mode 100644
index 000000000..84611eb42
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/lock_inactive.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/lock_secure.png b/mobile/android/base/resources/drawable-xhdpi/lock_secure.png
new file mode 100644
index 000000000..75a43cd30
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/lock_secure.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/media_bar_pause.png b/mobile/android/base/resources/drawable-xhdpi/media_bar_pause.png
new file mode 100644
index 000000000..e19fbd864
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/media_bar_pause.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/media_bar_play.png b/mobile/android/base/resources/drawable-xhdpi/media_bar_play.png
new file mode 100644
index 000000000..6e1b7d214
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/media_bar_play.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/media_bar_stop.png b/mobile/android/base/resources/drawable-xhdpi/media_bar_stop.png
new file mode 100644
index 000000000..6b63c3ea3
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/media_bar_stop.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/menu.png b/mobile/android/base/resources/drawable-xhdpi/menu.png
new file mode 100644
index 000000000..01af3bb04
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/menu.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/menu_item_check.png b/mobile/android/base/resources/drawable-xhdpi/menu_item_check.png
new file mode 100644
index 000000000..9943ead84
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/menu_item_check.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/menu_item_more.png b/mobile/android/base/resources/drawable-xhdpi/menu_item_more.png
new file mode 100644
index 000000000..e6f71ec5b
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/menu_item_more.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/menu_item_uncheck.png b/mobile/android/base/resources/drawable-xhdpi/menu_item_uncheck.png
new file mode 100644
index 000000000..01c610fbf
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/menu_item_uncheck.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/network_error.png b/mobile/android/base/resources/drawable-xhdpi/network_error.png
new file mode 100644
index 000000000..c5613865c
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/network_error.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/notification_media.webp b/mobile/android/base/resources/drawable-xhdpi/notification_media.webp
new file mode 100644
index 000000000..460fe7a12
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/notification_media.webp
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/open_in_browser.png b/mobile/android/base/resources/drawable-xhdpi/open_in_browser.png
new file mode 100644
index 000000000..c03c0207b
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/open_in_browser.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/overlay_bookmark_icon.png b/mobile/android/base/resources/drawable-xhdpi/overlay_bookmark_icon.png
new file mode 100644
index 000000000..db438939c
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/overlay_bookmark_icon.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/overlay_bookmarked_already_icon.png b/mobile/android/base/resources/drawable-xhdpi/overlay_bookmarked_already_icon.png
new file mode 100644
index 000000000..5995d2eb1
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/overlay_bookmarked_already_icon.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/overlay_check.png b/mobile/android/base/resources/drawable-xhdpi/overlay_check.png
new file mode 100644
index 000000000..db17eda8d
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/overlay_check.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/pause.png b/mobile/android/base/resources/drawable-xhdpi/pause.png
new file mode 100644
index 000000000..6aae6c5eb
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/pause.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/phone.png b/mobile/android/base/resources/drawable-xhdpi/phone.png
new file mode 100644
index 000000000..19308f870
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/phone.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/pin.png b/mobile/android/base/resources/drawable-xhdpi/pin.png
new file mode 100644
index 000000000..644e0043c
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/pin.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/play.png b/mobile/android/base/resources/drawable-xhdpi/play.png
new file mode 100644
index 000000000..cc5c7b9e4
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/play.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/private_masq.png b/mobile/android/base/resources/drawable-xhdpi/private_masq.png
new file mode 100644
index 000000000..5ea5f5beb
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/private_masq.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/progress.9.png b/mobile/android/base/resources/drawable-xhdpi/progress.9.png
new file mode 100644
index 000000000..8682ea26e
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/progress.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/push_notification.png b/mobile/android/base/resources/drawable-xhdpi/push_notification.png
new file mode 100644
index 000000000..77e0be689
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/push_notification.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/reader.png b/mobile/android/base/resources/drawable-xhdpi/reader.png
new file mode 100644
index 000000000..b202314d4
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/reader.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/reader_active.png b/mobile/android/base/resources/drawable-xhdpi/reader_active.png
new file mode 100644
index 000000000..8a9872be1
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/reader_active.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/reading_list_folder.png b/mobile/android/base/resources/drawable-xhdpi/reading_list_folder.png
new file mode 100644
index 000000000..c7ad1cade
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/reading_list_folder.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/search_clear.png b/mobile/android/base/resources/drawable-xhdpi/search_clear.png
new file mode 100644
index 000000000..b0881ed32
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/search_clear.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/search_history.png b/mobile/android/base/resources/drawable-xhdpi/search_history.png
new file mode 100644
index 000000000..ed661a729
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/search_history.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/search_icon_active.png b/mobile/android/base/resources/drawable-xhdpi/search_icon_active.png
new file mode 100644
index 000000000..baef8bea8
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/search_icon_active.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/search_icon_inactive.png b/mobile/android/base/resources/drawable-xhdpi/search_icon_inactive.png
new file mode 100644
index 000000000..d3f73d7e2
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/search_icon_inactive.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/search_launcher.png b/mobile/android/base/resources/drawable-xhdpi/search_launcher.png
new file mode 100644
index 000000000..be0fd65fb
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/search_launcher.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/search_plus.png b/mobile/android/base/resources/drawable-xhdpi/search_plus.png
new file mode 100644
index 000000000..de3b631cf
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/search_plus.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/settings_notifications.png b/mobile/android/base/resources/drawable-xhdpi/settings_notifications.png
new file mode 100644
index 000000000..3e96f6deb
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/settings_notifications.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/shareplane.png b/mobile/android/base/resources/drawable-xhdpi/shareplane.png
new file mode 100644
index 000000000..44e6878aa
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/shareplane.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/shield_disabled.png b/mobile/android/base/resources/drawable-xhdpi/shield_disabled.png
new file mode 100644
index 000000000..20e58daf7
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/shield_disabled.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/shield_enabled.png b/mobile/android/base/resources/drawable-xhdpi/shield_enabled.png
new file mode 100644
index 000000000..c95a4876e
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/shield_enabled.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/status_icon_readercache.png b/mobile/android/base/resources/drawable-xhdpi/status_icon_readercache.png
new file mode 100644
index 000000000..e5211c71b
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/status_icon_readercache.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/suggestedsites_amazon.png b/mobile/android/base/resources/drawable-xhdpi/suggestedsites_amazon.png
new file mode 100644
index 000000000..012060dd9
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/suggestedsites_amazon.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/suggestedsites_facebook.png b/mobile/android/base/resources/drawable-xhdpi/suggestedsites_facebook.png
new file mode 100644
index 000000000..b97f9cba9
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/suggestedsites_facebook.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/suggestedsites_restricted_fxsupport.png b/mobile/android/base/resources/drawable-xhdpi/suggestedsites_restricted_fxsupport.png
new file mode 100644
index 000000000..25338e447
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/suggestedsites_restricted_fxsupport.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/suggestedsites_restricted_mozilla.png b/mobile/android/base/resources/drawable-xhdpi/suggestedsites_restricted_mozilla.png
new file mode 100644
index 000000000..03a2e9491
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/suggestedsites_restricted_mozilla.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/suggestedsites_twitter.png b/mobile/android/base/resources/drawable-xhdpi/suggestedsites_twitter.png
new file mode 100644
index 000000000..75bc311c0
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/suggestedsites_twitter.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/suggestedsites_webmaker.png b/mobile/android/base/resources/drawable-xhdpi/suggestedsites_webmaker.png
new file mode 100644
index 000000000..92f7cfecf
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/suggestedsites_webmaker.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/suggestedsites_wikipedia.png b/mobile/android/base/resources/drawable-xhdpi/suggestedsites_wikipedia.png
new file mode 100644
index 000000000..76140d48b
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/suggestedsites_wikipedia.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/suggestedsites_youtube.png b/mobile/android/base/resources/drawable-xhdpi/suggestedsites_youtube.png
new file mode 100644
index 000000000..2896a9c17
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/suggestedsites_youtube.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/switch_button_icon.png b/mobile/android/base/resources/drawable-xhdpi/switch_button_icon.png
new file mode 100644
index 000000000..6dfa79e51
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/switch_button_icon.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/tab_audio_playing.png b/mobile/android/base/resources/drawable-xhdpi/tab_audio_playing.png
new file mode 100644
index 000000000..cb4466e0e
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/tab_audio_playing.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/tab_close.png b/mobile/android/base/resources/drawable-xhdpi/tab_close.png
new file mode 100644
index 000000000..8e4908e0c
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/tab_close.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/tab_close_active.png b/mobile/android/base/resources/drawable-xhdpi/tab_close_active.png
new file mode 100644
index 000000000..d2071e7c3
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/tab_close_active.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/tab_indicator_background.9.png b/mobile/android/base/resources/drawable-xhdpi/tab_indicator_background.9.png
new file mode 100644
index 000000000..8b561749a
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/tab_indicator_background.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/tab_indicator_divider.9.png b/mobile/android/base/resources/drawable-xhdpi/tab_indicator_divider.9.png
new file mode 100644
index 000000000..f1338d803
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/tab_indicator_divider.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/tab_indicator_selected.9.png b/mobile/android/base/resources/drawable-xhdpi/tab_indicator_selected.9.png
new file mode 100644
index 000000000..e78a2ddba
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/tab_indicator_selected.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/tab_indicator_selected_focused.9.png b/mobile/android/base/resources/drawable-xhdpi/tab_indicator_selected_focused.9.png
new file mode 100644
index 000000000..3e1fe5560
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/tab_indicator_selected_focused.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/tab_new.png b/mobile/android/base/resources/drawable-xhdpi/tab_new.png
new file mode 100644
index 000000000..76a5a1182
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/tab_new.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/tab_preview_masq.png b/mobile/android/base/resources/drawable-xhdpi/tab_preview_masq.png
new file mode 100644
index 000000000..119542216
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/tab_preview_masq.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/tabs_count.png b/mobile/android/base/resources/drawable-xhdpi/tabs_count.png
new file mode 100644
index 000000000..e4c71cb14
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/tabs_count.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/tabs_count_foreground.png b/mobile/android/base/resources/drawable-xhdpi/tabs_count_foreground.png
new file mode 100644
index 000000000..a5a75227c
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/tabs_count_foreground.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/tabs_normal.png b/mobile/android/base/resources/drawable-xhdpi/tabs_normal.png
new file mode 100644
index 000000000..f76b0221c
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/tabs_normal.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/tabs_panel_nav_back.png b/mobile/android/base/resources/drawable-xhdpi/tabs_panel_nav_back.png
new file mode 100644
index 000000000..79d8ae285
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/tabs_panel_nav_back.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/tabs_private.png b/mobile/android/base/resources/drawable-xhdpi/tabs_private.png
new file mode 100644
index 000000000..14a3f4b79
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/tabs_private.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/tip_addsearch.png b/mobile/android/base/resources/drawable-xhdpi/tip_addsearch.png
new file mode 100644
index 000000000..d7c18bdbf
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/tip_addsearch.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/top_site_add.png b/mobile/android/base/resources/drawable-xhdpi/top_site_add.png
new file mode 100644
index 000000000..7ddc503bf
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/top_site_add.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/tracking_protection_toolbar_illustration.png b/mobile/android/base/resources/drawable-xhdpi/tracking_protection_toolbar_illustration.png
new file mode 100644
index 000000000..744d3573c
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/tracking_protection_toolbar_illustration.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/undo_button_icon.png b/mobile/android/base/resources/drawable-xhdpi/undo_button_icon.png
new file mode 100644
index 000000000..5992b4f5c
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/undo_button_icon.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/url_bar_entry_default.9.png b/mobile/android/base/resources/drawable-xhdpi/url_bar_entry_default.9.png
new file mode 100644
index 000000000..e0cf4cf90
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/url_bar_entry_default.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/url_bar_entry_default_pb.9.png b/mobile/android/base/resources/drawable-xhdpi/url_bar_entry_default_pb.9.png
new file mode 100644
index 000000000..ca9e114b6
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/url_bar_entry_default_pb.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/url_bar_entry_pressed.9.png b/mobile/android/base/resources/drawable-xhdpi/url_bar_entry_pressed.9.png
new file mode 100644
index 000000000..8cbbff190
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/url_bar_entry_pressed.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/url_bar_entry_pressed_pb.9.png b/mobile/android/base/resources/drawable-xhdpi/url_bar_entry_pressed_pb.9.png
new file mode 100644
index 000000000..f34244e4c
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/url_bar_entry_pressed_pb.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/urlbar_stop.png b/mobile/android/base/resources/drawable-xhdpi/urlbar_stop.png
new file mode 100644
index 000000000..015195159
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/urlbar_stop.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/validation_arrow.png b/mobile/android/base/resources/drawable-xhdpi/validation_arrow.png
new file mode 100644
index 000000000..0dfea5c2f
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/validation_arrow.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/validation_arrow_inverted.png b/mobile/android/base/resources/drawable-xhdpi/validation_arrow_inverted.png
new file mode 100644
index 000000000..9122e2ce6
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/validation_arrow_inverted.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/validation_bg.9.png b/mobile/android/base/resources/drawable-xhdpi/validation_bg.9.png
new file mode 100644
index 000000000..773aa03a8
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/validation_bg.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/warning_major.png b/mobile/android/base/resources/drawable-xhdpi/warning_major.png
new file mode 100644
index 000000000..896062e98
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/warning_major.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/warning_minor.png b/mobile/android/base/resources/drawable-xhdpi/warning_minor.png
new file mode 100644
index 000000000..84fcff9bb
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/warning_minor.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/widget_bg.9.png b/mobile/android/base/resources/drawable-xhdpi/widget_bg.9.png
new file mode 100644
index 000000000..cbf377ac3
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xhdpi/widget_bg.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xlarge-hdpi-v11/ic_menu_bookmark_add.png b/mobile/android/base/resources/drawable-xlarge-hdpi-v11/ic_menu_bookmark_add.png
new file mode 100644
index 000000000..54d88fd13
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xlarge-hdpi-v11/ic_menu_bookmark_add.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xlarge-hdpi-v11/star_blue.png b/mobile/android/base/resources/drawable-xlarge-hdpi-v11/star_blue.png
new file mode 100644
index 000000000..b80c5ac44
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xlarge-hdpi-v11/star_blue.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xlarge-xhdpi-v11/ic_menu_bookmark_add.png b/mobile/android/base/resources/drawable-xlarge-xhdpi-v11/ic_menu_bookmark_add.png
new file mode 100644
index 000000000..e54d42905
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xlarge-xhdpi-v11/ic_menu_bookmark_add.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xlarge-xhdpi-v11/star_blue.png b/mobile/android/base/resources/drawable-xlarge-xhdpi-v11/star_blue.png
new file mode 100644
index 000000000..c0278d574
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xlarge-xhdpi-v11/star_blue.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xlarge-xxhdpi-v11/ic_menu_bookmark_add.png b/mobile/android/base/resources/drawable-xlarge-xxhdpi-v11/ic_menu_bookmark_add.png
new file mode 100644
index 000000000..0fa071137
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xlarge-xxhdpi-v11/ic_menu_bookmark_add.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xlarge-xxhdpi-v11/star_blue.png b/mobile/android/base/resources/drawable-xlarge-xxhdpi-v11/star_blue.png
new file mode 100644
index 000000000..c9cf49622
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xlarge-xxhdpi-v11/star_blue.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi-v11/ic_status_logo.png b/mobile/android/base/resources/drawable-xxhdpi-v11/ic_status_logo.png
new file mode 100644
index 000000000..0bb9777d7
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi-v11/ic_status_logo.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/ab_mic.png b/mobile/android/base/resources/drawable-xxhdpi/ab_mic.png
new file mode 100644
index 000000000..14e4cff78
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/ab_mic.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/ab_qrcode.png b/mobile/android/base/resources/drawable-xxhdpi/ab_qrcode.png
new file mode 100644
index 000000000..8ad785974
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/ab_qrcode.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/arrow_up.png b/mobile/android/base/resources/drawable-xxhdpi/arrow_up.png
new file mode 100644
index 000000000..193bbc3b4
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/arrow_up.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/close_edit_mode_dark.png b/mobile/android/base/resources/drawable-xxhdpi/close_edit_mode_dark.png
new file mode 100644
index 000000000..0f0e95deb
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/close_edit_mode_dark.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/close_edit_mode_light.png b/mobile/android/base/resources/drawable-xxhdpi/close_edit_mode_light.png
new file mode 100644
index 000000000..5f9a2f7e5
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/close_edit_mode_light.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/device_desktop.png b/mobile/android/base/resources/drawable-xxhdpi/device_desktop.png
new file mode 100644
index 000000000..6a386c4e7
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/device_desktop.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/device_mobile.png b/mobile/android/base/resources/drawable-xxhdpi/device_mobile.png
new file mode 100644
index 000000000..d32a9b353
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/device_mobile.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/dropshadow.9.png b/mobile/android/base/resources/drawable-xxhdpi/dropshadow.9.png
new file mode 100644
index 000000000..a408d91af
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/dropshadow.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/exit_fullscreen.png b/mobile/android/base/resources/drawable-xxhdpi/exit_fullscreen.png
new file mode 100644
index 000000000..2be3dbac7
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/exit_fullscreen.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/flat_icon.png b/mobile/android/base/resources/drawable-xxhdpi/flat_icon.png
new file mode 100644
index 000000000..57d83a59e
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/flat_icon.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/folder_closed.png b/mobile/android/base/resources/drawable-xxhdpi/folder_closed.png
new file mode 100644
index 000000000..15d03e7e4
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/folder_closed.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/fullscreen.png b/mobile/android/base/resources/drawable-xxhdpi/fullscreen.png
new file mode 100644
index 000000000..2e39898be
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/fullscreen.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/globe_light.png b/mobile/android/base/resources/drawable-xxhdpi/globe_light.png
new file mode 100644
index 000000000..120bfd2e6
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/globe_light.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/helper_readerview_bookmark.webp b/mobile/android/base/resources/drawable-xxhdpi/helper_readerview_bookmark.webp
new file mode 100644
index 000000000..04fd2c54f
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/helper_readerview_bookmark.webp
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/home_group_collapsed.png b/mobile/android/base/resources/drawable-xxhdpi/home_group_collapsed.png
new file mode 100644
index 000000000..319ab3d50
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/home_group_collapsed.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/homepage_banner_firstrun.png b/mobile/android/base/resources/drawable-xxhdpi/homepage_banner_firstrun.png
new file mode 100644
index 000000000..3ef8f157d
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/homepage_banner_firstrun.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/ic_action_settings.png b/mobile/android/base/resources/drawable-xxhdpi/ic_action_settings.png
new file mode 100644
index 000000000..9ce42fffe
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/ic_action_settings.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/ic_media_pause.png b/mobile/android/base/resources/drawable-xxhdpi/ic_media_pause.png
new file mode 100644
index 000000000..29d216e70
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/ic_media_pause.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/ic_media_play.png b/mobile/android/base/resources/drawable-xxhdpi/ic_media_play.png
new file mode 100644
index 000000000..648e6f67a
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/ic_media_play.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/ic_menu_share.png b/mobile/android/base/resources/drawable-xxhdpi/ic_menu_share.png
new file mode 100644
index 000000000..de6f092ee
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/ic_menu_share.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/ic_widget_new_tab.png b/mobile/android/base/resources/drawable-xxhdpi/ic_widget_new_tab.png
new file mode 100644
index 000000000..2ab09b8fb
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/ic_widget_new_tab.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/ic_widget_search.png b/mobile/android/base/resources/drawable-xxhdpi/ic_widget_search.png
new file mode 100644
index 000000000..d6ba7c846
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/ic_widget_search.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/icon_key.png b/mobile/android/base/resources/drawable-xxhdpi/icon_key.png
new file mode 100644
index 000000000..0f6925b04
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/icon_key.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/icon_search_empty_firefox.png b/mobile/android/base/resources/drawable-xxhdpi/icon_search_empty_firefox.png
new file mode 100644
index 000000000..b16c1ab79
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/icon_search_empty_firefox.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/icon_shareplane.png b/mobile/android/base/resources/drawable-xxhdpi/icon_shareplane.png
new file mode 100644
index 000000000..63e9f2519
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/icon_shareplane.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/img_check.png b/mobile/android/base/resources/drawable-xxhdpi/img_check.png
new file mode 100644
index 000000000..13e920464
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/img_check.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/location.png b/mobile/android/base/resources/drawable-xxhdpi/location.png
new file mode 100644
index 000000000..7abc57ef8
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/location.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/lock_disabled.png b/mobile/android/base/resources/drawable-xxhdpi/lock_disabled.png
new file mode 100644
index 000000000..0396ff06e
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/lock_disabled.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/lock_inactive.png b/mobile/android/base/resources/drawable-xxhdpi/lock_inactive.png
new file mode 100644
index 000000000..3276f338b
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/lock_inactive.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/lock_secure.png b/mobile/android/base/resources/drawable-xxhdpi/lock_secure.png
new file mode 100644
index 000000000..19e3a8fad
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/lock_secure.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/menu.png b/mobile/android/base/resources/drawable-xxhdpi/menu.png
new file mode 100644
index 000000000..a6b457fb1
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/menu.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/menu_item_check.png b/mobile/android/base/resources/drawable-xxhdpi/menu_item_check.png
new file mode 100644
index 000000000..381f91856
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/menu_item_check.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/menu_item_uncheck.png b/mobile/android/base/resources/drawable-xxhdpi/menu_item_uncheck.png
new file mode 100644
index 000000000..11be568d9
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/menu_item_uncheck.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/network_error.png b/mobile/android/base/resources/drawable-xxhdpi/network_error.png
new file mode 100644
index 000000000..4074ac2a8
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/network_error.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/notification_media.webp b/mobile/android/base/resources/drawable-xxhdpi/notification_media.webp
new file mode 100644
index 000000000..2485a4bf1
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/notification_media.webp
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/overlay_bookmark_icon.png b/mobile/android/base/resources/drawable-xxhdpi/overlay_bookmark_icon.png
new file mode 100644
index 000000000..05dc926f2
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/overlay_bookmark_icon.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/overlay_bookmarked_already_icon.png b/mobile/android/base/resources/drawable-xxhdpi/overlay_bookmarked_already_icon.png
new file mode 100644
index 000000000..9afb290c4
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/overlay_bookmarked_already_icon.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/overlay_check.png b/mobile/android/base/resources/drawable-xxhdpi/overlay_check.png
new file mode 100644
index 000000000..1bc3abe8e
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/overlay_check.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/private_masq.png b/mobile/android/base/resources/drawable-xxhdpi/private_masq.png
new file mode 100644
index 000000000..e62cdbe13
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/private_masq.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/push_notification.png b/mobile/android/base/resources/drawable-xxhdpi/push_notification.png
new file mode 100644
index 000000000..3c4ba474e
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/push_notification.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/reading_list_folder.png b/mobile/android/base/resources/drawable-xxhdpi/reading_list_folder.png
new file mode 100644
index 000000000..c29d1b9a5
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/reading_list_folder.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/search_clear.png b/mobile/android/base/resources/drawable-xxhdpi/search_clear.png
new file mode 100644
index 000000000..f21257bea
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/search_clear.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/search_history.png b/mobile/android/base/resources/drawable-xxhdpi/search_history.png
new file mode 100644
index 000000000..fbcdbdbba
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/search_history.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/search_icon_active.png b/mobile/android/base/resources/drawable-xxhdpi/search_icon_active.png
new file mode 100644
index 000000000..093b066c9
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/search_icon_active.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/search_icon_inactive.png b/mobile/android/base/resources/drawable-xxhdpi/search_icon_inactive.png
new file mode 100644
index 000000000..4117c6332
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/search_icon_inactive.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/search_launcher.png b/mobile/android/base/resources/drawable-xxhdpi/search_launcher.png
new file mode 100644
index 000000000..6c8fc7678
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/search_launcher.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/search_plus.png b/mobile/android/base/resources/drawable-xxhdpi/search_plus.png
new file mode 100644
index 000000000..8ac7df9e9
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/search_plus.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/shareplane.png b/mobile/android/base/resources/drawable-xxhdpi/shareplane.png
new file mode 100644
index 000000000..c9436aab8
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/shareplane.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/shield_disabled.png b/mobile/android/base/resources/drawable-xxhdpi/shield_disabled.png
new file mode 100644
index 000000000..57d669d5a
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/shield_disabled.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/shield_enabled.png b/mobile/android/base/resources/drawable-xxhdpi/shield_enabled.png
new file mode 100644
index 000000000..edf20af11
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/shield_enabled.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/status_icon_readercache.png b/mobile/android/base/resources/drawable-xxhdpi/status_icon_readercache.png
new file mode 100644
index 000000000..f6e070b02
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/status_icon_readercache.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/suggestedsites_amazon.png b/mobile/android/base/resources/drawable-xxhdpi/suggestedsites_amazon.png
new file mode 100644
index 000000000..5b0d2fdc5
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/suggestedsites_amazon.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/suggestedsites_facebook.png b/mobile/android/base/resources/drawable-xxhdpi/suggestedsites_facebook.png
new file mode 100644
index 000000000..46e2db588
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/suggestedsites_facebook.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/suggestedsites_twitter.png b/mobile/android/base/resources/drawable-xxhdpi/suggestedsites_twitter.png
new file mode 100644
index 000000000..781b7b5a1
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/suggestedsites_twitter.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/suggestedsites_wikipedia.png b/mobile/android/base/resources/drawable-xxhdpi/suggestedsites_wikipedia.png
new file mode 100644
index 000000000..a324694e9
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/suggestedsites_wikipedia.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/suggestedsites_youtube.png b/mobile/android/base/resources/drawable-xxhdpi/suggestedsites_youtube.png
new file mode 100644
index 000000000..d201b6221
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/suggestedsites_youtube.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/tab_close.png b/mobile/android/base/resources/drawable-xxhdpi/tab_close.png
new file mode 100644
index 000000000..400319394
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/tab_close.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/tab_close_active.png b/mobile/android/base/resources/drawable-xxhdpi/tab_close_active.png
new file mode 100644
index 000000000..279135f93
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/tab_close_active.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/tab_new.png b/mobile/android/base/resources/drawable-xxhdpi/tab_new.png
new file mode 100644
index 000000000..e857037c6
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/tab_new.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/tab_preview_masq.png b/mobile/android/base/resources/drawable-xxhdpi/tab_preview_masq.png
new file mode 100644
index 000000000..9b24f329f
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/tab_preview_masq.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/tabs_panel_nav_back.png b/mobile/android/base/resources/drawable-xxhdpi/tabs_panel_nav_back.png
new file mode 100644
index 000000000..3b21f3aa2
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/tabs_panel_nav_back.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/tracking_protection_toolbar_illustration.png b/mobile/android/base/resources/drawable-xxhdpi/tracking_protection_toolbar_illustration.png
new file mode 100644
index 000000000..2c86b5baa
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/tracking_protection_toolbar_illustration.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/url_bar_entry_default.9.png b/mobile/android/base/resources/drawable-xxhdpi/url_bar_entry_default.9.png
new file mode 100644
index 000000000..e7b58136c
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/url_bar_entry_default.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/url_bar_entry_default_pb.9.png b/mobile/android/base/resources/drawable-xxhdpi/url_bar_entry_default_pb.9.png
new file mode 100644
index 000000000..b5b5a8d32
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/url_bar_entry_default_pb.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/url_bar_entry_pressed.9.png b/mobile/android/base/resources/drawable-xxhdpi/url_bar_entry_pressed.9.png
new file mode 100644
index 000000000..7c2ac33cb
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/url_bar_entry_pressed.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/url_bar_entry_pressed_pb.9.png b/mobile/android/base/resources/drawable-xxhdpi/url_bar_entry_pressed_pb.9.png
new file mode 100644
index 000000000..5eb9cecb4
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/url_bar_entry_pressed_pb.9.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/urlbar_stop.png b/mobile/android/base/resources/drawable-xxhdpi/urlbar_stop.png
new file mode 100644
index 000000000..510cd7b3c
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/urlbar_stop.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/warning_major.png b/mobile/android/base/resources/drawable-xxhdpi/warning_major.png
new file mode 100644
index 000000000..172160fb5
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/warning_major.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/warning_minor.png b/mobile/android/base/resources/drawable-xxhdpi/warning_minor.png
new file mode 100644
index 000000000..e93ead0e8
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxhdpi/warning_minor.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable-xxxhdpi/search_launcher.png b/mobile/android/base/resources/drawable-xxxhdpi/search_launcher.png
new file mode 100644
index 000000000..1f70d13db
--- /dev/null
+++ b/mobile/android/base/resources/drawable-xxxhdpi/search_launcher.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable/action_bar_button.xml b/mobile/android/base/resources/drawable/action_bar_button.xml
new file mode 100644
index 000000000..fe36bc43d
--- /dev/null
+++ b/mobile/android/base/resources/drawable/action_bar_button.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_pressed="true"
+ android:state_enabled="true">
+ <shape>
+ <solid android:color="@color/highlight" />
+ </shape>
+ </item>
+
+ <item android:state_focused="true"
+ android:state_pressed="false">
+ <shape>
+ <solid android:color="@color/highlight_focused" />
+ </shape>
+ </item>
+
+ <item android:drawable="@android:color/transparent"/>
+
+</selector>
diff --git a/mobile/android/base/resources/drawable/action_bar_button_inverse.xml b/mobile/android/base/resources/drawable/action_bar_button_inverse.xml
new file mode 100644
index 000000000..b85387331
--- /dev/null
+++ b/mobile/android/base/resources/drawable/action_bar_button_inverse.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_pressed="true">
+ <shape>
+ <solid android:color="@color/highlight_dark" />
+ </shape>
+ </item>
+
+ <item android:state_focused="true"
+ android:state_pressed="false">
+ <shape>
+ <solid android:color="@color/highlight_dark_focused" />
+ </shape>
+ </item>
+
+ <item android:drawable="@android:color/transparent"/>
+
+</selector>
diff --git a/mobile/android/base/resources/drawable/action_bar_button_negative.xml b/mobile/android/base/resources/drawable/action_bar_button_negative.xml
new file mode 100644
index 000000000..7611d70ba
--- /dev/null
+++ b/mobile/android/base/resources/drawable/action_bar_button_negative.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_pressed="false">
+ <shape>
+ <solid android:color="@color/toolbar_menu_dark_grey" />
+ </shape>
+ </item>
+
+ <item android:state_pressed="true">
+ <shape>
+ <solid android:color="@color/toolbar_grey_pressed" />
+ </shape>
+ </item>
+
+</selector>
diff --git a/mobile/android/base/resources/drawable/action_bar_button_positive.xml b/mobile/android/base/resources/drawable/action_bar_button_positive.xml
new file mode 100644
index 000000000..ac7020b97
--- /dev/null
+++ b/mobile/android/base/resources/drawable/action_bar_button_positive.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_pressed="false">
+ <shape>
+ <solid android:color="@color/link_blue"/>
+ </shape>
+ </item>
+
+ <item android:state_pressed="true">
+ <shape>
+ <solid android:color="@color/link_blue_pressed" />
+ </shape>
+ </item>
+
+</selector>
diff --git a/mobile/android/base/resources/drawable/alert_download_animation.xml b/mobile/android/base/resources/drawable/alert_download_animation.xml
new file mode 100644
index 000000000..e50472f0b
--- /dev/null
+++ b/mobile/android/base/resources/drawable/alert_download_animation.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
+ android:oneshot="false">
+
+ <item android:drawable="@drawable/alert_download_animation_1" android:duration="150" />
+ <item android:drawable="@drawable/alert_download_animation_2" android:duration="150" />
+ <item android:drawable="@drawable/alert_download_animation_3" android:duration="150" />
+ <item android:drawable="@drawable/alert_download_animation_4" android:duration="150" />
+ <item android:drawable="@drawable/alert_download_animation_5" android:duration="150" />
+ <item android:drawable="@drawable/alert_download_animation_6" android:duration="150" />
+
+</animation-list>
diff --git a/mobile/android/base/resources/drawable/arrow_down.xml b/mobile/android/base/resources/drawable/arrow_down.xml
new file mode 100644
index 000000000..cfb14ed4c
--- /dev/null
+++ b/mobile/android/base/resources/drawable/arrow_down.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<rotate xmlns:android="http://schemas.android.com/apk/res/android"
+ android:drawable="@drawable/arrow_up"
+ android:fromDegrees="180"
+ android:toDegrees="180"/>
+
diff --git a/mobile/android/base/resources/drawable/as_bin.xml b/mobile/android/base/resources/drawable/as_bin.xml
new file mode 100644
index 000000000..46de6104e
--- /dev/null
+++ b/mobile/android/base/resources/drawable/as_bin.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M20.75,5L16,5v-2.75a1.252,1.252 0,0 0,-1.25 -1.25h-5.5a1.252,1.252 0,0 0,-1.25 1.25L8,5h-4.75a1.25,1.25 0,0 0,0 2.5L5,7.5v14.25a1.252,1.252 0,0 0,1.25 1.25h11.5a1.252,1.252 0,0 0,1.25 -1.25L19,7.5h1.75A1.25,1.25 0,0 0,20.75 5ZM10.5,3.5h3v1.5h-3v-1.5ZM16.5,20.5h-9v-13h9v13ZM10.5,18h0a0.5,0.5 0,0 1,-0.5 -0.5v-7a0.5,0.5 0,0 1,0.5 -0.5h0a0.5,0.5 0,0 1,0.5 0.5v7A0.5,0.5 0,0 1,10.5 18ZM13.5,18h0a0.5,0.5 0,0 1,-0.5 -0.5v-7a0.5,0.5 0,0 1,0.5 -0.5h0a0.5,0.5 0,0 1,0.5 0.5v7A0.5,0.5 0,0 1,13.5 18Z"/>
+</vector>
diff --git a/mobile/android/base/resources/drawable/as_bookmark.xml b/mobile/android/base/resources/drawable/as_bookmark.xml
new file mode 100644
index 000000000..890838be3
--- /dev/null
+++ b/mobile/android/base/resources/drawable/as_bookmark.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M12.037,5.333l1.706,3.361 0.569,1.121 1.239,0.211 3.617,0.619 -2.617,2.851 -0.81,0.884 0.181,1.185 0.583,3.8 -3.312,-1.758 -1.179,-0.626 -1.176,0.632 -3.232,1.736 0.582,-3.788 0.184,-1.194 -0.822,-0.886 -2.633,-2.84 3.676,-0.619 1.272,-0.214 0.563,-1.161 1.609,-3.319M12.01,1a1.335,1.335 0,0 0,-1.085 0.895l-2.747,5.667 -5.877,0.99c-1.345,0.219 -1.679,1.186 -0.744,2.148l4.16,4.486 -0.969,6.311c-0.147,0.948 0.242,1.5 0.925,1.5a2,2 0,0 0,0.891 -0.249l5.457,-2.931 5.521,2.931a2,2 0,0 0,0.892 0.249c0.683,0 1.07,-0.555 0.926,-1.5l-0.966,-6.311 4.111,-4.481c0.936,-0.966 0.6,-1.934 -0.744,-2.153l-5.789,-0.99L13.1,1.9A1.333,1.333 0,0 0,12.01 1h0Z"/>
+</vector>
diff --git a/mobile/android/base/resources/drawable/as_contextmenu_divider.xml b/mobile/android/base/resources/drawable/as_contextmenu_divider.xml
new file mode 100644
index 000000000..f24f9a238
--- /dev/null
+++ b/mobile/android/base/resources/drawable/as_contextmenu_divider.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+ android:insetLeft="72dp">
+ <shape>
+ <size
+ android:height="1dp"/>
+ <solid android:color="@color/disabled_grey"/>
+ </shape>
+</inset> \ No newline at end of file
diff --git a/mobile/android/base/resources/drawable/as_copy.xml b/mobile/android/base/resources/drawable/as_copy.xml
new file mode 100644
index 000000000..516459edb
--- /dev/null
+++ b/mobile/android/base/resources/drawable/as_copy.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M21.75,23h-12.5a1.25,1.25 0,0 1,-1.25 -1.25v-14.5a1.25,1.25 0,0 1,1.25 -1.25h9a1.252,1.252 0,0 1,0.884 0.366l3.5,3.5a1.252,1.252 0,0 1,0.366 0.884v11A1.25,1.25 0,0 1,21.75 23ZM10.5,20.5h10v-9.232l-2.768,-2.768L10.5,8.5v12ZM7,15.5h-3.5v-12h7.232l1.5,1.5h3.511a1.16,1.16 0,0 0,-0.109 -0.134l-3.5,-3.5A1.252,1.252 0,0 0,11.25 1h-9a1.25,1.25 0,0 0,-1.25 1.25v14.5a1.25,1.25 0,0 0,1.25 1.25L7,18v-2.5ZM18.5,12L17,12v-1.5a0.5,0.5 0,0 0,-1 0v2a0.5,0.5 0,0 0,0.5 0.5h2A0.5,0.5 0,0 0,18.5 12Z"/>
+</vector>
diff --git a/mobile/android/base/resources/drawable/as_dimiss.xml b/mobile/android/base/resources/drawable/as_dimiss.xml
new file mode 100644
index 000000000..ccc028e48
--- /dev/null
+++ b/mobile/android/base/resources/drawable/as_dimiss.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M13.779,12l7.867,-7.866a1.25,1.25 0,0 0,-1.768 -1.768l-7.866,7.866 -7.866,-7.866a1.25,1.25 0,1 0,-1.768 1.768L10.244,12l-7.866,7.866a1.25,1.25 0,0 0,1.768 1.768l7.866,-7.866 7.866,7.866a1.25,1.25 0,0 0,1.768 -1.768Z"/>
+</vector>
diff --git a/mobile/android/base/resources/drawable/as_home.xml b/mobile/android/base/resources/drawable/as_home.xml
new file mode 100644
index 000000000..aece2b195
--- /dev/null
+++ b/mobile/android/base/resources/drawable/as_home.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M18.012,22.969h-4v-6h-4v6h-4a1.075,1.075 0,0 1,-1 -1v-8.5a1.091,1.091 0,0 1,0.5 -1l5.5,-5.5a1.413,1.413 0,0 1,2 0l5.5,5.5a1.538,1.538 0,0 1,0.5 1v8.5A1.075,1.075 0,0 1,18.012 22.969ZM22.012,13.281a1.246,1.246 0,0 1,-0.884 -0.366l-9.116,-9.116 -9.116,9.116a1.25,1.25 0,0 1,-1.768 -1.768l10,-10a1.251,1.251 0,0 1,1.768 0l10,10A1.25,1.25 0,0 1,22.012 13.281Z"/>
+</vector>
diff --git a/mobile/android/base/resources/drawable/as_private.xml b/mobile/android/base/resources/drawable/as_private.xml
new file mode 100644
index 000000000..96c8fbdd2
--- /dev/null
+++ b/mobile/android/base/resources/drawable/as_private.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M18,17.823c-2.29,0 -3.873,-2.692 -6.069,-2.692s-3.916,2.692 -6.069,2.692c-2.826,0 -4.912,-2.616 -4.946,-7.1 -0.021,-2.783 0.829,-3.671 4.5,-3.671s4.742,1.468 6.519,1.468 2.852,-1.468 6.519,-1.468 4.517,0.888 4.5,3.671C22.909,15.207 20.823,17.823 18,17.823ZM7.21,10.481c-2.229,0.1 -3.147,1.393 -3.147,1.713s1.478,1.224 2.923,1.224 3.147,-0.518 3.147,-0.979A2.611,2.611 0,0 0,7.207 10.481ZM16.652,10.481a2.611,2.611 0,0 0,-2.923 1.958c0,0.461 1.7,0.979 3.147,0.979s2.923,-0.9 2.923,-1.224S18.878,10.576 16.649,10.481Z"/>
+</vector>
diff --git a/mobile/android/base/resources/drawable/as_share.xml b/mobile/android/base/resources/drawable/as_share.xml
new file mode 100644
index 000000000..ecb0f200b
--- /dev/null
+++ b/mobile/android/base/resources/drawable/as_share.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M19,15a3.987,3.987 0,0 0,-2.839 1.18l-7.208,-3.6a3.6,3.6 0,0 0,0 -1.16l7.208,-3.6A4,4 0,1 0,15 5a3.936,3.936 0,0 0,0.047 0.58l-7.208,3.6a4,4 0,1 0,0 5.64l7.208,3.6a3.936,3.936 0,0 0,-0.047 0.58A4,4 0,1 0,19 15Z"/>
+</vector>
diff --git a/mobile/android/base/resources/drawable/as_tab.xml b/mobile/android/base/resources/drawable/as_tab.xml
new file mode 100644
index 000000000..b8c4b19e9
--- /dev/null
+++ b/mobile/android/base/resources/drawable/as_tab.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M22,20.015L2,20.015a1.266,1.266 0,0 1,-1.266 -1.266v-2.531A1.266,1.266 0,0 1,2 14.952c0.618,0 1.248,-3.239 1.484,-4.459 0.622,-3.2 1.266,-6.508 3.971,-6.508h9.09c2.705,0 3.349,3.309 3.971,6.508 0.236,1.22 0.866,4.459 1.484,4.459a1.266,1.266 0,0 1,1.266 1.266v2.531A1.266,1.266 0,0 1,22 20.015ZM3.266,17.483h17.468v-0.3c-1.668,-0.883 -2.193,-3.583 -2.7,-6.21 -0.237,-1.219 -0.867,-4.459 -1.485,-4.459h-9.09c-0.618,0 -1.248,3.24 -1.485,4.459 -0.511,2.627 -1.036,5.327 -2.7,6.21v0.3Z"/>
+</vector>
diff --git a/mobile/android/base/resources/drawable/autocomplete_list_bg.xml b/mobile/android/base/resources/drawable/autocomplete_list_bg.xml
new file mode 100644
index 000000000..9747b48a2
--- /dev/null
+++ b/mobile/android/base/resources/drawable/autocomplete_list_bg.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle">
+
+ <solid android:color="@android:color/white"/>
+
+ <stroke android:width="1dp"
+ android:color="@color/placeholder_grey" />
+
+</shape> \ No newline at end of file
diff --git a/mobile/android/base/resources/drawable/bookmark_folder_arrow_up.xml b/mobile/android/base/resources/drawable/bookmark_folder_arrow_up.xml
new file mode 100644
index 000000000..717cc5952
--- /dev/null
+++ b/mobile/android/base/resources/drawable/bookmark_folder_arrow_up.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- State drawables will stretch drawables to be the same size and neither
+ android:constantSize nor variablePadding fix this, so we hard-code padding
+ in to ensure that they display at their true size. -->
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+ android:drawable="@drawable/arrow_up"
+ android:insetTop="4dp"
+ android:insetRight="5dp"
+ android:insetBottom="4dp"
+ android:insetLeft="5dp" />
diff --git a/mobile/android/base/resources/drawable/button_background_action_blue_round.xml b/mobile/android/base/resources/drawable/button_background_action_blue_round.xml
new file mode 100644
index 000000000..9b5ba8068
--- /dev/null
+++ b/mobile/android/base/resources/drawable/button_background_action_blue_round.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_pressed="true"
+ android:drawable="@drawable/button_pressed_action_blue_round" />
+ <item android:state_enabled="true"
+ android:drawable="@drawable/button_enabled_action_blue_round" />
+</selector>
diff --git a/mobile/android/base/resources/drawable/button_background_action_orange_round.xml b/mobile/android/base/resources/drawable/button_background_action_orange_round.xml
new file mode 100644
index 000000000..02a6c6673
--- /dev/null
+++ b/mobile/android/base/resources/drawable/button_background_action_orange_round.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_pressed="true"
+ android:drawable="@drawable/button_pressed_action_orange_round" />
+ <item android:state_enabled="true"
+ android:drawable="@drawable/button_enabled_action_orange_round" />
+</selector>
diff --git a/mobile/android/base/resources/drawable/button_enabled_action_blue_round.xml b/mobile/android/base/resources/drawable/button_enabled_action_blue_round.xml
new file mode 100644
index 000000000..94a6b9935
--- /dev/null
+++ b/mobile/android/base/resources/drawable/button_enabled_action_blue_round.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle" >
+ <solid android:color="@color/link_blue_pressed" />
+ <corners
+ android:radius="@dimen/standard_corner_radius" />
+</shape>
diff --git a/mobile/android/base/resources/drawable/button_enabled_action_orange_round.xml b/mobile/android/base/resources/drawable/button_enabled_action_orange_round.xml
new file mode 100644
index 000000000..7a9d55b10
--- /dev/null
+++ b/mobile/android/base/resources/drawable/button_enabled_action_orange_round.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle" >
+ <solid android:color="@color/action_orange" />
+ <corners
+ android:radius="@dimen/standard_corner_radius" />
+</shape>
diff --git a/mobile/android/base/resources/drawable/button_pressed_action_blue_round.xml b/mobile/android/base/resources/drawable/button_pressed_action_blue_round.xml
new file mode 100644
index 000000000..bca19fab6
--- /dev/null
+++ b/mobile/android/base/resources/drawable/button_pressed_action_blue_round.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle" >
+ <solid android:color="@color/link_blue" />
+ <corners
+ android:radius="@dimen/standard_corner_radius" />
+</shape>
diff --git a/mobile/android/base/resources/drawable/button_pressed_action_orange_round.xml b/mobile/android/base/resources/drawable/button_pressed_action_orange_round.xml
new file mode 100644
index 000000000..2720b7fba
--- /dev/null
+++ b/mobile/android/base/resources/drawable/button_pressed_action_orange_round.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle" >
+ <solid android:color="@color/action_orange_pressed" />
+ <corners
+ android:radius="@dimen/standard_corner_radius" />
+</shape>
diff --git a/mobile/android/base/resources/drawable/close_edit_mode_selector.xml b/mobile/android/base/resources/drawable/close_edit_mode_selector.xml
new file mode 100644
index 000000000..aab2a469c
--- /dev/null
+++ b/mobile/android/base/resources/drawable/close_edit_mode_selector.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+ <item gecko:state_dark="true"
+ android:drawable="@drawable/close_edit_mode_dark"/>
+
+ <item gecko:state_private="true"
+ android:drawable="@drawable/close_edit_mode_light"/>
+
+ <item android:drawable="@drawable/close_edit_mode_light"/>
+
+</selector>
diff --git a/mobile/android/base/resources/drawable/color_picker_checkmark.xml b/mobile/android/base/resources/drawable/color_picker_checkmark.xml
new file mode 100644
index 000000000..645ec8115
--- /dev/null
+++ b/mobile/android/base/resources/drawable/color_picker_checkmark.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="ring"
+ android:innerRadius="15dip"
+ android:thickness="4dip"
+ android:useLevel="false">
+ <solid android:color="@android:color/white"/>
+</shape>
diff --git a/mobile/android/base/resources/drawable/divider_vertical.xml b/mobile/android/base/resources/drawable/divider_vertical.xml
new file mode 100644
index 000000000..d326d94f9
--- /dev/null
+++ b/mobile/android/base/resources/drawable/divider_vertical.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle">
+
+ <solid android:color="@color/toolbar_divider_grey"/>
+ <size android:width="1dp" />
+
+</shape>
diff --git a/mobile/android/base/resources/drawable/edit_text_default.xml b/mobile/android/base/resources/drawable/edit_text_default.xml
new file mode 100644
index 000000000..edb6632db
--- /dev/null
+++ b/mobile/android/base/resources/drawable/edit_text_default.xml
@@ -0,0 +1,24 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <!-- Make sure the border only appears at the bottom of the background -->
+ <item
+ android:top="-2dp"
+ android:right="-2dp"
+ android:left="-2dp">
+ <shape>
+ <!-- Padding creates vertical space between the text and the underline,
+ as well as right padding for search icon/clear button -->
+ <padding
+ android:top="@dimen/search_bar_padding_y"
+ android:bottom="@dimen/search_bar_padding_y"
+ android:right="@dimen/search_bar_padding_right"/>
+ <solid android:color="@android:color/transparent"/>
+ <stroke android:width="1dp" android:color="@color/tabs_tray_icon_grey"/>
+ </shape>
+ </item>
+
+</layer-list>
diff --git a/mobile/android/base/resources/drawable/edit_text_focused.xml b/mobile/android/base/resources/drawable/edit_text_focused.xml
new file mode 100644
index 000000000..38782652e
--- /dev/null
+++ b/mobile/android/base/resources/drawable/edit_text_focused.xml
@@ -0,0 +1,25 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <!-- Make sure the border only appears at the bottom of the background -->
+ <item
+ android:top="-3dp"
+ android:right="-3dp"
+ android:left="-3dp">
+ <shape>
+ <!-- Padding creates vertical space between the text and the underline,
+ as well as right padding for search icon/clear button -->
+ <padding
+ android:top="@dimen/search_bar_padding_y"
+ android:bottom="@dimen/search_bar_padding_y"
+ android:right="@dimen/search_bar_padding_right"/>
+ <solid android:color="@android:color/transparent"/>
+ <!-- We apply a color filter to set the color for the selected search engine -->
+ <stroke android:width="2dp" android:color="@android:color/white"/>
+ </shape>
+ </item>
+
+</layer-list>
diff --git a/mobile/android/base/resources/drawable/facet_button_background.xml b/mobile/android/base/resources/drawable/facet_button_background.xml
new file mode 100644
index 000000000..de1b6e996
--- /dev/null
+++ b/mobile/android/base/resources/drawable/facet_button_background.xml
@@ -0,0 +1,15 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <!--facet button is pressed (omitting currently-selected facet)-->
+ <item
+ android:state_pressed="true"
+ android:state_checked="false"
+ android:drawable="@drawable/facet_button_background_pressed"/>
+
+ <!--default-->
+ <item
+ android:drawable="@drawable/facet_button_background_default"/>
+</selector>
diff --git a/mobile/android/base/resources/drawable/facet_button_background_default.xml b/mobile/android/base/resources/drawable/facet_button_background_default.xml
new file mode 100644
index 000000000..b3358d2ed
--- /dev/null
+++ b/mobile/android/base/resources/drawable/facet_button_background_default.xml
@@ -0,0 +1,8 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle">
+ <solid android:color="@color/facet_button_background_color_default" />
+</shape>
diff --git a/mobile/android/base/resources/drawable/facet_button_background_pressed.xml b/mobile/android/base/resources/drawable/facet_button_background_pressed.xml
new file mode 100644
index 000000000..0a46f6057
--- /dev/null
+++ b/mobile/android/base/resources/drawable/facet_button_background_pressed.xml
@@ -0,0 +1,8 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle">
+ <solid android:color="@color/facet_button_background_color_pressed" />
+</shape>
diff --git a/mobile/android/base/resources/drawable/home_banner.xml b/mobile/android/base/resources/drawable/home_banner.xml
new file mode 100644
index 000000000..ea536ced0
--- /dev/null
+++ b/mobile/android/base/resources/drawable/home_banner.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_pressed="true">
+ <layer-list>
+ <item android:left="-2dp"
+ android:right="-2dp"
+ android:bottom="-2dp">
+
+ <shape android:shape="rectangle" >
+ <stroke android:width="2dp"
+ android:color="#FFE0E4E7" />
+ <solid android:color="#FFC5D0DA" />
+ </shape>
+ </item>
+ </layer-list>
+ </item>
+
+ <item>
+ <layer-list>
+ <item android:left="-2dp"
+ android:right="-2dp"
+ android:bottom="-2dp">
+
+ <shape android:shape="rectangle" >
+ <stroke android:width="2dp"
+ android:color="#FFE0E4E7" />
+ <solid android:color="@color/about_page_header_grey" />
+ </shape>
+ </item>
+ </layer-list>
+ </item>
+
+</selector>
diff --git a/mobile/android/base/resources/drawable/home_history_clear_button_bg.xml b/mobile/android/base/resources/drawable/home_history_clear_button_bg.xml
new file mode 100644
index 000000000..f4fee99f4
--- /dev/null
+++ b/mobile/android/base/resources/drawable/home_history_clear_button_bg.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ - This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+ <item>
+ <shape android:shape="rectangle" >
+ <stroke android:width="1dp"
+ android:color="@color/toolbar_divider_grey" />
+ <padding android:top="1dp" />
+ </shape>
+ </item>
+ <item>
+ <selector>
+ <item android:state_pressed="true"
+ android:drawable="@color/toolbar_grey_pressed" />
+ <item android:drawable="@color/toolbar_grey"/>
+ </selector>
+ </item>
+</layer-list> \ No newline at end of file
diff --git a/mobile/android/base/resources/drawable/home_pager_empty_state.xml b/mobile/android/base/resources/drawable/home_pager_empty_state.xml
new file mode 100644
index 000000000..71389ebc6
--- /dev/null
+++ b/mobile/android/base/resources/drawable/home_pager_empty_state.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+ <item android:maxLevel="0" android:drawable="@android:color/white"/>
+
+ <item>
+ <bitmap android:src="@drawable/icon_home_empty_firefox"
+ android:gravity="center"/>
+ </item>
+
+</layer-list> \ No newline at end of file
diff --git a/mobile/android/base/resources/drawable/ic_as_bookmarked.xml b/mobile/android/base/resources/drawable/ic_as_bookmarked.xml
new file mode 100644
index 000000000..033718641
--- /dev/null
+++ b/mobile/android/base/resources/drawable/ic_as_bookmarked.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="@color/activity_stream_icon"
+ android:pathData="M12.01,1a1.34,1.34 0,0 0,-1.085 0.89l-2.747,5.67 -5.877,0.99c-1.345,0.22 -1.679,1.19 -0.744,2.15l4.16,4.49 -0.969,6.31c-0.147,0.94 0.242,1.5 0.925,1.5a1.986,1.986 0,0 0,0.891 -0.25l5.457,-2.93 5.521,2.93a1.993,1.993 0,0 0,0.892 0.25c0.683,0 1.07,-0.56 0.926,-1.5l-0.966,-6.31 4.111,-4.49c0.936,-0.96 0.6,-1.93 -0.744,-2.15l-5.789,-0.99 -2.877,-5.67a1.339,1.339 0,0 0,-1.085 -0.89h0Z"/>
+</vector>
diff --git a/mobile/android/base/resources/drawable/ic_as_visited.xml b/mobile/android/base/resources/drawable/ic_as_visited.xml
new file mode 100644
index 000000000..05006ef95
--- /dev/null
+++ b/mobile/android/base/resources/drawable/ic_as_visited.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="@color/activity_stream_icon"
+ android:pathData="M12,18a6,6 0,1 1,6 -6A6,6 0,0 1,12 18ZM12,9a3,3 0,1 0,3 3A3,3 0,0 0,12 9Z"/>
+</vector>
diff --git a/mobile/android/base/resources/drawable/icon_grid_item_bg.xml b/mobile/android/base/resources/drawable/icon_grid_item_bg.xml
new file mode 100644
index 000000000..45c9cb1f3
--- /dev/null
+++ b/mobile/android/base/resources/drawable/icon_grid_item_bg.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_focused="true"
+ android:state_pressed="true"
+ android:drawable="@drawable/grid_icon_bg_focused" />
+
+ <item android:state_activated="true"
+ android:drawable="@drawable/grid_icon_bg_activated" />
+
+ <item android:drawable="@android:color/transparent" />
+
+</selector>
diff --git a/mobile/android/base/resources/drawable/logo.xml b/mobile/android/base/resources/drawable/logo.xml
new file mode 100644
index 000000000..e188f80dc
--- /dev/null
+++ b/mobile/android/base/resources/drawable/logo.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- Overidden. -->
+<bitmap
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:src="@drawable/icon"/>
diff --git a/mobile/android/base/resources/drawable/menu_item_action_bar_bg.xml b/mobile/android/base/resources/drawable/menu_item_action_bar_bg.xml
new file mode 100644
index 000000000..ad00f49f9
--- /dev/null
+++ b/mobile/android/base/resources/drawable/menu_item_action_bar_bg.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_pressed="true"
+ android:state_enabled="true">
+ <shape>
+ <solid android:color="@color/toolbar_grey_pressed" />
+ </shape>
+ </item>
+
+ <item android:state_focused="true"
+ android:state_pressed="false">
+ <shape>
+ <solid android:color="@color/highlight_focused" />
+ </shape>
+ </item>
+
+ <item android:drawable="@android:color/transparent"/>
+
+</selector>
diff --git a/mobile/android/base/resources/drawable/menu_item_state.xml b/mobile/android/base/resources/drawable/menu_item_state.xml
new file mode 100644
index 000000000..c7063f4e3
--- /dev/null
+++ b/mobile/android/base/resources/drawable/menu_item_state.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+ <item gecko:state_more="true"
+ android:drawable="@drawable/menu_item_more"/>
+
+ <item gecko:state_more="false"
+ android:state_checkable="true"
+ android:state_checked="true"
+ android:drawable="@drawable/menu_item_check"/>
+
+ <item gecko:state_more="false"
+ android:state_checkable="true"
+ android:state_checked="false"
+ android:drawable="@drawable/menu_item_uncheck"/>
+
+ <item android:drawable="@android:color/transparent"/>
+
+</selector>
diff --git a/mobile/android/base/resources/drawable/overlay_share_bookmark_button.xml b/mobile/android/base/resources/drawable/overlay_share_bookmark_button.xml
new file mode 100644
index 000000000..bc1d51c5d
--- /dev/null
+++ b/mobile/android/base/resources/drawable/overlay_share_bookmark_button.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item
+ android:state_enabled="false"
+ android:drawable="@drawable/overlay_bookmarked_already_icon"/>
+ <item
+ android:drawable="@drawable/overlay_bookmark_icon"/>
+</selector>
diff --git a/mobile/android/base/resources/drawable/overlay_share_button_background.xml b/mobile/android/base/resources/drawable/overlay_share_button_background.xml
new file mode 100644
index 000000000..6077ad38a
--- /dev/null
+++ b/mobile/android/base/resources/drawable/overlay_share_button_background.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ - This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ -->
+
+<!-- Should be kept in sync with overlay_share_button_background_first.xml -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_pressed="true" android:drawable="@color/toolbar_grey_pressed" />
+ <item android:drawable="@color/toolbar_grey"/>
+
+</selector>
diff --git a/mobile/android/base/resources/drawable/overlay_share_button_background_first.xml b/mobile/android/base/resources/drawable/overlay_share_button_background_first.xml
new file mode 100644
index 000000000..65ee5de9d
--- /dev/null
+++ b/mobile/android/base/resources/drawable/overlay_share_button_background_first.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ - This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ -->
+
+<!-- Should be kept in sync with overlay_share_button_background.xml
+
+ This first item in the list has rounded corners. -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_pressed="true">
+ <shape>
+ <solid android:color="@color/toolbar_grey_pressed"/>
+ <corners android:topLeftRadius="@dimen/standard_corner_radius"
+ android:topRightRadius="@dimen/standard_corner_radius"/>
+ </shape>
+ </item>
+
+ <item>
+ <shape>
+ <solid android:color="@color/toolbar_grey"/>
+ <corners android:topLeftRadius="@dimen/standard_corner_radius"
+ android:topRightRadius="@dimen/standard_corner_radius"/>
+ </shape>
+ </item>
+
+</selector>
diff --git a/mobile/android/base/resources/drawable/panel_auth_button.xml b/mobile/android/base/resources/drawable/panel_auth_button.xml
new file mode 100644
index 000000000..4a9adf428
--- /dev/null
+++ b/mobile/android/base/resources/drawable/panel_auth_button.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_pressed="true">
+ <layer-list>
+ <item android:left="-2dp"
+ android:right="-2dp"
+ android:top="-2dp">
+
+ <shape android:shape="rectangle" >
+ <stroke android:width="2dp"
+ android:color="#FFE0E4E7" />
+ <solid android:color="#FFC5D0DA" />
+ </shape>
+ </item>
+ </layer-list>
+ </item>
+
+ <item>
+ <layer-list>
+ <item android:left="-2dp"
+ android:right="-2dp"
+ android:top="-2dp">
+
+ <shape android:shape="rectangle" >
+ <stroke android:width="2dp"
+ android:color="#FFE0E4E7" />
+ <solid android:color="@color/about_page_header_grey" />
+ </shape>
+ </item>
+ </layer-list>
+ </item>
+
+</selector>
diff --git a/mobile/android/base/resources/drawable/progressbar.xml b/mobile/android/base/resources/drawable/progressbar.xml
new file mode 100644
index 000000000..627484a1f
--- /dev/null
+++ b/mobile/android/base/resources/drawable/progressbar.xml
@@ -0,0 +1,9 @@
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:id="@android:id/progress">
+ <clip>
+ <shape>
+ <solid android:color="@color/fennec_ui_orange"/>
+ </shape>
+ </clip>
+ </item>
+</layer-list>
diff --git a/mobile/android/base/resources/drawable/push_notification.png b/mobile/android/base/resources/drawable/push_notification.png
new file mode 100644
index 000000000..2a52dbd50
--- /dev/null
+++ b/mobile/android/base/resources/drawable/push_notification.png
Binary files differ
diff --git a/mobile/android/base/resources/drawable/remote_tabs_setup_button_background.xml b/mobile/android/base/resources/drawable/remote_tabs_setup_button_background.xml
new file mode 100644
index 000000000..dad4e5124
--- /dev/null
+++ b/mobile/android/base/resources/drawable/remote_tabs_setup_button_background.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_pressed="true">
+ <shape android:shape="rectangle">
+ <solid android:color="@color/remote_tabs_setup_button_background_hit"/>
+ <corners android:radius="@dimen/standard_corner_radius"/>
+ </shape>
+ </item>
+
+ <item>
+ <shape android:shape="rectangle">
+ <solid android:color="@color/action_orange"/>
+ <corners android:radius="@dimen/standard_corner_radius"/>
+ </shape>
+ </item>
+</selector>
diff --git a/mobile/android/base/resources/drawable/search_row_background.xml b/mobile/android/base/resources/drawable/search_row_background.xml
new file mode 100644
index 000000000..ded70ec6d
--- /dev/null
+++ b/mobile/android/base/resources/drawable/search_row_background.xml
@@ -0,0 +1,10 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_pressed="true" android:drawable="@color/row_background_pressed" />
+ <item android:drawable="@color/row_background"/>
+
+</selector>
diff --git a/mobile/android/base/resources/drawable/search_suggestion_button.xml b/mobile/android/base/resources/drawable/search_suggestion_button.xml
new file mode 100644
index 000000000..b91fd4bf0
--- /dev/null
+++ b/mobile/android/base/resources/drawable/search_suggestion_button.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_pressed="true">
+ <shape>
+ <solid android:color="@color/toolbar_grey_pressed"/>
+ <corners android:radius="@dimen/standard_corner_radius"/>
+ </shape>
+ </item>
+
+ <item>
+ <shape>
+ <solid android:color="@color/toolbar_grey"/>
+ <corners android:radius="@dimen/standard_corner_radius"/>
+ </shape>
+ </item>
+</selector>
diff --git a/mobile/android/base/resources/drawable/search_suggestion_prompt_no.xml b/mobile/android/base/resources/drawable/search_suggestion_prompt_no.xml
new file mode 100644
index 000000000..b976cfa5a
--- /dev/null
+++ b/mobile/android/base/resources/drawable/search_suggestion_prompt_no.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_pressed="true">
+ <shape>
+ <solid android:color="@color/toolbar_grey_pressed"/>
+ <corners android:radius="@dimen/doorhanger_rounded_corner_radius"/>
+ </shape>
+ </item>
+
+ <item>
+ <shape>
+ <solid android:color="@color/toolbar_menu_dark_grey"/>
+ <corners android:radius="@dimen/doorhanger_rounded_corner_radius"/>
+ </shape>
+ </item>
+</selector>
diff --git a/mobile/android/base/resources/drawable/search_suggestion_prompt_yes.xml b/mobile/android/base/resources/drawable/search_suggestion_prompt_yes.xml
new file mode 100644
index 000000000..12551497b
--- /dev/null
+++ b/mobile/android/base/resources/drawable/search_suggestion_prompt_yes.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<item android:state_pressed="true">
+ <shape>
+ <solid android:color="@color/link_blue_pressed"/>
+ <corners android:radius="@dimen/doorhanger_rounded_corner_radius"/>
+ </shape>
+</item>
+
+<item>
+ <shape>
+ <solid android:color="@color/link_blue"/>
+ <corners android:radius="@dimen/doorhanger_rounded_corner_radius"/>
+ </shape>
+</item>
+</selector>
diff --git a/mobile/android/base/resources/drawable/shaped_button.xml b/mobile/android/base/resources/drawable/shaped_button.xml
new file mode 100644
index 000000000..74fc45f85
--- /dev/null
+++ b/mobile/android/base/resources/drawable/shaped_button.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- If you change this view, update ShapedButton*,
+ which dynamically resets to this view. -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_pressed="true"
+ android:drawable="@color/highlight_shaped"/>
+
+ <item android:state_focused="true"
+ android:state_pressed="false"
+ android:drawable="@color/highlight_shaped_focused"/>
+
+ <item android:drawable="@color/text_and_tabs_tray_grey"/>
+
+</selector>
diff --git a/mobile/android/base/resources/drawable/site_security_level.xml b/mobile/android/base/resources/drawable/site_security_level.xml
new file mode 100644
index 000000000..5fee9fffa
--- /dev/null
+++ b/mobile/android/base/resources/drawable/site_security_level.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<level-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:maxLevel="0" android:drawable="@drawable/site_security_unknown"/>
+ <item android:maxLevel="1" android:drawable="@drawable/lock_secure"/>
+ <item android:maxLevel="2" android:drawable="@drawable/lock_secure"/>
+ <item android:maxLevel="3" android:drawable="@drawable/warning_minor"/>
+ <item android:maxLevel="4" android:drawable="@drawable/lock_disabled"/>
+ <item android:maxLevel="5" android:drawable="@drawable/shield_enabled"/>
+ <item android:maxLevel="6" android:drawable="@drawable/shield_disabled"/>
+
+ <!-- Special icon used for about:home -->
+ <item android:maxLevel="999" android:drawable="@drawable/search_icon_inactive" />
+</level-list>
diff --git a/mobile/android/base/resources/drawable/site_security_unknown.xml b/mobile/android/base/resources/drawable/site_security_unknown.xml
new file mode 100644
index 000000000..86ff863e1
--- /dev/null
+++ b/mobile/android/base/resources/drawable/site_security_unknown.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- The favicon drawable is not the same dimensions as the site security
+ lock icons so we offset it using this drawable to compensate. -->
+<inset
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:drawable="@drawable/favicon_globe"
+ android:insetTop="@dimen/site_security_unknown_inset_top"
+ android:insetBottom="@dimen/site_security_unknown_inset_bottom"/>
diff --git a/mobile/android/base/resources/drawable/tab_history_bg.xml b/mobile/android/base/resources/drawable/tab_history_bg.xml
new file mode 100644
index 000000000..1819ddd58
--- /dev/null
+++ b/mobile/android/base/resources/drawable/tab_history_bg.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+ <item>
+ <shape
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle" >
+ <stroke
+ android:width="@dimen/tab_history_bg_width"
+ android:color="@color/tab_history_border_color" />
+
+ <padding android:top="@dimen/tab_history_border_padding" />
+ </shape>
+ </item>
+ <item>
+ <shape
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle" >
+ <solid
+ android:width="@dimen/tab_history_bg_width"
+ android:color="@color/toolbar_grey" />
+ </shape>
+ </item>
+</layer-list>
diff --git a/mobile/android/base/resources/drawable/tab_history_icon_state.xml b/mobile/android/base/resources/drawable/tab_history_icon_state.xml
new file mode 100644
index 000000000..504dd5804
--- /dev/null
+++ b/mobile/android/base/resources/drawable/tab_history_icon_state.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_enabled="false">
+ <shape>
+ <solid android:color="@color/tab_history_favicon_background" />
+ <stroke android:width="@dimen/tab_history_favicon_border_disabled"
+ android:color="@color/tab_history_favicon_border" />
+ </shape>
+ </item>
+
+ <item android:state_enabled="true">
+ <shape>
+ <solid android:color="@color/tab_history_favicon_background" />
+ <stroke android:width="@dimen/tab_history_favicon_border_enabled"
+ android:color="@color/tab_history_favicon_border" />
+ </shape>
+ </item>
+
+</selector>
diff --git a/mobile/android/base/resources/drawable/tab_item_close_button.xml b/mobile/android/base/resources/drawable/tab_item_close_button.xml
new file mode 100644
index 000000000..401234633
--- /dev/null
+++ b/mobile/android/base/resources/drawable/tab_item_close_button.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <!-- pressed state -->
+ <item android:state_pressed="true"
+ android:drawable="@drawable/tab_close_active"/>
+
+ <item android:state_checked="true"
+ android:drawable="@drawable/tab_close_active"/>
+
+ <!-- normal mode -->
+ <item android:drawable="@drawable/tab_close"/>
+
+</selector>
diff --git a/mobile/android/base/resources/drawable/tab_panel_tab_background.xml b/mobile/android/base/resources/drawable/tab_panel_tab_background.xml
new file mode 100644
index 000000000..c69bfbd81
--- /dev/null
+++ b/mobile/android/base/resources/drawable/tab_panel_tab_background.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+ <item gecko:state_private="true">
+ <layer-list>
+ <item>
+ <shape android:shape="rectangle">
+ <solid android:color="@color/private_toolbar_grey"/>
+ </shape>
+ </item>
+
+ <item>
+ <bitmap android:src="@drawable/tab_preview_masq"
+ android:gravity="center"/>
+ </item>
+ </layer-list>
+ </item>
+
+ <item>
+ <layer-list>
+ <item>
+ <shape android:shape="rectangle">
+ <solid android:color="@color/about_page_header_grey"/>
+ </shape>
+ </item>
+
+ <item>
+ <bitmap android:src="@drawable/globe_light"
+ android:gravity="center"/>
+ </item>
+ </layer-list>
+ </item>
+</selector>
diff --git a/mobile/android/base/resources/drawable/tab_queue_dismiss_button_foreground.xml b/mobile/android/base/resources/drawable/tab_queue_dismiss_button_foreground.xml
new file mode 100644
index 000000000..843ce5870
--- /dev/null
+++ b/mobile/android/base/resources/drawable/tab_queue_dismiss_button_foreground.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_pressed="true"
+ android:color="@color/tab_queue_dismiss_button_foreground_pressed" />
+
+ <item android:color="@color/tab_queue_dismiss_button_foreground"/>
+
+</selector> \ No newline at end of file
diff --git a/mobile/android/base/resources/drawable/tab_row.xml b/mobile/android/base/resources/drawable/tab_row.xml
new file mode 100644
index 000000000..cefd990f3
--- /dev/null
+++ b/mobile/android/base/resources/drawable/tab_row.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_focused="true"
+ android:drawable="@color/tab_row_pressed"/>
+
+ <item android:state_pressed="true"
+ android:drawable="@color/tab_row_pressed"/>
+
+ <item android:drawable="@android:color/transparent"/>
+
+</selector>
diff --git a/mobile/android/base/resources/drawable/tab_strip_button.xml b/mobile/android/base/resources/drawable/tab_strip_button.xml
new file mode 100644
index 000000000..7daa9d5c4
--- /dev/null
+++ b/mobile/android/base/resources/drawable/tab_strip_button.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+ <item android:state_pressed="true"
+ android:state_enabled="true">
+
+ <inset android:insetTop="@dimen/tablet_tab_strip_button_inset"
+ android:insetBottom="@dimen/tablet_tab_strip_button_inset"
+ android:insetLeft="@dimen/tablet_tab_strip_button_inset"
+ android:insetRight="@dimen/tablet_tab_strip_button_inset">
+ <shape android:shape="rectangle">
+ <solid android:color="@color/highlight_dark"/>
+ <corners android:radius="@dimen/standard_corner_radius"/>
+ </shape>
+ </inset>
+
+ </item>
+
+ <item android:state_focused="true"
+ android:state_pressed="false">
+
+ <inset android:insetTop="@dimen/tablet_tab_strip_button_inset"
+ android:insetBottom="@dimen/tablet_tab_strip_button_inset"
+ android:insetLeft="@dimen/tablet_tab_strip_button_inset"
+ android:insetRight="@dimen/tablet_tab_strip_button_inset">
+ <shape android:shape="rectangle">
+ <solid android:color="@color/tablet_highlight_focused"/>
+ <corners android:radius="@dimen/standard_corner_radius"/>
+ </shape>
+ </inset>
+
+ </item>
+
+ <item>
+ <shape android:shape="rectangle">
+ <solid android:color="@android:color/transparent"/>
+ </shape>
+ </item>
+
+</selector>
diff --git a/mobile/android/base/resources/drawable/tab_strip_divider.xml b/mobile/android/base/resources/drawable/tab_strip_divider.xml
new file mode 100644
index 000000000..4ff4ff31f
--- /dev/null
+++ b/mobile/android/base/resources/drawable/tab_strip_divider.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle">
+
+ <solid android:color="#555555"/>
+
+ <size android:width="1dp"
+ android:height="30dp"/>
+
+ <!-- We draw this ourselves in TabStripView.draw() and to avoid implementing more
+ than we have to, only bottom padding is taken into account. -->
+ <padding android:bottom="6dp"/>
+
+</shape>
diff --git a/mobile/android/base/resources/drawable/tab_thumbnail.xml b/mobile/android/base/resources/drawable/tab_thumbnail.xml
new file mode 100644
index 000000000..e51de927e
--- /dev/null
+++ b/mobile/android/base/resources/drawable/tab_thumbnail.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+ <item android:state_focused="true">
+
+ <shape android:shape="rectangle">
+ <!-- @color/fennec_ui_orange with alpha -->
+ <solid android:color="#B3FF9500"/>
+ <corners android:radius="@dimen/standard_corner_radius"/>
+ </shape>
+
+ </item>
+
+ <item android:state_focused="true"
+ gecko:state_private="true">
+
+ <shape android:shape="rectangle">
+ <!-- @color/private_browsing_purple with alpha -->
+ <solid android:color="#B3CF68FF"/>
+ <corners android:radius="@dimen/standard_corner_radius"/>
+ </shape>
+
+ </item>
+
+ <item android:state_pressed="true"
+ gecko:state_private="true">
+
+ <shape android:shape="rectangle">
+ <!-- @color/private_browsing_purple with alpha -->
+ <solid android:color="#B3CF68FF"/>
+ <corners android:radius="@dimen/standard_corner_radius"/>
+ </shape>
+
+ </item>
+
+ <item android:state_pressed="true">
+
+ <shape android:shape="rectangle">
+ <!-- @color/fennec_ui_orange with alpha -->
+ <solid android:color="#B3FF9500"/>
+ <corners android:radius="@dimen/standard_corner_radius"/>
+ </shape>
+
+ </item>
+
+ <item gecko:state_recording="true">
+
+ <shape android:shape="rectangle">
+ <solid android:color="#FFFF0000"/>
+ <corners android:radius="@dimen/standard_corner_radius"/>
+ </shape>
+
+ </item>
+
+ <item android:state_focused="false"
+ android:state_pressed="false"
+ android:state_checked="true"
+ gecko:state_recording="false"
+ gecko:state_private="true">
+
+ <shape android:shape="rectangle">
+ <solid android:color="@color/private_browsing_purple"/>
+ <corners android:radius="@dimen/standard_corner_radius"/>
+ </shape>
+
+ </item>
+
+ <item android:state_focused="false"
+ android:state_pressed="false"
+ android:state_checked="true"
+ gecko:state_recording="false">
+
+ <shape android:shape="rectangle">
+ <solid android:color="@color/fennec_ui_orange"/>
+ <corners android:radius="@dimen/standard_corner_radius"/>
+ </shape>
+
+ </item>
+
+ <item android:drawable="@android:color/transparent"/>
+
+</selector>
diff --git a/mobile/android/base/resources/drawable/tabs_panel_indicator.xml b/mobile/android/base/resources/drawable/tabs_panel_indicator.xml
new file mode 100644
index 000000000..4c1ab7655
--- /dev/null
+++ b/mobile/android/base/resources/drawable/tabs_panel_indicator.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+ <item android:state_focused="false"
+ android:state_selected="false"
+ android:state_pressed="false"
+ android:drawable="@android:color/transparent"/>
+
+ <item gecko:state_private="true"
+ android:state_focused="false"
+ android:state_selected="true"
+ android:state_pressed="false"
+ android:drawable="@drawable/tabs_panel_indicator_selected_private"/>
+
+ <item android:state_focused="false"
+ android:state_selected="true"
+ android:state_pressed="false"
+ android:drawable="@drawable/tabs_panel_indicator_selected"/>
+
+ <item android:state_focused="true"
+ android:state_selected="false"
+ android:state_pressed="false"
+ android:drawable="@color/highlight_dark_focused"/>
+
+ <item android:state_focused="true"
+ android:state_selected="true"
+ android:state_pressed="false"
+ android:drawable="@drawable/tab_indicator_selected_focused"/>
+
+ <item android:state_focused="false"
+ android:state_selected="false"
+ android:state_pressed="true"
+ android:drawable="@color/highlight_dark"/>
+
+ <item android:state_focused="false"
+ android:state_selected="true"
+ android:state_pressed="true"
+ android:drawable="@color/highlight_dark"/>
+
+ <item android:state_focused="true"
+ android:state_selected="false"
+ android:state_pressed="true"
+ android:drawable="@color/highlight_dark"/>
+
+ <item android:state_focused="true"
+ android:state_selected="true"
+ android:state_pressed="true"
+ android:drawable="@color/highlight_dark"/>
+
+</selector>
diff --git a/mobile/android/base/resources/drawable/tabs_panel_indicator_selected.xml b/mobile/android/base/resources/drawable/tabs_panel_indicator_selected.xml
new file mode 100644
index 000000000..c74b343e5
--- /dev/null
+++ b/mobile/android/base/resources/drawable/tabs_panel_indicator_selected.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+ android:insetTop="@dimen/tabs_panel_indicator_selected_padding_top"
+ android:drawable="@color/fennec_ui_orange"
+ />
diff --git a/mobile/android/base/resources/drawable/tabs_panel_indicator_selected_private.xml b/mobile/android/base/resources/drawable/tabs_panel_indicator_selected_private.xml
new file mode 100644
index 000000000..93dc04986
--- /dev/null
+++ b/mobile/android/base/resources/drawable/tabs_panel_indicator_selected_private.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+ android:insetTop="@dimen/tabs_panel_indicator_selected_padding_top"
+ android:drawable="@color/private_browsing_purple"
+ />
diff --git a/mobile/android/base/resources/drawable/tabs_strip_indicator.xml b/mobile/android/base/resources/drawable/tabs_strip_indicator.xml
new file mode 100644
index 000000000..32ca3115a
--- /dev/null
+++ b/mobile/android/base/resources/drawable/tabs_strip_indicator.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_focused="false"
+ android:state_selected="false"
+ android:state_pressed="false"
+ android:drawable="@android:color/transparent"/>
+
+ <item android:state_focused="false"
+ android:state_selected="true"
+ android:state_pressed="false"
+ android:drawable="@drawable/tab_indicator_selected"/>
+
+ <item android:state_focused="true"
+ android:state_selected="false"
+ android:state_pressed="false"
+ android:drawable="@color/highlight_dark_focused"/>
+
+ <item android:state_focused="true"
+ android:state_selected="true"
+ android:state_pressed="false"
+ android:drawable="@drawable/tab_indicator_selected_focused"/>
+
+ <item android:state_focused="false"
+ android:state_selected="false"
+ android:state_pressed="true"
+ android:drawable="@color/highlight_dark"/>
+
+ <item android:state_focused="false"
+ android:state_selected="true"
+ android:state_pressed="true"
+ android:drawable="@color/highlight_dark"/>
+
+ <item android:state_focused="true"
+ android:state_selected="false"
+ android:state_pressed="true"
+ android:drawable="@color/highlight_dark"/>
+
+ <item android:state_focused="true"
+ android:state_selected="true"
+ android:state_pressed="true"
+ android:drawable="@color/highlight_dark"/>
+
+</selector>
diff --git a/mobile/android/base/resources/drawable/toast_background.xml b/mobile/android/base/resources/drawable/toast_background.xml
new file mode 100644
index 000000000..55cd9d9b2
--- /dev/null
+++ b/mobile/android/base/resources/drawable/toast_background.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle">
+ <solid android:color="@color/toast_background" />
+ <corners android:radius="@dimen/toast_button_corner_radius" />
+</shape>
diff --git a/mobile/android/base/resources/drawable/toast_button_background.xml b/mobile/android/base/resources/drawable/toast_button_background.xml
new file mode 100644
index 000000000..6570d9b45
--- /dev/null
+++ b/mobile/android/base/resources/drawable/toast_button_background.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <!-- On Android pre v12/3.0/Gingerbread, bottom left and bottom
+ right are swapped. These values correct this bug; the resources
+ that don't need correction are in res/drawable-v12. -->
+ <item android:state_pressed="true">
+ <shape android:shape="rectangle">
+ <solid android:color="@color/toast_button_pressed" />
+ <corners
+ android:topRightRadius="@dimen/toast_button_corner_radius"
+ android:bottomLeftRadius="@dimen/toast_button_corner_radius"
+ android:topLeftRadius="0dp"
+ android:bottomRightRadius="0dp" />
+ </shape>
+ </item>
+ <item>
+ <shape android:shape="rectangle">
+ <solid android:color="@color/toast_button_background" />
+ <corners
+ android:topRightRadius="@dimen/toast_button_corner_radius"
+ android:bottomLeftRadius="@dimen/toast_button_corner_radius"
+ android:topLeftRadius="0dp"
+ android:bottomRightRadius="0dp" />
+ </shape>
+ </item>
+</selector>
diff --git a/mobile/android/base/resources/drawable/toolbar_favicon_default.xml b/mobile/android/base/resources/drawable/toolbar_favicon_default.xml
new file mode 100644
index 000000000..92e294fb3
--- /dev/null
+++ b/mobile/android/base/resources/drawable/toolbar_favicon_default.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+ android:src="@drawable/favicon_globe" />
diff --git a/mobile/android/base/resources/drawable/toolbar_grey_round.xml b/mobile/android/base/resources/drawable/toolbar_grey_round.xml
new file mode 100644
index 000000000..ada0146dd
--- /dev/null
+++ b/mobile/android/base/resources/drawable/toolbar_grey_round.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <solid android:color="@color/toolbar_grey"/>
+ <corners android:radius="@dimen/standard_corner_radius"/>
+</shape>
+
diff --git a/mobile/android/base/resources/drawable/top_sites_thumbnail_bg.xml b/mobile/android/base/resources/drawable/top_sites_thumbnail_bg.xml
new file mode 100644
index 000000000..9d106441e
--- /dev/null
+++ b/mobile/android/base/resources/drawable/top_sites_thumbnail_bg.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle">
+ <size android:height="2dp"
+ android:width="2dp"/>
+ <solid android:color="#FFFFFFFF"/>
+ <stroke android:width="1dp" android:color="#FFDDDDDD"/>
+</shape>
diff --git a/mobile/android/base/resources/drawable/url_bar_bg.xml b/mobile/android/base/resources/drawable/url_bar_bg.xml
new file mode 100644
index 000000000..52954c1ce
--- /dev/null
+++ b/mobile/android/base/resources/drawable/url_bar_bg.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+ <!-- private browsing mode -->
+ <item gecko:state_private="true" android:drawable="@color/tabs_tray_grey_pressed"/>
+
+ <!-- normal mode -->
+ <item android:drawable="@color/toolbar_grey"/>
+
+</selector>
diff --git a/mobile/android/base/resources/drawable/url_bar_entry.xml b/mobile/android/base/resources/drawable/url_bar_entry.xml
new file mode 100644
index 000000000..4090ceb8e
--- /dev/null
+++ b/mobile/android/base/resources/drawable/url_bar_entry.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+ <!-- private browsing mode -->
+ <item gecko:state_private="true"
+ android:state_focused="true"
+ android:drawable="@drawable/url_bar_entry_pressed_pb"/>
+
+ <item gecko:state_private="true"
+ android:state_pressed="true"
+ android:drawable="@drawable/url_bar_entry_pressed_pb"/>
+
+ <item gecko:state_private="true"
+ android:state_selected="true"
+ android:drawable="@drawable/url_bar_entry_pressed_pb"/>
+
+ <item gecko:state_private="true"
+ android:drawable="@drawable/url_bar_entry_default_pb"/>
+
+ <!-- normal modes -->
+ <item android:state_focused="true"
+ android:drawable="@drawable/url_bar_entry_pressed"/>
+
+ <item android:state_pressed="true"
+ android:drawable="@drawable/url_bar_entry_pressed"/>
+
+ <item android:state_selected="true"
+ android:drawable="@drawable/url_bar_entry_pressed"/>
+
+ <item android:drawable="@drawable/url_bar_entry_default"/>
+
+</selector>
diff --git a/mobile/android/base/resources/drawable/url_bar_nav_button.xml b/mobile/android/base/resources/drawable/url_bar_nav_button.xml
new file mode 100644
index 000000000..2afadaf5e
--- /dev/null
+++ b/mobile/android/base/resources/drawable/url_bar_nav_button.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- This asset is properly available in large-* dirs so this null
+ reference exists for build time on API 9 builds. -->
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+ android:src="@null"/>
diff --git a/mobile/android/base/resources/drawable/url_bar_translating_edge.xml b/mobile/android/base/resources/drawable/url_bar_translating_edge.xml
new file mode 100644
index 000000000..379499284
--- /dev/null
+++ b/mobile/android/base/resources/drawable/url_bar_translating_edge.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<clip xmlns:android="http://schemas.android.com/apk/res/android"
+ android:drawable="@drawable/url_bar_entry"
+ android:clipOrientation="horizontal"
+ android:gravity="right"/> \ No newline at end of file
diff --git a/mobile/android/base/resources/drawable/widget_button_left.xml b/mobile/android/base/resources/drawable/widget_button_left.xml
new file mode 100644
index 000000000..9891f8ada
--- /dev/null
+++ b/mobile/android/base/resources/drawable/widget_button_left.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_pressed="true"
+ android:drawable="@drawable/widget_button_left_pressed"/>
+
+ <!-- The left button is gray in its off state -->
+ <item android:drawable="@drawable/widget_button_left_default"/>
+
+</selector>
diff --git a/mobile/android/base/resources/drawable/widget_button_left_default.xml b/mobile/android/base/resources/drawable/widget_button_left_default.xml
new file mode 100644
index 000000000..7aff6bc1a
--- /dev/null
+++ b/mobile/android/base/resources/drawable/widget_button_left_default.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- These drawables have to be wrapped in a layer-list in order to produce padding at
+ the bottom of the drawable. That padding ensures the drawable doesn't block the
+ orange strip in widget_bg.9.png -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:bottom="@dimen/widget_bg_border_offset">
+ <shape android:shape="rectangle">
+ <corners android:topLeftRadius="@dimen/widget_drawable_corner_radius"
+ android:topRightRadius="0dp"
+ android:bottomLeftRadius="0dp"
+ android:bottomRightRadius="0dp"/>
+ <solid android:color="@color/toolbar_grey"/>
+ </shape>
+ </item>
+</layer-list>
diff --git a/mobile/android/base/resources/drawable/widget_button_left_pressed.xml b/mobile/android/base/resources/drawable/widget_button_left_pressed.xml
new file mode 100644
index 000000000..d4ae5a715
--- /dev/null
+++ b/mobile/android/base/resources/drawable/widget_button_left_pressed.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- These drawables have to be wrapped in a layer-list in order to produce padding at
+ the bottom of the drawable. That padding ensures the drawable doesn't block the
+ orange strip in widget_bg.9.png -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:bottom="@dimen/widget_bg_border_offset">
+ <shape android:shape="rectangle">
+ <corners android:topLeftRadius="@dimen/widget_drawable_corner_radius"
+ android:topRightRadius="0dp"
+ android:bottomLeftRadius="0dp"
+ android:bottomRightRadius="0dp"/>
+ <solid android:color="@color/widget_button_pressed"/>
+ </shape>
+ </item>
+</layer-list>
diff --git a/mobile/android/base/resources/drawable/widget_button_middle.xml b/mobile/android/base/resources/drawable/widget_button_middle.xml
new file mode 100644
index 000000000..e7d74b0cc
--- /dev/null
+++ b/mobile/android/base/resources/drawable/widget_button_middle.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_pressed="true"
+ android:drawable="@drawable/widget_button_middle_pressed"/>
+
+ <item android:drawable="@android:color/transparent"/>
+
+</selector>
diff --git a/mobile/android/base/resources/drawable/widget_button_middle_pressed.xml b/mobile/android/base/resources/drawable/widget_button_middle_pressed.xml
new file mode 100644
index 000000000..19236d641
--- /dev/null
+++ b/mobile/android/base/resources/drawable/widget_button_middle_pressed.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- These drawables have to be wrapped in a layer-list in order to produce padding at
+ the bottom of the drawable. That padding ensures the drawable doesn't block the
+ orange strip in widget_bg.9.png -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:bottom="@dimen/widget_bg_border_offset">
+ <shape android:shape="rectangle">
+ <solid android:color="@color/widget_button_pressed"/>
+ </shape>
+ </item>
+</layer-list>
diff --git a/mobile/android/base/resources/drawable/widget_button_right.xml b/mobile/android/base/resources/drawable/widget_button_right.xml
new file mode 100644
index 000000000..54fae2018
--- /dev/null
+++ b/mobile/android/base/resources/drawable/widget_button_right.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_pressed="true"
+ android:drawable="@drawable/widget_button_right_pressed"/>
+
+ <item android:drawable="@android:color/transparent"/>
+
+</selector>
diff --git a/mobile/android/base/resources/drawable/widget_button_right_pressed.xml b/mobile/android/base/resources/drawable/widget_button_right_pressed.xml
new file mode 100644
index 000000000..2ebf61489
--- /dev/null
+++ b/mobile/android/base/resources/drawable/widget_button_right_pressed.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- These drawables have to be wrapped in a layer-list in order to produce padding at
+ the bottom of the drawable. That padding ensures the drawable doesn't block the
+ orange strip in widget_bg.9.png -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:bottom="@dimen/widget_bg_border_offset">
+ <shape android:shape="rectangle">
+ <corners android:topLeftRadius="0dp"
+ android:topRightRadius="@dimen/widget_drawable_corner_radius"
+ android:bottomLeftRadius="0dp"
+ android:bottomRightRadius="0dp"/>
+ <solid android:color="@color/widget_button_pressed"/>
+ </shape>
+ </item>
+</layer-list>
diff --git a/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml b/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
new file mode 100644
index 000000000..77a968369
--- /dev/null
+++ b/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+ <ImageView android:id="@+id/url_bar_entry"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_alignLeft="@+id/back"
+ android:layout_toLeftOf="@id/menu_items"
+ android:layout_marginLeft="@dimen/tablet_nav_button_width_half"
+ android:layout_marginTop="10dp"
+ android:layout_marginBottom="10dp"
+ android:duplicateParentState="true"
+ android:clickable="false"
+ android:focusable="false"
+ android:background="@drawable/url_bar_entry"/>
+
+ <!-- The attributes statically defined here are for the expanded
+ forward button. We translate/hide the forward button in code -
+ see BrowserToolbarTablet.animateForwardButton.
+
+ (for alpha) We want the button hidden to start so alpha=0.
+
+ (for layout_width) The visible area of the forward button is a
+ nav_button_width and the non-visible area slides halfway
+ under the back button. This non-visible area is used to
+ ensure the forward button background fully covers the space
+ to the right of the back button.
+
+ (for layout_marginLeft) We left align with back,
+ but only need to hide halfway underneath.
+
+ (for paddingLeft) We use left padding to center the
+ arrow in the visible area as opposed to the true width. -->
+ <org.mozilla.gecko.toolbar.ForwardButton
+ style="@style/UrlBar.ImageButton.BrowserToolbarColors"
+ android:id="@+id/forward"
+ android:layout_alignLeft="@id/back"
+ android:contentDescription="@string/forward"
+ android:layout_height="match_parent"
+ android:paddingTop="0dp"
+ android:paddingBottom="0dp"
+ android:layout_marginTop="11.5dp"
+ android:layout_marginBottom="11.5dp"
+ android:layout_gravity="center_vertical"
+ android:layout_centerVertical="true"
+ android:src="@drawable/ic_menu_forward"
+ android:background="@drawable/url_bar_nav_button"
+ android:alpha="0"
+ android:layout_width="@dimen/tablet_nav_button_width_plus_half"
+ android:layout_marginLeft="@dimen/tablet_nav_button_width_half"
+ android:paddingLeft="18dp"/>
+
+ <org.mozilla.gecko.toolbar.BackButton android:id="@id/back"
+ style="@style/UrlBar.ImageButton.BrowserToolbarColors"
+ android:layout_width="@dimen/tablet_nav_button_width"
+ android:layout_height="@dimen/tablet_nav_button_width"
+ android:layout_centerVertical="true"
+ android:layout_marginLeft="12dp"
+ android:layout_alignParentLeft="true"
+ android:src="@drawable/ic_menu_back"
+ android:contentDescription="@string/back"
+ android:background="@drawable/url_bar_nav_button"/>
+
+ <org.mozilla.gecko.toolbar.ToolbarEditLayout android:id="@+id/edit_layout"
+ style="@style/UrlBar.Button"
+ android:paddingRight="12dp"
+ android:visibility="gone"
+ android:orientation="horizontal"
+ android:layout_toRightOf="@id/back"
+ android:layout_toLeftOf="@id/menu_items"/>
+
+ <!-- Note: we set the padding on the site security icon to increase its tappable area. -->
+ <org.mozilla.gecko.toolbar.ToolbarDisplayLayout android:id="@+id/display_layout"
+ style="@style/UrlBar.Button.Container"
+ android:layout_toRightOf="@id/back"
+ android:layout_toLeftOf="@id/menu_items"
+ android:paddingRight="4dip"/>
+
+ <LinearLayout android:id="@+id/menu_items"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical"
+ android:layout_marginLeft="6dp"
+ android:orientation="horizontal"
+ android:layout_toLeftOf="@id/tabs"/>
+
+ <org.mozilla.gecko.widget.themed.ThemedImageButton
+ android:id="@+id/tabs"
+ style="@style/UrlBar.ImageButton"
+ android:layout_toLeftOf="@id/menu"
+ android:layout_alignWithParentIfMissing="true"
+ android:background="@drawable/browser_toolbar_action_bar_button"/>
+
+ <!-- In a 56x60dp space, centering 24dp image will leave 16x18dp. -->
+ <org.mozilla.gecko.toolbar.TabCounter android:id="@+id/tabs_counter"
+ style="@style/UrlBar.ImageButton"
+ android:layout_alignLeft="@id/tabs"
+ android:layout_alignRight="@id/tabs"
+ android:layout_alignTop="@id/tabs"
+ android:layout_alignBottom="@id/tabs"
+ android:layout_marginTop="18dp"
+ android:layout_marginBottom="18dp"
+ android:layout_marginLeft="16dp"
+ android:layout_marginRight="16dp"
+ android:background="@drawable/tabs_count"/>
+
+ <!-- Bug 1144707. Use clickable View instead of menu button margin to prevent
+ edit mode actiivation when user clicks on the edge of the screen. -->
+ <View android:id="@id/menu_margin"
+ android:layout_width="6dp"
+ android:layout_height="match_parent"
+ android:layout_alignParentRight="true"
+ android:clickable="true"
+ android:visibility="gone"/>
+
+ <org.mozilla.gecko.widget.themed.ThemedFrameLayout
+ android:id="@+id/menu"
+ style="@style/UrlBar.ImageButton"
+ android:layout_toLeftOf="@id/menu_margin"
+ android:layout_alignWithParentIfMissing="true"
+ android:contentDescription="@string/menu"
+ android:background="@drawable/browser_toolbar_action_bar_button">
+
+ <org.mozilla.gecko.widget.themed.ThemedImageView
+ android:id="@+id/menu_icon"
+ style="@style/UrlBar.ImageButton.BrowserToolbarColors"
+ android:layout_height="@dimen/browser_toolbar_menu_icon_height"
+ android:layout_width="wrap_content"
+ android:scaleType="centerInside"
+ android:src="@drawable/menu"
+ android:layout_gravity="center"/>
+
+ </org.mozilla.gecko.widget.themed.ThemedFrameLayout>
+
+ <!-- We draw after the menu items so when they are hidden, the cancel button,
+ which is thus drawn on top, may be pressed. -->
+ <org.mozilla.gecko.widget.themed.ThemedImageView
+ android:id="@+id/edit_cancel"
+ style="@style/UrlBar.ImageButton"
+ android:layout_width="@dimen/browser_toolbar_icon_width"
+ android:layout_height="@dimen/browser_toolbar_height"
+ android:layout_weight="0.0"
+ android:layout_alignParentRight="true"
+ android:src="@drawable/close_edit_mode_selector"
+ android:contentDescription="@string/edit_mode_cancel"
+ android:visibility="gone"/>
+
+</merge>
diff --git a/mobile/android/base/resources/layout-large-v11/tabs_counter.xml b/mobile/android/base/resources/layout-large-v11/tabs_counter.xml
new file mode 100644
index 000000000..df771a231
--- /dev/null
+++ b/mobile/android/base/resources/layout-large-v11/tabs_counter.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<org.mozilla.gecko.widget.themed.ThemedTextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="24dip"
+ android:layout_height="24dip"
+ android:paddingTop="3dip"
+ android:paddingLeft="4dip"
+ android:background="@drawable/tabs_count_foreground"
+ android:textAppearance="@style/TextAppearance.Micro"
+ android:textColor="@color/tabs_counter_text_color"
+ android:textStyle="bold"
+ android:duplicateParentState="true"
+ android:gravity="center"/>
diff --git a/mobile/android/base/resources/layout-xlarge-v11/font_size_preference.xml b/mobile/android/base/resources/layout-xlarge-v11/font_size_preference.xml
new file mode 100644
index 000000000..a406b55a2
--- /dev/null
+++ b/mobile/android/base/resources/layout-xlarge-v11/font_size_preference.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ - You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <ScrollView android:id="@+id/scrolling_container"
+ android:layout_width="match_parent"
+ android:layout_height="350dp"
+ android:layout_margin="8dp"
+ android:padding="8dp"
+ android:scrollbars="vertical"
+ android:scrollbarStyle="outsideOverlay"
+ android:fadeScrollbars="true"
+ android:requiresFadingEdge="vertical">
+
+ <TextView android:id="@+id/preview"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/pref_font_size_preview_text"
+ android:textColor="#ff000000"/>
+
+ </ScrollView>
+
+ <LinearLayout android:id="@+id/button_container"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="4dp"
+ android:layout_marginRight="4dp"
+ android:orientation="horizontal">
+
+ <Button android:id="@+id/decrease_preview_font_button"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:text="@string/pref_font_size_adjust_char"
+ android:textSize="8sp"/>
+
+ <Button android:id="@+id/increase_preview_font_button"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:text="@string/pref_font_size_adjust_char"
+ android:textSize="16sp"/>
+
+ </LinearLayout>
+
+</LinearLayout>
diff --git a/mobile/android/base/resources/layout/actionbar.xml b/mobile/android/base/resources/layout/actionbar.xml
new file mode 100644
index 000000000..ecb5124de
--- /dev/null
+++ b/mobile/android/base/resources/layout/actionbar.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <Button android:id="@+id/actionmode_title"
+ android:layout_height="match_parent"
+ android:layout_width="wrap_content"
+ style="@style/GeckoActionBar.Title"/>
+
+ <!-- Draw a separator to the left of the title -->
+ <View android:layout_height="match_parent"
+ android:layout_width="1dp"
+ android:layout_marginTop="10dp"
+ android:layout_marginBottom="10dp"
+ android:background="@color/text_color_secondary_inverse"/>
+
+ <LinearLayout android:id="@+id/actionbar_buttons"
+ android:layout_height="match_parent"
+ android:layout_width="0dip"
+ android:layout_weight="1"
+ style="@style/GeckoActionBar.Buttons"/>
+
+ <ImageButton android:id="@+id/actionbar_menu"
+ android:layout_height="match_parent"
+ android:layout_width="@dimen/browser_toolbar_icon_width"
+ style="@style/GeckoActionBar.Button.MenuButton"/>
+
+</merge>
diff --git a/mobile/android/base/resources/layout/activity_stream.xml b/mobile/android/base/resources/layout/activity_stream.xml
new file mode 100644
index 000000000..b40c01cde
--- /dev/null
+++ b/mobile/android/base/resources/layout/activity_stream.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.mozilla.gecko.home.activitystream.ActivityStreamHomeScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="#FAFAFA"/>
diff --git a/mobile/android/base/resources/layout/activity_stream_card_history_item.xml b/mobile/android/base/resources/layout/activity_stream_card_history_item.xml
new file mode 100644
index 000000000..7f411278d
--- /dev/null
+++ b/mobile/android/base/resources/layout/activity_stream_card_history_item.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?><!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="10dp"
+ android:layout_marginEnd="@dimen/activity_stream_base_margin"
+ android:layout_marginLeft="@dimen/activity_stream_base_margin"
+ android:layout_marginRight="@dimen/activity_stream_base_margin"
+ android:layout_marginStart="@dimen/activity_stream_base_margin"
+ android:layout_marginTop="0dp"
+ android:orientation="vertical">
+
+ <RelativeLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:background="?android:attr/selectableItemBackground">
+
+ <org.mozilla.gecko.widget.FaviconView
+ android:id="@+id/icon"
+ android:layout_width="@dimen/favicon_bg"
+ android:layout_height="@dimen/favicon_bg"
+ android:layout_marginLeft="@dimen/activity_stream_base_margin"
+ android:layout_marginStart="@dimen/activity_stream_base_margin"
+ android:layout_marginTop="@dimen/activity_stream_base_margin"
+ android:layout_marginBottom="@dimen/activity_stream_base_margin"
+ android:layout_gravity="center"
+ gecko:enableRoundCorners="false"
+ tools:background="@drawable/favicon_globe" />
+
+ <ImageView
+ android:id="@+id/menu"
+ android:layout_width="wrap_content"
+ android:layout_height="36dp"
+ android:layout_margin="2dp"
+ android:layout_alignParentEnd="true"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentTop="true"
+ android:layout_gravity="right|top"
+ android:contentDescription="@string/menu"
+ android:src="@drawable/menu"
+ android:padding="@dimen/activity_stream_base_margin" />
+
+ <TextView
+ android:id="@+id/page"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ tools:text="twitter"
+ android:textSize="12sp"
+ android:textColor="@color/activity_stream_subtitle"
+ android:layout_toRightOf="@id/icon"
+ android:layout_toEndOf="@id/icon"
+ android:layout_toLeftOf="@id/menu"
+ android:layout_toStartOf="@id/menu"
+ android:paddingTop="@dimen/activity_stream_base_margin"
+ android:paddingLeft="@dimen/activity_stream_base_margin"
+ android:paddingStart="@dimen/activity_stream_base_margin"/>
+
+ <TextView
+ android:id="@+id/card_history_label"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_toEndOf="@id/icon"
+ android:layout_toRightOf="@id/icon"
+ android:maxLines="3"
+ android:ellipsize="end"
+ android:paddingLeft="@dimen/activity_stream_base_margin"
+ android:paddingStart="@dimen/activity_stream_base_margin"
+ android:textSize="14sp"
+ android:textStyle="bold"
+ android:textColor="#ff000000"
+ android:layout_below="@id/page"
+ android:layout_toLeftOf="@id/menu"
+ android:layout_toStartOf="@id/menu"
+ tools:text="Descriptive title of a page that is veeeeeeery long - maybe even too long?" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_toRightOf="@id/icon"
+ android:layout_toEndOf="@id/icon"
+ android:layout_alignParentBottom="true"
+ android:paddingLeft="@dimen/activity_stream_base_margin"
+ android:paddingStart="@dimen/activity_stream_base_margin"
+ android:paddingRight="@dimen/activity_stream_base_margin"
+ android:paddingEnd="@dimen/activity_stream_base_margin"
+ android:paddingTop="4dp"
+ android:paddingBottom="@dimen/activity_stream_base_margin"
+ android:gravity="center_vertical"
+ android:layout_below="@id/card_history_label">
+
+ <ImageView
+ android:id="@+id/source_icon"
+ android:layout_width="12dp"
+ android:layout_height="12dp" />
+
+ <TextView
+ android:id="@+id/card_history_source"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="2dp"
+ android:textSize="12sp"
+ android:layout_weight="1"
+ android:textColor="@color/activity_stream_subtitle"
+ tools:text="Bookmarked" />
+
+ <TextView
+ android:id="@+id/card_history_time_since"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textSize="12sp"
+ android:textColor="@color/activity_stream_timestamp"
+ tools:text="20m" />
+
+ </LinearLayout>
+ </RelativeLayout>
+</android.support.v7.widget.CardView>
diff --git a/mobile/android/base/resources/layout/activity_stream_contextmenu_bottomsheet.xml b/mobile/android/base/resources/layout/activity_stream_contextmenu_bottomsheet.xml
new file mode 100644
index 000000000..327587e6e
--- /dev/null
+++ b/mobile/android/base/resources/layout/activity_stream_contextmenu_bottomsheet.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <RelativeLayout
+ android:id="@+id/info_wrapper"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:padding="10dp">
+
+ <org.mozilla.gecko.widget.FaviconView
+ android:id="@+id/icon"
+ android:layout_width="@dimen/favicon_bg"
+ android:layout_height="@dimen/favicon_bg"
+ android:layout_gravity="center"
+ gecko:enableRoundCorners="false"
+ tools:background="@drawable/favicon_globe"/>
+
+ <TextView
+ android:id="@+id/url"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_toEndOf="@id/icon"
+ android:layout_toRightOf="@id/icon"
+ android:paddingLeft="@dimen/activity_stream_base_margin"
+ android:paddingStart="@dimen/activity_stream_base_margin"
+ android:textColor="@color/activity_stream_subtitle"
+ android:textSize="12sp"
+ tools:text="twitter"/>
+
+ <TextView
+ android:id="@+id/title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/url"
+ android:layout_toEndOf="@id/icon"
+ android:layout_toRightOf="@id/icon"
+ android:ellipsize="end"
+ android:maxLines="3"
+ android:paddingLeft="@dimen/activity_stream_base_margin"
+ android:paddingStart="@dimen/activity_stream_base_margin"
+ android:textColor="#ff000000"
+ android:textSize="14sp"
+ android:textStyle="bold"
+ tools:text="Descriptive title of a page that is veeeeeeery long - maybe even too long?"/>
+ </RelativeLayout>
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="0.5dp"
+ android:layout_marginTop="4dp"
+ android:background="@color/disabled_grey"
+ android:padding="4dp"/>
+
+ <android.support.v4.widget.NestedScrollView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <android.support.design.widget.NavigationView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/menu"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:itemTextAppearance="@style/ActivityStreamContextMenuText"
+ android:theme="@style/ActivityStreamContextMenuStyle"
+ app:menu="@menu/activitystream_contextmenu"/>
+
+ </android.support.v4.widget.NestedScrollView>
+
+
+</LinearLayout>
diff --git a/mobile/android/base/resources/layout/activity_stream_contextmenu_popupmenu.xml b/mobile/android/base/resources/layout/activity_stream_contextmenu_popupmenu.xml
new file mode 100644
index 000000000..a21d67528
--- /dev/null
+++ b/mobile/android/base/resources/layout/activity_stream_contextmenu_popupmenu.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="32dp"
+ android:layout_height="200dp"
+ app:cardElevation="5dp"
+ app:cardUseCompatPadding="true">
+
+ <!-- This is mostly a copy of the same menu in activity_stream_contextmenu_bottomsheet.xml,
+ however for the popup menu we don't need to override the dividers, hence we omit the
+ android:theme override -->
+ <android.support.design.widget.NavigationView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/menu"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:itemTextAppearance="@style/ActivityStreamContextMenuText"
+ app:menu="@menu/activitystream_contextmenu"/>
+
+</android.support.v7.widget.CardView> \ No newline at end of file
diff --git a/mobile/android/base/resources/layout/activity_stream_main_highlightstitle.xml b/mobile/android/base/resources/layout/activity_stream_main_highlightstitle.xml
new file mode 100644
index 000000000..7338c8596
--- /dev/null
+++ b/mobile/android/base/resources/layout/activity_stream_main_highlightstitle.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ <View
+ android:id="@+id/divider"
+ android:layout_width="match_parent"
+ android:layout_height="0.5dp"
+ android:padding="4dp"
+ android:background="#ffe0e0e0" />
+
+ <TextView
+ android:id="@+id/title_highlights"
+ android:layout_marginLeft="@dimen/activity_stream_base_margin"
+ android:layout_marginStart="@dimen/activity_stream_base_margin"
+ android:layout_marginTop="@dimen/activity_stream_base_margin"
+ android:layout_marginBottom="@dimen/activity_stream_base_margin"
+ android:layout_marginRight="@dimen/activity_stream_base_margin"
+ android:layout_marginEnd="@dimen/activity_stream_base_margin"
+ android:text="@string/activity_stream_highlights"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textStyle="bold"
+ android:textSize="16sp"
+ android:textColor="#FF858585" />
+
+</LinearLayout>
diff --git a/mobile/android/base/resources/layout/activity_stream_main_toppanel.xml b/mobile/android/base/resources/layout/activity_stream_main_toppanel.xml
new file mode 100644
index 000000000..60c420063
--- /dev/null
+++ b/mobile/android/base/resources/layout/activity_stream_main_toppanel.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <android.support.v4.view.ViewPager
+ android:layout_marginTop="10dp"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:id="@+id/topsites_pager"
+ android:contentDescription="@string/activity_stream_topsites" />
+
+ <org.mozilla.gecko.home.activitystream.topsites.CirclePageIndicator
+ android:id="@+id/topsites_indicator"
+ android:padding="10dip"
+ app:fillColor="#ff9d9d9d"
+ app:pageColor="#FFFFFF"
+ app:strokeWidth="1dp"
+ app:radius="2dp"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+
+</LinearLayout>
diff --git a/mobile/android/base/resources/layout/activity_stream_topsites_card.xml b/mobile/android/base/resources/layout/activity_stream_topsites_card.xml
new file mode 100644
index 000000000..8cb288b2f
--- /dev/null
+++ b/mobile/android/base/resources/layout/activity_stream_topsites_card.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.mozilla.gecko.widget.FilledCardView xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+
+ <RelativeLayout
+ android:id="@+id/content"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="?android:attr/selectableItemBackground">
+
+ <org.mozilla.gecko.widget.FaviconView
+ android:id="@+id/favicon"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_above="@+id/title"
+ android:layout_alignParentTop="true"
+ android:layout_centerHorizontal="true"
+ android:layout_gravity="center"
+ gecko:enableRoundCorners="false"
+ tools:background="@drawable/favicon_globe" />
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="0.5dp"
+ android:layout_below="@id/favicon"
+ android:background="@color/activity_stream_divider" />
+
+ <TextView
+ android:id="@+id/title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentEnd="true"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentStart="true"
+ android:ellipsize="end"
+ android:gravity="center"
+ android:lines="1"
+ android:padding="4dp"
+ android:textSize="12sp"
+ android:textColor="@android:color/black"
+ tools:text="Lorem Ipsum here is a title" />
+
+ <ImageView
+ android:id="@+id/menu"
+ android:layout_width="wrap_content"
+ android:layout_height="28dp"
+ android:layout_alignParentEnd="true"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentTop="true"
+ android:layout_gravity="right|top"
+ android:padding="6dp"
+ android:contentDescription="@string/menu"
+ android:src="@drawable/menu" />
+
+ </RelativeLayout>
+</org.mozilla.gecko.widget.FilledCardView> \ No newline at end of file
diff --git a/mobile/android/base/resources/layout/activity_stream_topsites_page.xml b/mobile/android/base/resources/layout/activity_stream_topsites_page.xml
new file mode 100644
index 000000000..78399f7fc
--- /dev/null
+++ b/mobile/android/base/resources/layout/activity_stream_topsites_page.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.mozilla.gecko.home.activitystream.topsites.TopSitesPage xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:paddingLeft="10dp"/>
diff --git a/mobile/android/base/resources/layout/anchored_popup.xml b/mobile/android/base/resources/layout/anchored_popup.xml
new file mode 100644
index 000000000..bc4b61493
--- /dev/null
+++ b/mobile/android/base/resources/layout/anchored_popup.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@drawable/dropshadow"
+ android:paddingLeft="3dp"
+ android:paddingRight="3dp"
+ android:paddingTop="3dp"
+ android:paddingBottom="4dp">
+
+ <ScrollView android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <org.mozilla.gecko.widget.RoundedCornerLayout android:id="@+id/content"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/toolbar_grey"
+ android:orientation="vertical"/>
+
+ </ScrollView>
+</FrameLayout>
diff --git a/mobile/android/base/resources/layout/as_content.xml b/mobile/android/base/resources/layout/as_content.xml
new file mode 100644
index 000000000..780d00beb
--- /dev/null
+++ b/mobile/android/base/resources/layout/as_content.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <android.support.v7.widget.RecyclerView
+ android:id="@+id/activity_stream_main_recyclerview"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"/>
+</merge> \ No newline at end of file
diff --git a/mobile/android/base/resources/layout/autocomplete_list.xml b/mobile/android/base/resources/layout/autocomplete_list.xml
new file mode 100644
index 000000000..78487d42c
--- /dev/null
+++ b/mobile/android/base/resources/layout/autocomplete_list.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<ListView xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@android:style/Widget.Holo.ListView"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@drawable/autocomplete_list_bg"
+ android:cacheColorHint="#ffffff"/>
diff --git a/mobile/android/base/resources/layout/autocomplete_list_item.xml b/mobile/android/base/resources/layout/autocomplete_list_item.xml
new file mode 100644
index 000000000..b8bbf6fd5
--- /dev/null
+++ b/mobile/android/base/resources/layout/autocomplete_list_item.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="32dip"
+ android:textAppearance="@style/TextAppearance.Medium"
+ android:layout_gravity="center_vertical"
+ android:paddingLeft="10dp"
+ android:paddingRight="10dp"
+ android:paddingTop="3dp"
+ android:paddingBottom="3dp"/>
diff --git a/mobile/android/base/resources/layout/basic_color_picker_dialog.xml b/mobile/android/base/resources/layout/basic_color_picker_dialog.xml
new file mode 100644
index 000000000..4efb341d5
--- /dev/null
+++ b/mobile/android/base/resources/layout/basic_color_picker_dialog.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:orientation="vertical">
+
+ <org.mozilla.gecko.widget.BasicColorPicker android:id="@+id/colorpicker"
+ android:layout_height="0dip"
+ android:layout_weight="1"
+ android:drawSelectorOnTop="true"
+ android:choiceMode="singleChoice"
+ android:divider="@android:color/transparent"
+ android:dividerHeight="0dip"
+ android:listSelector="#22FFFFFF"
+ android:layout_width="match_parent"/>
+
+</LinearLayout>
diff --git a/mobile/android/base/resources/layout/bookmark_edit.xml b/mobile/android/base/resources/layout/bookmark_edit.xml
new file mode 100644
index 000000000..cf59096c8
--- /dev/null
+++ b/mobile/android/base/resources/layout/bookmark_edit.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:orientation="vertical"
+ android:layout_height="match_parent">
+
+ <android.support.design.widget.TextInputLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <EditText
+ android:id="@+id/edit_bookmark_name"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:hint="@string/bookmark_edit_name"
+ />
+ </android.support.design.widget.TextInputLayout>
+
+ <android.support.design.widget.TextInputLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <EditText
+ android:id="@+id/edit_bookmark_location"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:hint="@string/bookmark_edit_location"
+ android:inputType="textNoSuggestions"/>
+ </android.support.design.widget.TextInputLayout>
+
+ <android.support.design.widget.TextInputLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <EditText
+ android:id="@+id/edit_bookmark_keyword"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:hint="@string/bookmark_edit_keyword"/>
+ </android.support.design.widget.TextInputLayout>
+
+</LinearLayout>
diff --git a/mobile/android/base/resources/layout/bookmark_folder_row.xml b/mobile/android/base/resources/layout/bookmark_folder_row.xml
new file mode 100644
index 000000000..dcf9620cd
--- /dev/null
+++ b/mobile/android/base/resources/layout/bookmark_folder_row.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<org.mozilla.gecko.home.BookmarkFolderView xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/Widget.FolderView"
+ android:layout_width="match_parent"
+ android:paddingLeft="0dp"
+ android:paddingTop="0dp"
+ android:paddingBottom="0dp"
+ android:paddingRight="16dp"
+ android:gravity="center_vertical"/>
diff --git a/mobile/android/base/resources/layout/bookmark_item_row.xml b/mobile/android/base/resources/layout/bookmark_item_row.xml
new file mode 100644
index 000000000..71d4f532f
--- /dev/null
+++ b/mobile/android/base/resources/layout/bookmark_item_row.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<org.mozilla.gecko.home.TwoLinePageRow xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/Widget.BookmarkItemView"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/page_row_height"
+ android:minHeight="@dimen/page_row_height"/>
diff --git a/mobile/android/base/resources/layout/bookmark_screenshot_row.xml b/mobile/android/base/resources/layout/bookmark_screenshot_row.xml
new file mode 100644
index 000000000..cdb3912c2
--- /dev/null
+++ b/mobile/android/base/resources/layout/bookmark_screenshot_row.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<org.mozilla.gecko.home.BookmarkScreenshotRow
+ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:gecko="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/page_row_height"
+ android:minHeight="@dimen/page_row_height"
+ android:orientation="vertical"
+ android:gravity="center_vertical"
+ android:paddingLeft="16dp"
+ android:paddingRight="16dp"
+>
+
+ <org.mozilla.gecko.widget.FadedSingleColorTextView
+ android:id="@+id/title"
+ style="@style/Widget.TwoLinePageRow.Title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ gecko:fadeWidth="30dp"
+ />
+
+ <org.mozilla.gecko.widget.FadedSingleColorTextView
+ android:id="@+id/date"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textAppearance="@style/TextAppearance.Widget.Home.ItemDescription"
+ android:textColor="@color/link_blue"
+ android:singleLine="true"
+ gecko:fadeWidth="30dp"
+ />
+
+</org.mozilla.gecko.home.BookmarkScreenshotRow>
diff --git a/mobile/android/base/resources/layout/browser_search.xml b/mobile/android/base/resources/layout/browser_search.xml
new file mode 100644
index 000000000..44ff340cf
--- /dev/null
+++ b/mobile/android/base/resources/layout/browser_search.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <ViewStub android:id="@+id/suggestions_opt_in_prompt"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout="@layout/home_suggestion_prompt" />
+
+ <view class="org.mozilla.gecko.home.BrowserSearch$HomeSearchListView"
+ android:id="@+id/home_list_view"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1" />
+
+ <!-- listSelector is too slow for showing pressed state
+ so we set the pressed colors on the child. -->
+ <org.mozilla.gecko.home.SearchEngineBar
+ android:id="@+id/search_engine_bar"
+ android:layout_width="match_parent"
+ android:layout_height="48dp"
+ android:paddingTop="1dp"
+ android:orientation="horizontal"
+ android:layout_gravity="center_horizontal"
+ android:choiceMode="singleChoice"
+ android:listSelector="@android:color/transparent"
+ android:cacheColorHint="@android:color/transparent" />
+
+</LinearLayout>
diff --git a/mobile/android/base/resources/layout/browser_toolbar.xml b/mobile/android/base/resources/layout/browser_toolbar.xml
new file mode 100644
index 000000000..0413215f8
--- /dev/null
+++ b/mobile/android/base/resources/layout/browser_toolbar.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <!-- Note: any layout parameters setting the right edge of
+ this View should be matched in the url_bar_translating_edge. -->
+ <ImageView android:id="@+id/url_bar_entry"
+ style="@style/UrlBar.Button"
+ android:layout_marginLeft="8dp"
+ android:layout_marginRight="-6dp"
+ android:layout_marginTop="8dp"
+ android:layout_marginBottom="8dp"
+ android:layout_toLeftOf="@+id/tabs"
+ android:duplicateParentState="true"
+ android:clickable="false"
+ android:focusable="false"
+ android:src="@drawable/url_bar_entry"
+ android:scaleType="fitXY"/>
+
+ <!-- A View that clips with url_bar_entry and translates
+ around it to animate growing the url bar,
+ which occurs in the display/editing mode transitions. -->
+ <ImageView android:id="@+id/url_bar_translating_edge"
+ style="@style/UrlBar.Button"
+ android:layout_alignLeft="@id/url_bar_entry"
+ android:layout_alignRight="@+id/url_bar_entry"
+ android:layout_alignTop="@id/url_bar_entry"
+ android:layout_alignBottom="@id/url_bar_entry"
+ android:duplicateParentState="true"
+ android:clickable="false"
+ android:focusable="false"
+ android:visibility="invisible"
+ android:src="@drawable/url_bar_translating_edge"
+ android:scaleType="fitXY"/>
+
+ <org.mozilla.gecko.toolbar.ShapedButtonFrameLayout
+ android:id="@+id/menu"
+ style="@style/UrlBar.ImageButton"
+ android:layout_alignParentRight="true"
+ android:contentDescription="@string/menu"
+ android:background="@drawable/shaped_button">
+
+ <org.mozilla.gecko.widget.themed.ThemedImageView
+ android:id="@+id/menu_icon"
+ style="@style/UrlBar.ImageButton"
+ android:layout_height="@dimen/browser_toolbar_menu_icon_height"
+ android:layout_width="wrap_content"
+ android:scaleType="centerInside"
+ android:layout_gravity="center"
+ android:src="@drawable/menu"
+ android:tint="@color/tabs_tray_icon_grey"/>
+
+ </org.mozilla.gecko.toolbar.ShapedButtonFrameLayout>
+
+ <org.mozilla.gecko.toolbar.PhoneTabsButton android:id="@+id/tabs"
+ style="@style/UrlBar.ImageButton"
+ android:layout_width="64dip"
+ android:layout_toLeftOf="@id/menu"
+ android:layout_alignWithParentIfMissing="true"
+ android:background="@drawable/shaped_button"/>
+
+ <!-- The TextSwitcher should be shifted 24dp on the left, to avoid
+ the curve. On a 48dp space, centering 24dp image will leave
+ 12dp on all sides. However this image has a perception of
+ 2 layers. Hence to center this, an additional 4dp is added to the left.
+ The margins will be 40dp on left, 8dp on right, instead of ideal 30dp
+ and 12dp. -->
+ <org.mozilla.gecko.toolbar.TabCounter android:id="@+id/tabs_counter"
+ style="@style/UrlBar.ImageButton"
+ android:layout_width="24dip"
+ android:layout_height="24dip"
+ android:layout_centerVertical="true"
+ android:layout_marginRight="8dip"
+ android:layout_alignRight="@id/tabs"
+ android:background="@drawable/tabs_count"
+ android:gravity="center_horizontal"
+ android:clipChildren="false"
+ android:clipToPadding="false"/>
+
+ <!-- Note that the edit components are invisible so that the views
+ depending on their location can properly layout. -->
+ <org.mozilla.gecko.widget.themed.ThemedImageView
+ android:id="@+id/edit_cancel"
+ style="@style/UrlBar.ImageButton"
+ android:layout_alignParentRight="true"
+ android:src="@drawable/close_edit_mode_selector"
+ android:contentDescription="@string/edit_mode_cancel"
+ android:background="@drawable/action_bar_button"
+ android:visibility="invisible"/>
+
+ <!-- The space to the left of the cancel button would be larger than the right because
+ the url bar drawable contains some whitespace, so we compensate by removing
+ some padding from the right (value determined through experimentation). -->
+ <org.mozilla.gecko.toolbar.ToolbarEditLayout android:id="@+id/edit_layout"
+ style="@style/UrlBar.Button"
+ android:layout_alignLeft="@id/url_bar_entry"
+ android:layout_toLeftOf="@id/edit_cancel"
+ android:visibility="invisible"
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp"/>
+
+ <org.mozilla.gecko.toolbar.ToolbarDisplayLayout android:id="@+id/display_layout"
+ style="@style/UrlBar.Button"
+ android:layout_alignLeft="@id/url_bar_entry"
+ android:layout_alignRight="@id/url_bar_entry"
+ android:paddingLeft="1dip"
+ android:paddingRight="4dip"/>
+
+</merge>
diff --git a/mobile/android/base/resources/layout/button_toast.xml b/mobile/android/base/resources/layout/button_toast.xml
new file mode 100644
index 000000000..0ca590365
--- /dev/null
+++ b/mobile/android/base/resources/layout/button_toast.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/toast"
+ style="@style/Toast">
+
+ <TextView android:id="@+id/toast_message"
+ style="@style/ToastMessage" />
+
+ <View android:id="@+id/toast_divider"
+ style="@style/ToastDivider" />
+
+ <Button android:id="@+id/toast_button"
+ style="@style/ToastButton" />
+
+</LinearLayout>
diff --git a/mobile/android/base/resources/layout/color_picker_row.xml b/mobile/android/base/resources/layout/color_picker_row.xml
new file mode 100644
index 000000000..716383f50
--- /dev/null
+++ b/mobile/android/base/resources/layout/color_picker_row.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/text"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textAppearance="@style/TextAppearance.Widget.TextView"
+ style="@style/Widget.ListItem"
+ android:background="@drawable/color_picker_row_bg"
+ android:checkMark="@android:color/transparent"/>
diff --git a/mobile/android/base/resources/layout/customtabs_activity.xml b/mobile/android/base/resources/layout/customtabs_activity.xml
new file mode 100644
index 000000000..7ba9c07f6
--- /dev/null
+++ b/mobile/android/base/resources/layout/customtabs_activity.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<RelativeLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/root_layout"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <!--
+ This layout is quite complex because GeckoApp accesses all view groups
+ in this tree. In a perfect world this should just include a GeckoView.
+ -->
+
+ <android.support.v7.widget.Toolbar
+ android:id="@+id/toolbar"
+ android:layout_width="match_parent"
+ android:layout_height="?attr/actionBarSize"
+ android:elevation="4dp"
+ android:background="@color/text_and_tabs_tray_grey"
+ app:layout_scrollFlags="scroll|enterAlways"/>
+
+ <view class="org.mozilla.gecko.GeckoApp$MainLayout"
+ android:id="@+id/main_layout"
+ android:layout_width="match_parent"
+ android:layout_below="@+id/toolbar"
+ android:layout_height="match_parent"
+ android:background="@android:color/transparent">
+
+ <RelativeLayout android:id="@+id/gecko_layout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_below="@+id/tablet_tab_strip"
+ android:layout_above="@+id/find_in_page">
+
+ <fragment class="org.mozilla.gecko.GeckoViewFragment"
+ android:id="@+id/layer_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:scrollbars="none"/>
+
+ </RelativeLayout>
+
+ </view>
+
+</RelativeLayout> \ No newline at end of file
diff --git a/mobile/android/base/resources/layout/datetime_picker.xml b/mobile/android/base/resources/layout/datetime_picker.xml
new file mode 100644
index 000000000..66826f589
--- /dev/null
+++ b/mobile/android/base/resources/layout/datetime_picker.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 2007, 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.
+*/
+-->
+
+<!-- Layout of date picker-->
+
+<!-- Warning: everything within the "pickers" layout is removed and re-ordered
+ depending on the date format selected by the user.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/datetime_picker"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:orientation="vertical"
+ android:gravity="center">
+
+ <LinearLayout android:id="@+id/date_spinners"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_marginLeft="1dip"
+ android:layout_marginRight="1dip"
+ android:gravity="center">
+
+ <!-- Month -->
+ <android.widget.NumberPicker
+ android:id="@+id/month"
+ android:layout_width="60dip"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="1dip"
+ android:layout_marginRight="1dip"
+ android:focusable="true"
+ android:focusableInTouchMode="true"
+ />
+
+ <!-- Week -->
+ <android.widget.NumberPicker
+ android:id="@+id/week"
+ android:layout_width="60dip"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="1dip"
+ android:layout_marginRight="1dip"
+ android:focusable="true"
+ android:focusableInTouchMode="true"
+ />
+
+ <!-- Day -->
+ <android.widget.NumberPicker
+ android:id="@+id/day"
+ android:layout_width="60dip"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="1dip"
+ android:layout_marginRight="1dip"
+ android:focusable="true"
+ android:focusableInTouchMode="true"
+ />
+
+ <!-- Year -->
+ <android.widget.NumberPicker
+ android:id="@+id/year"
+ android:layout_width="75dip"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="1dip"
+ android:layout_marginRight="1dip"
+ android:focusable="true"
+ android:focusableInTouchMode="true"
+ />
+
+ </LinearLayout>
+
+ <LinearLayout android:id="@+id/time_spinners"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_marginLeft="1dip"
+ android:layout_marginRight="1dip"
+ android:gravity="center">
+
+ <!-- Hour -->
+ <android.widget.NumberPicker
+ android:id="@+id/hour"
+ android:layout_width="60dip"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="1dip"
+ android:layout_marginRight="1dip"
+ android:focusable="true"
+ android:focusableInTouchMode="true"
+ />
+
+ <TextView android:id="@+id/mincolon"
+ android:text="@string/colon"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="1dip"
+ android:layout_marginRight="1dip"/>
+
+ <!-- Minute -->
+ <android.widget.NumberPicker
+ android:id="@+id/minute"
+ android:layout_width="60dip"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="1dip"
+ android:layout_marginRight="1dip"
+ android:focusable="true"
+ android:focusableInTouchMode="true"
+ />
+
+ <!-- AMPM -->
+ <android.widget.NumberPicker
+ android:id="@+id/ampm"
+ android:layout_width="60dip"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="1dip"
+ android:layout_marginRight="1dip"
+ android:focusable="true"
+ android:focusableInTouchMode="true"
+ />
+
+ </LinearLayout>
+
+</LinearLayout>
diff --git a/mobile/android/base/resources/layout/default_doorhanger.xml b/mobile/android/base/resources/layout/default_doorhanger.xml
new file mode 100644
index 000000000..fd8bf09aa
--- /dev/null
+++ b/mobile/android/base/resources/layout/default_doorhanger.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <TextView android:id="@+id/doorhanger_message"
+ android:focusable="true"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textAppearance="@style/TextAppearance.DoorHanger.Medium"/>
+
+ <LinearLayout android:id="@+id/doorhanger_inputs"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:layout_marginTop="@dimen/doorhanger_section_padding_medium"
+ android:gravity="right"
+ android:visibility="gone"/>
+
+ <android.support.v7.widget.AppCompatCheckBox
+ android:id="@+id/doorhanger_checkbox"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/doorhanger_section_padding_medium"
+ android:checked="true"
+ android:textColor="@color/placeholder_active_grey"
+ android:visibility="gone"/>
+
+</LinearLayout>
diff --git a/mobile/android/base/resources/layout/doorhanger.xml b/mobile/android/base/resources/layout/doorhanger.xml
new file mode 100644
index 000000000..f3ab4e1fe
--- /dev/null
+++ b/mobile/android/base/resources/layout/doorhanger.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <LinearLayout android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:paddingLeft="@dimen/doorhanger_section_padding_small"
+ android:paddingRight="@dimen/doorhanger_section_padding_small"
+ android:paddingBottom="@dimen/doorhanger_section_padding_medium"
+ android:paddingTop="@dimen/doorhanger_section_padding_medium">
+
+ <ImageView android:id="@+id/doorhanger_icon"
+ android:layout_width="@dimen/doorhanger_icon_size"
+ android:layout_height="@dimen/doorhanger_icon_size"
+ android:layout_gravity="center_horizontal"
+ android:padding="@dimen/doorhanger_section_padding_small"
+ android:layout_marginRight="@dimen/doorhanger_section_padding_small"
+ android:visibility="gone"/>
+
+ <LinearLayout android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <TextView android:id="@+id/doorhanger_title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="@dimen/doorhanger_section_padding_medium"
+ android:textAppearance="@style/TextAppearance.DoorHanger.Medium.Light"
+ android:visibility="gone"/>
+
+ <ViewStub android:id="@+id/content"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"/>
+
+ <TextView android:id="@+id/doorhanger_link"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textAppearance="@style/TextAppearance.DoorHanger.Medium"
+ android:textColor="@color/link_blue"
+ android:layout_marginTop="@dimen/doorhanger_section_padding_large"
+ android:layout_marginBottom="@dimen/doorhanger_section_padding_small"
+ android:visibility="gone"/>
+
+ </LinearLayout>
+
+ </LinearLayout>
+
+ <LinearLayout android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+
+ <Button android:id="@+id/doorhanger_button_negative"
+ style="@style/Widget.Doorhanger.Button"
+ android:textColor="@android:color/black"
+ android:background="@drawable/action_bar_button_negative"
+ android:visibility="gone"/>
+
+ <Button android:id="@+id/doorhanger_button_positive"
+ style="@style/Widget.Doorhanger.Button"
+ android:textColor="@android:color/white"
+ android:background="@drawable/action_bar_button_positive"
+ android:visibility="gone"/>
+
+ </LinearLayout>
+
+ <View android:id="@+id/divider_doorhanger"
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="@color/toolbar_divider_grey"
+ android:visibility="gone"/>
+
+</merge>
diff --git a/mobile/android/base/resources/layout/doorhanger_security.xml b/mobile/android/base/resources/layout/doorhanger_security.xml
new file mode 100644
index 000000000..8f4ddc963
--- /dev/null
+++ b/mobile/android/base/resources/layout/doorhanger_security.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <TextView android:id="@+id/security_title"
+ android:focusable="true"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingBottom="@dimen/doorhanger_subsection_padding"
+ android:textAppearance="@style/TextAppearance.DoorHanger.Medium"
+ android:visibility="gone"/>
+
+ <TextView android:id="@+id/security_state"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingBottom="@dimen/doorhanger_section_padding_small"
+ android:textAppearance="@style/TextAppearance.DoorHanger.Medium.Bold"
+ android:visibility="gone"/>
+
+ <TextView android:id="@+id/security_message"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textAppearance="@style/TextAppearance.DoorHanger.Medium"/>
+
+</LinearLayout>
diff --git a/mobile/android/base/resources/layout/find_in_page_content.xml b/mobile/android/base/resources/layout/find_in_page_content.xml
new file mode 100644
index 000000000..5505f90bc
--- /dev/null
+++ b/mobile/android/base/resources/layout/find_in_page_content.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <view class="org.mozilla.gecko.CustomEditText"
+ android:id="@+id/find_text"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1.0"
+ android:layout_marginLeft="@dimen/find_in_page_text_margin_left"
+ android:layout_marginRight="@dimen/find_in_page_text_margin_right"
+ android:contentDescription="@string/find_text"
+ android:background="@drawable/url_bar_entry"
+ android:singleLine="true"
+ android:textColor="#000000"
+ android:textCursorDrawable="@null"
+ android:inputType="text"
+ android:paddingLeft="@dimen/find_in_page_text_padding_left"
+ android:paddingRight="@dimen/find_in_page_text_padding_right"
+ android:textColorHighlight="@color/fennec_ui_orange"
+ android:imeOptions="actionSearch"
+ android:selectAllOnFocus="true"
+ android:gravity="center_vertical|left"/>
+
+ <TextView android:id="@+id/find_status"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="@dimen/find_in_page_status_margin_right"
+ android:textColor="@color/tabs_tray_icon_grey"
+ android:visibility="gone"/>
+
+ <ImageButton android:id="@+id/find_prev"
+ style="@style/FindBar.ImageButton"
+ android:contentDescription="@string/find_prev"
+ android:layout_marginTop="@dimen/find_in_page_control_margin_top"
+ android:src="@drawable/find_prev"/>
+
+ <ImageButton android:id="@+id/find_next"
+ style="@style/FindBar.ImageButton"
+ android:contentDescription="@string/find_next"
+ android:layout_marginTop="@dimen/find_in_page_control_margin_top"
+ android:src="@drawable/find_next"/>
+
+ <ImageButton android:id="@+id/find_close"
+ style="@style/FindBar.ImageButton"
+ android:contentDescription="@string/find_close"
+ android:layout_marginTop="@dimen/find_in_page_control_margin_top"
+ android:src="@drawable/find_close"/>
+
+</merge>
diff --git a/mobile/android/base/resources/layout/firstrun_animation_container.xml b/mobile/android/base/resources/layout/firstrun_animation_container.xml
new file mode 100644
index 000000000..3e7225365
--- /dev/null
+++ b/mobile/android/base/resources/layout/firstrun_animation_container.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<org.mozilla.gecko.firstrun.FirstrunAnimationContainer xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"
+ android:background="@color/dark_transparent_overlay">
+
+ <org.mozilla.gecko.firstrun.FirstrunPager
+ android:id="@+id/firstrun_pager"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@android:color/white">
+
+ <org.mozilla.gecko.home.TabMenuStrip android:layout_width="match_parent"
+ android:layout_height="@dimen/tabs_strip_height"
+ android:background="@color/firstrun_pager_header"
+ android:visibility="visible"
+ android:layout_gravity="top"
+ gecko:strip="@drawable/home_tab_menu_strip"
+ gecko:activeTextColor="@color/placeholder_grey"
+ gecko:inactiveTextColor="@color/tab_text_color"
+ gecko:tabsMarginLeft="@dimen/firstrun_tab_strip_content_start" />
+
+ </org.mozilla.gecko.firstrun.FirstrunPager>
+</org.mozilla.gecko.firstrun.FirstrunAnimationContainer>
diff --git a/mobile/android/base/resources/layout/firstrun_basepanel_checkable_fragment.xml b/mobile/android/base/resources/layout/firstrun_basepanel_checkable_fragment.xml
new file mode 100644
index 000000000..feedab735
--- /dev/null
+++ b/mobile/android/base/resources/layout/firstrun_basepanel_checkable_fragment.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:orientation="vertical"
+ android:fillViewport="true">
+
+ <LinearLayout android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="@dimen/firstrun_min_height"
+ android:background="@color/about_page_header_grey"
+ android:gravity="center_horizontal"
+ android:orientation="vertical">
+
+ <ImageView android:id="@+id/firstrun_image"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/firstrun_background_height"
+ android:layout_marginTop="40dp"
+ android:layout_marginBottom="40dp"
+ android:scaleType="fitCenter"
+ android:layout_gravity="center"
+ android:adjustViewBounds="true"/>
+
+ <TextView android:id="@+id/firstrun_text"
+ android:layout_width="@dimen/firstrun_content_width"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:textAppearance="@style/TextAppearance.FirstrunLight.Main"/>
+
+ <TextView android:id="@+id/firstrun_subtext"
+ android:layout_width="@dimen/firstrun_content_width"
+ android:layout_height="wrap_content"
+ android:paddingTop="20dp"
+ android:paddingBottom="30dp"
+ android:gravity="center"
+ android:textAppearance="@style/TextAppearance.FirstrunRegular.Body"/>
+
+ <android.support.v7.widget.SwitchCompat
+ android:id="@+id/firstrun_switch"
+ android:layout_width="wrap_content"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:visibility="invisible"/>
+
+ <TextView android:id="@+id/firstrun_link"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="30dp"
+ android:gravity="center"
+ android:textAppearance="@style/TextAppearance.FirstrunRegular.Link"
+ android:text="@string/firstrun_button_next"/>
+ </LinearLayout>
+</ScrollView>
diff --git a/mobile/android/base/resources/layout/firstrun_sync_fragment.xml b/mobile/android/base/resources/layout/firstrun_sync_fragment.xml
new file mode 100644
index 000000000..46fec6d5d
--- /dev/null
+++ b/mobile/android/base/resources/layout/firstrun_sync_fragment.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:orientation="vertical"
+ android:fillViewport="true">
+
+ <LinearLayout android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="@dimen/firstrun_min_height"
+ android:background="@color/about_page_header_grey"
+ android:gravity="center_horizontal"
+ android:orientation="vertical">
+
+
+ <ImageView android:id="@+id/firstrun_image"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/firstrun_background_height"
+ android:layout_marginTop="40dp"
+ android:layout_marginBottom="40dp"
+ android:scaleType="fitCenter"
+ android:layout_gravity="center"
+ android:adjustViewBounds="true"/>
+
+ <TextView android:id="@+id/firstrun_text"
+ android:layout_width="@dimen/firstrun_content_width"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:paddingBottom="40dp"
+ android:textAppearance="@style/TextAppearance.FirstrunLight.Main"/>
+
+ <Button android:id="@+id/welcome_account"
+ style="@style/Widget.Firstrun.Button"
+ android:background="@drawable/button_background_action_orange_round"
+ android:layout_gravity="center"
+ android:text="@string/firstrun_signin_button"/>
+
+ <View android:layout_weight="1"
+ android:layout_height="0dp"
+ android:layout_width="match_parent"/>
+
+ <TextView android:id="@+id/welcome_browse"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="30dp"
+ android:gravity="center"
+ android:textAppearance="@style/TextAppearance.FirstrunRegular.Link"/>
+ </LinearLayout>
+</ScrollView>
diff --git a/mobile/android/base/resources/layout/font_size_preference.xml b/mobile/android/base/resources/layout/font_size_preference.xml
new file mode 100644
index 000000000..b5af5e588
--- /dev/null
+++ b/mobile/android/base/resources/layout/font_size_preference.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ - You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <LinearLayout android:id="@+id/button_container"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="4dp"
+ android:layout_marginRight="4dp"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentLeft="true"
+ android:orientation="horizontal">
+
+ <Button android:id="@+id/decrease_preview_font_button"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:text="@string/pref_font_size_adjust_char"
+ android:textSize="8sp"/>
+
+ <Button android:id="@+id/increase_preview_font_button"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:text="@string/pref_font_size_adjust_char"
+ android:textSize="16sp"/>
+
+ </LinearLayout>
+
+ <ScrollView android:id="@+id/scrolling_container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_above="@id/button_container"
+ android:layout_margin="8dp"
+ android:padding="8dp"
+ android:scrollbars="vertical"
+ android:scrollbarStyle="outsideOverlay"
+ android:fadeScrollbars="true"
+ android:requiresFadingEdge="vertical">
+
+ <TextView android:id="@+id/preview"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/pref_font_size_preview_text"
+ android:textColor="#ff000000"/>
+
+ </ScrollView>
+
+</RelativeLayout>
diff --git a/mobile/android/base/resources/layout/gecko_app.xml b/mobile/android/base/resources/layout/gecko_app.xml
new file mode 100644
index 000000000..ec43b341f
--- /dev/null
+++ b/mobile/android/base/resources/layout/gecko_app.xml
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/root_layout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <ViewStub android:id="@+id/tabs_panel"
+ android:layout="@layout/tabs_panel_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"/>
+
+ <view class="org.mozilla.gecko.GeckoApp$MainLayout"
+ android:id="@+id/main_layout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@android:color/transparent">
+
+ <RelativeLayout android:id="@+id/gecko_layout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_below="@+id/tablet_tab_strip"
+ android:layout_above="@+id/find_in_page">
+
+ <fragment class="org.mozilla.gecko.GeckoViewFragment"
+ android:id="@+id/layer_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:scrollbars="none"/>
+
+ <AbsoluteLayout android:id="@+id/plugin_container"
+ android:background="@android:color/transparent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"/>
+
+ <org.mozilla.gecko.FormAssistPopup android:id="@+id/form_assist_popup"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:visibility="gone"/>
+
+ <view class="org.mozilla.gecko.media.VideoPlayer" android:id="@+id/video_player"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent">
+ </view>
+
+ <ViewStub android:id="@+id/zoomed_view_stub"
+ android:inflatedId="@+id/zoomed_view"
+ android:layout="@layout/zoomed_view"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+
+ <FrameLayout android:id="@+id/home_screen_container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:visibility="gone">
+
+ <ViewStub android:id="@+id/home_pager_stub"
+ android:layout="@layout/home_pager"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"/>
+
+ <ViewStub android:id="@+id/activity_stream_stub"
+ android:layout="@layout/activity_stream"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"/>
+
+ <ViewStub android:id="@+id/home_banner_stub"
+ android:layout="@layout/home_banner"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/home_banner_height"
+ android:layout_gravity="bottom"/>
+
+ <ViewStub android:id="@+id/firstrun_pager_stub"
+ android:layout="@layout/firstrun_animation_container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"/>
+
+ </FrameLayout>
+
+ <View android:id="@+id/doorhanger_overlay"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/dark_transparent_overlay"
+ android:alpha="0"
+ android:layerType="hardware"/>
+
+ </RelativeLayout>
+
+ <org.mozilla.gecko.FindInPageBar android:id="@+id/find_in_page"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ style="@style/FindBar"
+ android:visibility="gone"/>
+
+ <org.mozilla.gecko.MediaCastingBar android:id="@+id/media_casting"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ style="@style/FindBar"
+ android:visibility="gone"/>
+
+ <FrameLayout android:id="@+id/search_container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_below="@+id/browser_chrome"
+ android:visibility="invisible"/>
+
+ <!-- When focus is cleared from from BrowserToolbar's EditText to
+ lower the virtual keyboard, focus will be returned to the root
+ view. To make sure the EditText is not the first focusable view in
+ the root view, BrowserToolbar should be specified as low in the
+ view hierarchy as possible. -->
+
+ <LinearLayout android:id="@id/browser_chrome"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <ViewStub android:id="@+id/tablet_tab_strip"
+ android:inflatedId="@id/tablet_tab_strip"
+ android:layout="@layout/tab_strip"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/tablet_tab_strip_height"
+ android:visibility="gone"/>
+
+ <ViewFlipper
+ android:id="@+id/browser_actionbar"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/browser_toolbar_height_flipper"
+ android:clickable="true"
+ android:focusable="true">
+
+ <org.mozilla.gecko.toolbar.BrowserToolbar
+ android:id="@+id/browser_toolbar"
+ style="@style/BrowserToolbar"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:clickable="true"
+ android:focusable="true"
+ android:background="@drawable/url_bar_bg"/>
+
+ <org.mozilla.gecko.ActionModeCompatView android:id="@+id/actionbar"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"
+ style="@style/GeckoActionBar.ActionMode"/>
+
+ </ViewFlipper>
+
+ </LinearLayout>
+
+ <org.mozilla.gecko.toolbar.ToolbarProgressView android:id="@+id/progress"
+ android:layout_width="match_parent"
+ android:layout_height="14dp"
+ android:layout_marginTop="-8dp"
+ android:layout_below="@id/browser_chrome"
+ android:src="@drawable/progress"
+ android:background="@null"
+ android:visibility="gone" />
+
+ </view>
+
+ <FrameLayout android:id="@+id/tab_history_panel"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_alignParentBottom="true"
+ android:visibility="gone" />
+
+ <ViewStub android:id="@+id/toast_stub"
+ android:layout="@layout/button_toast"
+ style="@style/Toast"/>
+
+</RelativeLayout>
diff --git a/mobile/android/base/resources/layout/history_sync_setup.xml b/mobile/android/base/resources/layout/history_sync_setup.xml
new file mode 100644
index 000000000..d8ebfeebf
--- /dev/null
+++ b/mobile/android/base/resources/layout/history_sync_setup.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-->
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <LinearLayout
+ style="@style/RemoteTabsPanelFrame">
+
+ <TextView
+ style="@style/RemoteTabsPanelItem.TextAppearance.Header"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/fxaccount_getting_started_welcome_to_sync" />
+
+ <TextView
+ style="@style/RemoteTabsPanelItem.TextAppearance"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/fxaccount_getting_started_description" />
+
+ <Button
+ android:id="@+id/sync_setup_button"
+ style="@style/RemoteTabsPanelItem.Button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/fxaccount_getting_started_get_started" />
+ </LinearLayout>
+
+</ScrollView> \ No newline at end of file
diff --git a/mobile/android/base/resources/layout/home_banner.xml b/mobile/android/base/resources/layout/home_banner.xml
new file mode 100644
index 000000000..46152c711
--- /dev/null
+++ b/mobile/android/base/resources/layout/home_banner.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<org.mozilla.gecko.home.HomeBanner xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/home_banner"
+ style="@style/Widget.HomeBanner"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@drawable/home_banner"
+ android:gravity="center_vertical"
+ android:visibility="gone"
+ android:clickable="true"
+ android:focusable="true"/>
diff --git a/mobile/android/base/resources/layout/home_banner_content.xml b/mobile/android/base/resources/layout/home_banner_content.xml
new file mode 100644
index 000000000..5cbdc47e2
--- /dev/null
+++ b/mobile/android/base/resources/layout/home_banner_content.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+ <ImageView android:id="@+id/icon"
+ android:layout_width="@dimen/home_banner_icon_width"
+ android:layout_height="@dimen/home_banner_icon_height"
+ android:layout_marginLeft="10dp"
+ android:scaleType="centerInside"/>
+
+ <org.mozilla.gecko.widget.EllipsisTextView
+ android:id="@+id/text"
+ android:layout_width="0dip"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:layout_marginLeft="10dp"
+ android:paddingTop="7dp"
+ android:paddingBottom="7dp"
+ android:textAppearance="@style/TextAppearance.Widget.HomeBanner"
+ android:layout_gravity="bottom"
+ android:gravity="center_vertical"
+ gecko:ellipsizeAtLine="3"/>
+
+ <ImageButton android:id="@+id/close"
+ android:layout_width="@dimen/home_banner_close_width"
+ android:layout_height="match_parent"
+ android:background="@drawable/home_banner"
+ android:scaleType="center"
+ android:contentDescription="@string/close_tab"
+ android:src="@drawable/tab_close"/>
+
+</merge>
diff --git a/mobile/android/base/resources/layout/home_bookmarks_panel.xml b/mobile/android/base/resources/layout/home_bookmarks_panel.xml
new file mode 100644
index 000000000..c4c08b93a
--- /dev/null
+++ b/mobile/android/base/resources/layout/home_bookmarks_panel.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <ViewStub android:id="@+id/home_empty_view_stub"
+ android:layout="@layout/home_empty_panel"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"/>
+
+ <org.mozilla.gecko.home.BookmarksListView
+ android:id="@+id/bookmarks_list"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"/>
+
+</FrameLayout>
diff --git a/mobile/android/base/resources/layout/home_combined_back_item.xml b/mobile/android/base/resources/layout/home_combined_back_item.xml
new file mode 100644
index 000000000..e6d443708
--- /dev/null
+++ b/mobile/android/base/resources/layout/home_combined_back_item.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/Widget.FolderView"
+ android:layout_width="match_parent"
+ android:text="@string/home_history_back_to"
+ android:paddingLeft="24dp"
+ android:drawablePadding="24dp"
+ android:drawableLeft="@drawable/arrow_up"
+ android:gravity="center_vertical"/>
diff --git a/mobile/android/base/resources/layout/home_combined_history_panel.xml b/mobile/android/base/resources/layout/home_combined_history_panel.xml
new file mode 100644
index 000000000..fe64b028e
--- /dev/null
+++ b/mobile/android/base/resources/layout/home_combined_history_panel.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <android.support.v4.widget.SwipeRefreshLayout
+ android:id="@+id/refresh_layout"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1.2">
+
+ <org.mozilla.gecko.home.CombinedHistoryRecyclerView
+ android:id="@+id/combined_recycler_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:scrollbars="vertical"/>
+
+ </android.support.v4.widget.SwipeRefreshLayout>
+
+ <include android:id="@+id/home_history_empty_view"
+ layout="@layout/home_empty_panel"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="3"
+ android:visibility="gone"/>
+
+ <include android:id="@+id/home_clients_empty_view"
+ layout="@layout/history_sync_setup"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="3"
+ android:visibility="gone"/>
+
+ <include android:id="@+id/home_recent_tabs_empty_view"
+ layout="@layout/home_empty_panel"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="3"
+ android:visibility="gone"/>
+
+ <Button android:id="@+id/history_panel_footer_button"
+ style="@style/Widget.Home.ActionButton"
+ android:layout_width="match_parent"
+ android:layout_height="48dp"
+ android:visibility="gone" />
+
+</LinearLayout>
diff --git a/mobile/android/base/resources/layout/home_empty_panel.xml b/mobile/android/base/resources/layout/home_empty_panel.xml
new file mode 100644
index 000000000..e845e7765
--- /dev/null
+++ b/mobile/android/base/resources/layout/home_empty_panel.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/home_empty_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:gravity="center"
+ android:paddingLeft="50dp"
+ android:paddingRight="50dp">
+
+ <!-- Empty spacer view -->
+ <View android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1"/>
+
+ <ImageView android:id="@+id/home_empty_image"
+ android:layout_width="90dp"
+ android:layout_height="90dp"
+ android:layout_marginBottom="10dp"
+ android:gravity="top|center"
+ android:scaleType="fitCenter"/>
+
+ <TextView android:id="@+id/home_empty_text"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="top|center"
+ android:textAppearance="@style/TextAppearance.EmptyMessage"/>
+
+ <TextView android:id="@+id/home_empty_hint"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:visibility="gone"
+ android:gravity="top|center"
+ android:textAppearance="@style/TextAppearance.EmptyHint"
+ android:textColorLink="#FFA62F" />
+ <!-- Empty spacer view -->
+ <View android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:layout_weight="2"/>
+
+</LinearLayout>
+
diff --git a/mobile/android/base/resources/layout/home_header_row.xml b/mobile/android/base/resources/layout/home_header_row.xml
new file mode 100644
index 000000000..f3ca9322b
--- /dev/null
+++ b/mobile/android/base/resources/layout/home_header_row.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/Widget.Home.HeaderItem"/>
diff --git a/mobile/android/base/resources/layout/home_item_row.xml b/mobile/android/base/resources/layout/home_item_row.xml
new file mode 100644
index 000000000..86754225f
--- /dev/null
+++ b/mobile/android/base/resources/layout/home_item_row.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<org.mozilla.gecko.home.TwoLinePageRow xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/Widget.TwoLinePageRow"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/page_row_height"
+ android:minHeight="@dimen/page_row_height"/>
diff --git a/mobile/android/base/resources/layout/home_pager.xml b/mobile/android/base/resources/layout/home_pager.xml
new file mode 100644
index 000000000..c858cefbc
--- /dev/null
+++ b/mobile/android/base/resources/layout/home_pager.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- This file is used to include the home pager in gecko app
+ layout based on screen size -->
+
+<org.mozilla.gecko.home.HomePager xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/home_pager"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@android:color/white">
+
+ <org.mozilla.gecko.home.TabMenuStrip android:layout_width="match_parent"
+ android:layout_height="@dimen/tabs_strip_height"
+ android:background="@color/about_page_header_grey"
+ android:layout_gravity="top"
+ gecko:strip="@drawable/home_tab_menu_strip"
+ gecko:activeTextColor="@color/placeholder_grey"
+ gecko:inactiveTextColor="@color/tab_text_color"
+ gecko:tabsMarginLeft="@dimen/tab_strip_content_start" />
+
+</org.mozilla.gecko.home.HomePager>
diff --git a/mobile/android/base/resources/layout/home_remote_tabs_group.xml b/mobile/android/base/resources/layout/home_remote_tabs_group.xml
new file mode 100644
index 000000000..60e6597f7
--- /dev/null
+++ b/mobile/android/base/resources/layout/home_remote_tabs_group.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto"
+ style="@style/Widget.RemoteTabsClientView"
+ android:gravity="center_vertical"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/home_header_item_height"
+ android:minHeight="@dimen/home_header_item_height">
+
+ <ImageView
+ android:id="@+id/device_type"
+ android:layout_width="@dimen/favicon_bg"
+ android:layout_height="@dimen/favicon_bg"
+ android:layout_marginLeft="12dp"
+ android:layout_marginRight="12dp"
+ android:layout_gravity="center_vertical"
+ android:scaleType="center"
+ tools:src="@drawable/sync_mobile"/>
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical">
+
+ <org.mozilla.gecko.widget.FadedSingleColorTextView
+ android:id="@+id/client"
+ style="@style/Widget.FolderTitle.TwoLine"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ gecko:fadeWidth="30dp"
+ tools:text="Firefox on Nexus 5"/>
+
+ <TextView
+ android:id="@+id/last_synced"
+ style="@style/Widget.TwoLinePageRow.Url"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="4dp"
+ android:maxLength="1024"
+ tools:text="Last synced: 5 minutes ago"/>
+ </LinearLayout>
+
+ <ImageView
+ android:id="@+id/device_expanded"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:layout_marginLeft="15dip"
+ android:layout_marginRight="15dip"
+ android:scaleType="center"
+ tools:src="@drawable/arrow_down"/>
+
+</LinearLayout>
diff --git a/mobile/android/base/resources/layout/home_remote_tabs_hidden_devices.xml b/mobile/android/base/resources/layout/home_remote_tabs_hidden_devices.xml
new file mode 100644
index 000000000..9397cfedc
--- /dev/null
+++ b/mobile/android/base/resources/layout/home_remote_tabs_hidden_devices.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/hidden_devices"
+ style="@style/Widget.Home.ActionItem"
+ android:background="@drawable/action_bar_button"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/home_remote_tabs_hidden_footer_height"
+ android:gravity="center"
+ android:maxLength="1024"
+ android:textSize="12dp"
+ android:textColor="@color/disabled_grey" />
diff --git a/mobile/android/base/resources/layout/home_search_item_row.xml b/mobile/android/base/resources/layout/home_search_item_row.xml
new file mode 100644
index 000000000..d12239550
--- /dev/null
+++ b/mobile/android/base/resources/layout/home_search_item_row.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<org.mozilla.gecko.home.SearchEngineRow xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="@dimen/search_row_height"
+ android:duplicateParentState="true"
+ android:paddingTop="5dp"
+ android:paddingBottom="5dp"/>
diff --git a/mobile/android/base/resources/layout/home_smartfolder.xml b/mobile/android/base/resources/layout/home_smartfolder.xml
new file mode 100644
index 000000000..484c30eab
--- /dev/null
+++ b/mobile/android/base/resources/layout/home_smartfolder.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto"
+ style="@style/Widget.RemoteTabsClientView"
+ android:gravity="center_vertical"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/home_header_item_height"
+ android:minHeight="@dimen/home_header_item_height">
+
+ <ImageView
+ android:id="@+id/device_type"
+ android:layout_width="26dp"
+ android:layout_height="18dp"
+ android:layout_margin="20dp"
+ android:scaleType="fitCenter"
+ android:layout_gravity="center_vertical"
+ tools:src="@drawable/cloud"/>
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical">
+
+ <org.mozilla.gecko.widget.FadedSingleColorTextView
+ android:id="@+id/title"
+ style="@style/Widget.FolderTitle.TwoLine"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ gecko:fadeWidth="30dp"
+ tools:text="Firefox on Nexus 5"/>
+
+ <TextView
+ android:id="@+id/subtext"
+ style="@style/Widget.TwoLinePageRow.Url"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="4dp"
+ android:maxLength="1024"
+ tools:text="Last synced: 5 minutes ago"/>
+ </LinearLayout>
+
+</LinearLayout>
diff --git a/mobile/android/base/resources/layout/home_suggestion_prompt.xml b/mobile/android/base/resources/layout/home_suggestion_prompt.xml
new file mode 100644
index 000000000..818671e1c
--- /dev/null
+++ b/mobile/android/base/resources/layout/home_suggestion_prompt.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/about_page_header_grey">
+
+ <LinearLayout android:id="@+id/prompt"
+ android:focusable="true"
+ android:layout_width="match_parent"
+ android:minHeight="48dp"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:gravity="center_vertical"
+ android:paddingLeft="15dp"
+ android:paddingRight="15dp"
+ android:textSize="12sp">
+
+ <TextView android:id="@+id/suggestions_prompt_title"
+ android:layout_height="wrap_content"
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:fontFamily="sans-serif"
+ android:textColor="@color/text_and_tabs_tray_grey"
+ android:layout_marginRight="10dp"/>
+
+ <TextView android:id="@+id/suggestions_prompt_no"
+ android:layout_height="32dp"
+ android:minWidth="72dp"
+ android:layout_width="wrap_content"
+ android:layout_marginRight="10dp"
+ android:textColor="@color/text_and_tabs_tray_grey"
+ android:gravity="center"
+ android:background="@drawable/search_suggestion_prompt_no"
+ android:nextFocusRight="@+id/suggestions_prompt_yes"
+ android:focusable="true"
+ android:text="@string/button_no"/>
+
+ <TextView android:id="@+id/suggestions_prompt_yes"
+ android:layout_height="32dp"
+ android:minWidth="72dp"
+ android:layout_width="wrap_content"
+ android:gravity="center"
+ android:textColor="@android:color/white"
+ android:background="@drawable/search_suggestion_prompt_yes"
+ android:focusable="true"
+ android:text="@string/button_yes"/>
+
+
+
+ </LinearLayout>
+
+</FrameLayout>
diff --git a/mobile/android/base/resources/layout/home_top_sites_panel.xml b/mobile/android/base/resources/layout/home_top_sites_panel.xml
new file mode 100644
index 000000000..a08e680e6
--- /dev/null
+++ b/mobile/android/base/resources/layout/home_top_sites_panel.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<org.mozilla.gecko.home.HomeListView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/list"
+ style="@style/Widget.TopSitesListView"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"/>
diff --git a/mobile/android/base/resources/layout/icon_grid.xml b/mobile/android/base/resources/layout/icon_grid.xml
new file mode 100644
index 000000000..33c9aee31
--- /dev/null
+++ b/mobile/android/base/resources/layout/icon_grid.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<GridView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:choiceMode="singleChoice"
+ android:padding="@dimen/icongrid_padding"/>
diff --git a/mobile/android/base/resources/layout/icon_grid_item.xml b/mobile/android/base/resources/layout/icon_grid_item.xml
new file mode 100644
index 000000000..5c1a4bc9b
--- /dev/null
+++ b/mobile/android/base/resources/layout/icon_grid_item.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ //device/apps/common/res/any/layout/resolve_list_item.xml
+ 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
+
+ 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:gravity="center"
+ android:orientation="vertical"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:background="@drawable/icon_grid_item_bg"
+ android:padding="16dp">
+
+ <!-- Extended activity info to distinguish between duplicate activity names -->
+ <TextView android:id="@android:id/text2"
+ android:textAppearance="?android:attr/textAppearance"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:minLines="2"
+ android:maxLines="2"
+ android:paddingTop="4dip"
+ android:paddingBottom="4dip" />
+
+ <!-- Activity icon when presenting dialog
+ Size will be filled in by ResolverActivity -->
+ <ImageView android:id="@+id/icon"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:scaleType="fitCenter" />
+
+ <!-- Activity name -->
+ <TextView android:id="@android:id/text1"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:minLines="2"
+ android:maxLines="2"
+ android:paddingTop="4dip"
+ android:paddingBottom="4dip" />
+</LinearLayout>
+
diff --git a/mobile/android/base/resources/layout/list_item_header.xml b/mobile/android/base/resources/layout/list_item_header.xml
new file mode 100644
index 000000000..2d91f4e02
--- /dev/null
+++ b/mobile/android/base/resources/layout/list_item_header.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@android:id/text1"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="2dip"
+ android:paddingBottom="2dip"
+ android:paddingLeft="5dip"
+ style="?android:attr/listSeparatorTextViewStyle" />
diff --git a/mobile/android/base/resources/layout/login_doorhanger.xml b/mobile/android/base/resources/layout/login_doorhanger.xml
new file mode 100644
index 000000000..8e8c005af
--- /dev/null
+++ b/mobile/android/base/resources/layout/login_doorhanger.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <TextView android:id="@+id/doorhanger_message"
+ android:focusable="true"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textAppearance="@style/TextAppearance.DoorHanger.Medium"/>
+
+</LinearLayout>
diff --git a/mobile/android/base/resources/layout/login_edit_dialog.xml b/mobile/android/base/resources/layout/login_edit_dialog.xml
new file mode 100644
index 000000000..8d42d5d95
--- /dev/null
+++ b/mobile/android/base/resources/layout/login_edit_dialog.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:padding="@dimen/doorhanger_section_padding_medium"
+ android:orientation="vertical">
+
+ <EditText android:id="@+id/username_edit"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="textNoSuggestions"
+ android:hint="@string/doorhanger_login_edit_username_hint"/>
+
+ <EditText android:id="@+id/password_edit"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="textPassword"
+ android:hint="@string/doorhanger_login_edit_password_hint"/>
+
+ <android.support.v7.widget.AppCompatCheckBox
+ android:id="@+id/checkbox_toggle_password"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/doorhanger_login_edit_toggle"
+ android:layout_marginTop="@dimen/doorhanger_subsection_padding"/>
+
+</LinearLayout>
diff --git a/mobile/android/base/resources/layout/media_casting.xml b/mobile/android/base/resources/layout/media_casting.xml
new file mode 100644
index 000000000..008cf36a0
--- /dev/null
+++ b/mobile/android/base/resources/layout/media_casting.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <RelativeLayout android:id="@+id/media_controls"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true">
+
+ <ImageButton android:id="@+id/media_play"
+ style="@style/FindBar.ImageButton"
+ android:contentDescription="@string/media_play"
+ android:src="@drawable/media_bar_play"
+ android:visibility="gone"/>
+
+ <ImageButton android:id="@+id/media_pause"
+ style="@style/FindBar.ImageButton"
+ android:contentDescription="@string/media_pause"
+ android:src="@drawable/media_bar_pause"/>
+
+ </RelativeLayout>
+
+ <TextView android:id="@+id/media_sending_to"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="5dip"
+ android:layout_marginRight="5dip"
+ android:layout_alignParentLeft="true"
+ android:layout_toLeftOf="@id/media_controls"
+ android:layout_centerVertical="true"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:textColor="#FFFFFFFF"
+ android:contentDescription="@string/media_sending_to"/>
+
+ <ImageButton android:id="@+id/media_stop"
+ style="@style/FindBar.ImageButton"
+ android:contentDescription="@string/media_stop"
+ android:layout_alignParentRight="true"
+ android:src="@drawable/media_bar_stop"/>
+
+</merge>
diff --git a/mobile/android/base/resources/layout/menu_action_bar.xml b/mobile/android/base/resources/layout/menu_action_bar.xml
new file mode 100644
index 000000000..0b9476f20
--- /dev/null
+++ b/mobile/android/base/resources/layout/menu_action_bar.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!--
+ Note: This layout is intended to be used only above 11+.
+ android:showDividers are available only 11+
+-->
+<view xmlns:android="http://schemas.android.com/apk/res/android"
+ class="org.mozilla.gecko.menu.GeckoMenu$DefaultActionItemBar"
+ android:layout_width="@dimen/menu_item_row_width"
+ android:layout_height="@dimen/browser_toolbar_height"
+ android:orientation="horizontal"
+ android:background="@color/toolbar_menu_dark_grey"/>
diff --git a/mobile/android/base/resources/layout/menu_item_switcher_layout.xml b/mobile/android/base/resources/layout/menu_item_switcher_layout.xml
new file mode 100644
index 000000000..04b70bde8
--- /dev/null
+++ b/mobile/android/base/resources/layout/menu_item_switcher_layout.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <!-- Application icons will be added dynamically -->
+
+ <FrameLayout android:layout_width="0dip"
+ android:layout_height="@dimen/menu_item_row_height"
+ android:layout_weight="1.0">
+
+ <org.mozilla.gecko.menu.MenuItemDefault
+ android:id="@+id/menu_item"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@drawable/menu_item_action_bar_bg"
+ android:clickable="true"
+ android:focusable="true"/>
+
+ <org.mozilla.gecko.menu.MenuItemActionBar
+ style="@style/Widget.MenuItemSecondaryActionBar"
+ android:id="@+id/menu_item_button"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center_vertical"
+ android:visibility="gone"/>
+
+ </FrameLayout>
+
+</merge>
diff --git a/mobile/android/base/resources/layout/menu_popup.xml b/mobile/android/base/resources/layout/menu_popup.xml
new file mode 100644
index 000000000..494b727e4
--- /dev/null
+++ b/mobile/android/base/resources/layout/menu_popup.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<org.mozilla.gecko.widget.FilledCardView xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/menu_panel"
+ android:layout_width="@dimen/menu_popup_width"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:minWidth="@dimen/menu_popup_width"
+ app:cardBackgroundColor="@color/toolbar_grey"
+ app:cardUseCompatPadding="true">
+
+ <!-- MenuPanel will be added here dynamically -->
+
+</org.mozilla.gecko.widget.FilledCardView> \ No newline at end of file
diff --git a/mobile/android/base/resources/layout/menu_secondary_action_bar.xml b/mobile/android/base/resources/layout/menu_secondary_action_bar.xml
new file mode 100644
index 000000000..c5be6f51e
--- /dev/null
+++ b/mobile/android/base/resources/layout/menu_secondary_action_bar.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!--
+ Note: This layout is intended to be used only above 11+.
+ android:showDividers are available only 11+
+-->
+<view xmlns:android="http://schemas.android.com/apk/res/android"
+ class="org.mozilla.gecko.menu.GeckoMenu$DefaultActionItemBar"
+ android:layout_width="@dimen/menu_item_row_width"
+ android:layout_height="@dimen/browser_toolbar_height"
+ android:orientation="horizontal"/>
diff --git a/mobile/android/base/resources/layout/overlay_share_button.xml b/mobile/android/base/resources/layout/overlay_share_button.xml
new file mode 100644
index 000000000..d40303a93
--- /dev/null
+++ b/mobile/android/base/resources/layout/overlay_share_button.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+ <ImageView
+ android:layout_width="60dp"
+ android:layout_height="match_parent"
+ android:id="@+id/overlaybtn_icon"
+ android:padding="30dp"
+ android:scaleType="center"/>
+
+ <TextView
+ android:textAppearance="@style/TextAppearance.ShareOverlay"
+ android:id="@+id/overlaybtn_label"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:clickable="false"
+ android:enabled="false"
+ android:maxLines="1"
+ android:textSize="14sp"
+ android:textColor="@color/primary_text_selector"/>
+</merge>
diff --git a/mobile/android/base/resources/layout/overlay_share_dialog.xml b/mobile/android/base/resources/layout/overlay_share_dialog.xml
new file mode 100644
index 000000000..b7fcd8747
--- /dev/null
+++ b/mobile/android/base/resources/layout/overlay_share_dialog.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- Serves to position the content on the screen (bottom, centered) and provide the drop-shadow -->
+
+<merge
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto">
+ <LinearLayout
+ android:id="@+id/sharedialog"
+ android:layout_width="300dp"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom|center"
+ android:layout_marginLeft="15dp"
+ android:layout_marginRight="15dp"
+ android:paddingTop="8dp"
+ android:orientation="vertical">
+
+ <!-- Title -->
+ <TextView
+ android:id="@+id/title"
+ style="@style/ShareOverlayTitle"
+ android:textAppearance="@style/TextAppearance.ShareOverlay.Header"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="8dp"
+ android:maxLines="2"
+ android:textSize="20sp"
+ android:ellipsize="end"/>
+
+ <!-- Subtitle (url) -->
+ <TextView
+ android:id="@+id/subtitle"
+ style="@style/ShareOverlayTitle"
+ android:textAppearance="@style/TextAppearance.ShareOverlay.Header"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="20dp"
+ android:textSize="12sp"
+ android:scrollHorizontally="true"/>
+
+ <!-- TODO: Add back drop shadow (bug 1146488)? -->
+ <!-- Buttons -->
+ <!-- "Send to Firefox Sync" -->
+ <org.mozilla.gecko.overlays.ui.SendTabList
+ android:id="@+id/overlay_send_tab_btn"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:divider="@null"/>
+
+ <!-- "Add bookmark" -->
+ <org.mozilla.gecko.overlays.ui.OverlayDialogButton
+ style="@style/ShareOverlayRow"
+ android:id="@+id/overlay_share_bookmark_btn"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:enabled="false"
+ gecko:drawable="@drawable/overlay_share_bookmark_button"
+ gecko:enabledText="@string/overlay_share_bookmark_btn_label"
+ gecko:disabledText="@string/overlay_share_bookmark_btn_label_already"/>
+
+ </LinearLayout>
+
+ <ImageView
+ android:id="@+id/check"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:layout_gravity="center"
+ android:src="@drawable/overlay_check"
+ android:visibility="invisible"/>
+
+ <!-- This transparent View is used to overlay the
+ entire Activity with an onClickListener. -->
+ <View
+ android:id="@+id/fullscreen_click_target"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"
+ android:visibility="gone"/>
+</merge>
diff --git a/mobile/android/base/resources/layout/overlay_share_send_tab_item.xml b/mobile/android/base/resources/layout/overlay_share_send_tab_item.xml
new file mode 100644
index 000000000..99d723866
--- /dev/null
+++ b/mobile/android/base/resources/layout/overlay_share_send_tab_item.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- The first item's background is unique and these views are reused
+ so the background is set dynamically. -->
+<org.mozilla.gecko.overlays.ui.OverlayDialogButton
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/ShareOverlayRow"
+ android:id="@+id/overlay_send_tab_item"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"/>
diff --git a/mobile/android/base/resources/layout/panel_article_item.xml b/mobile/android/base/resources/layout/panel_article_item.xml
new file mode 100644
index 000000000..a4234e018
--- /dev/null
+++ b/mobile/android/base/resources/layout/panel_article_item.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <ImageView android:id="@+id/image"
+ android:layout_width="@dimen/panel_article_item_height"
+ android:layout_height="@dimen/panel_article_item_height"
+ android:scaleType="centerCrop"/>
+
+ <LinearLayout android:id="@+id/title_desc_container"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/panel_article_item_height"
+ android:paddingLeft="15dip"
+ android:paddingRight="15dip"
+ android:gravity="center_vertical"
+ android:orientation="vertical">
+
+ <TextView android:id="@+id/title"
+ style="@style/Widget.PanelItemView.Title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"/>
+
+ <TextView android:id="@+id/description"
+ style="@style/Widget.PanelItemView.Description"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="1dp"
+ android:maxLength="1024"/>
+
+ </LinearLayout>
+
+</merge>
diff --git a/mobile/android/base/resources/layout/panel_auth_layout.xml b/mobile/android/base/resources/layout/panel_auth_layout.xml
new file mode 100644
index 000000000..549dc4191
--- /dev/null
+++ b/mobile/android/base/resources/layout/panel_auth_layout.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <!-- Empty spacer view -->
+ <View android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1"/>
+
+ <ImageView android:id="@+id/image"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="top|center"
+ android:scaleType="center"
+ android:paddingBottom="10dp"/>
+
+ <TextView android:id="@+id/message"
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:gravity="top|center"
+ android:textAppearance="@style/TextAppearance.EmptyMessage"
+ android:paddingLeft="50dp"
+ android:paddingRight="50dp"
+ android:layout_weight="3"/>
+
+ <Button android:id="@+id/button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="25dp"
+ android:layout_marginRight="25dp"
+ android:layout_marginBottom="25dp"
+ android:gravity="bottom|center"
+ android:textAppearance="@style/TextAppearance.EmptyMessage"
+ android:background="@drawable/panel_auth_button"
+ android:padding="20dp"/>
+
+</merge>
diff --git a/mobile/android/base/resources/layout/panel_back_item.xml b/mobile/android/base/resources/layout/panel_back_item.xml
new file mode 100644
index 000000000..d7f32fff3
--- /dev/null
+++ b/mobile/android/base/resources/layout/panel_back_item.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <ImageView android:id="@+id/image"
+ android:layout_width="54dp"
+ android:layout_height="44dp"
+ android:layout_marginTop="10dip"
+ android:layout_marginLeft="10dip"
+ android:scaleType="centerCrop"/>
+
+ <TextView android:id="@+id/title"
+ style="@style/Widget.PanelItemView.Title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="5dip"
+ android:paddingBottom="5dip"
+ android:paddingLeft="10dip"
+ android:paddingRight="10dip"
+ android:minHeight="@dimen/page_row_height"
+ android:gravity="center_vertical"/>
+
+</merge>
diff --git a/mobile/android/base/resources/layout/panel_icon_item.xml b/mobile/android/base/resources/layout/panel_icon_item.xml
new file mode 100644
index 000000000..7f3e554b3
--- /dev/null
+++ b/mobile/android/base/resources/layout/panel_icon_item.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<org.mozilla.gecko.widget.SquaredRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <ImageView
+ android:id="@+id/background"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:scaleType="centerCrop" />
+
+ <ImageView
+ android:id="@+id/image"
+ android:layout_width="50dp"
+ android:layout_height="50dp"
+ android:scaleType="centerInside"
+ android:layout_centerInParent="true" />
+
+ <TextView
+ android:id="@+id/title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:textColor="@android:color/white"
+ android:layout_alignParentBottom="true"
+ android:textSize="12sp"
+ android:padding="8dp"
+ android:background="@color/panel_icon_item_title_background"
+ android:layout_gravity="center_horizontal"/>
+
+</org.mozilla.gecko.widget.SquaredRelativeLayout>
diff --git a/mobile/android/base/resources/layout/panel_image_item.xml b/mobile/android/base/resources/layout/panel_image_item.xml
new file mode 100644
index 000000000..15131dfaf
--- /dev/null
+++ b/mobile/android/base/resources/layout/panel_image_item.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <org.mozilla.gecko.widget.SquaredImageView
+ android:id="@+id/image"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:scaleType="centerCrop"
+ android:adjustViewBounds="true"
+ android:background="@color/panel_image_item_background"/>
+
+ <LinearLayout android:id="@+id/title_desc_container"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/page_row_height"
+ android:paddingTop="7dip"
+ android:paddingBottom="7dip"
+ android:paddingLeft="5dip"
+ android:paddingRight="5dip"
+ android:orientation="vertical">
+
+ <TextView android:id="@+id/title"
+ style="@style/Widget.PanelItemView.Title"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:gravity="center_vertical"
+ android:singleLine="true"/>
+
+ <TextView android:id="@+id/description"
+ style="@style/Widget.PanelItemView.Description"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:gravity="center_vertical"
+ android:singleLine="true"
+ android:maxLength="1024"/>
+
+ </LinearLayout>
+
+</merge>
diff --git a/mobile/android/base/resources/layout/panel_item_container.xml b/mobile/android/base/resources/layout/panel_item_container.xml
new file mode 100644
index 000000000..2d767c64d
--- /dev/null
+++ b/mobile/android/base/resources/layout/panel_item_container.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:clickable="true"
+ android:foreground="@color/recyclerview_selector">
+
+</FrameLayout>
diff --git a/mobile/android/base/resources/layout/pin_site_dialog.xml b/mobile/android/base/resources/layout/pin_site_dialog.xml
new file mode 100644
index 000000000..07eb152d7
--- /dev/null
+++ b/mobile/android/base/resources/layout/pin_site_dialog.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <LinearLayout android:layout_width="match_parent"
+ android:layout_height="@dimen/browser_toolbar_height"
+ android:orientation="vertical"
+ android:background="@color/toolbar_grey"
+ android:padding="4dip">
+
+ <EditText android:id="@+id/search"
+ style="@style/UrlBar.Button"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:padding="6dip"
+ android:hint="@string/pin_site_dialog_hint"
+ android:background="@drawable/url_bar_entry"
+ android:textColor="@color/url_bar_title"
+ android:textColorHint="@color/url_bar_title_hint"
+ android:textColorHighlight="@color/fennec_ui_orange"
+ android:textSelectHandle="@drawable/handle_middle"
+ android:textSelectHandleLeft="@drawable/handle_start"
+ android:textSelectHandleRight="@drawable/handle_end"
+ android:textCursorDrawable="@null"
+ android:inputType="textUri|textNoSuggestions"
+ android:imeOptions="actionGo|flagNoExtractUi|flagNoFullscreen"
+ android:singleLine="true"
+ android:gravity="center_vertical|left"/>
+
+ </LinearLayout>
+
+ <org.mozilla.gecko.home.HomeListView android:id="@+id/list"
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1.0"/>
+
+</LinearLayout>
diff --git a/mobile/android/base/resources/layout/preference_checkbox.xml b/mobile/android/base/resources/layout/preference_checkbox.xml
new file mode 100644
index 000000000..e16f5b623
--- /dev/null
+++ b/mobile/android/base/resources/layout/preference_checkbox.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 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
+
+ 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.
+-->
+
+<!-- Layout used by CheckBoxPreference for the checkbox style. This is inflated
+ inside android.R.layout.preference. -->
+<CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/checkbox"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:focusable="false"
+ android:clickable="false" />
diff --git a/mobile/android/base/resources/layout/preference_panels.xml b/mobile/android/base/resources/layout/preference_panels.xml
new file mode 100644
index 000000000..baeb99ce8
--- /dev/null
+++ b/mobile/android/base/resources/layout/preference_panels.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<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:gravity="center_vertical"
+ android:orientation="vertical"
+ android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingRight="?android:attr/scrollbarSize">
+
+ <TextView android:id="@+android:id/title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:singleLine="true"
+ android:ellipsize="marquee"
+ android:fadingEdge="horizontal" />
+
+ <TextView android:id="@+android:id/summary"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:maxLines="2" />
+
+</LinearLayout>
diff --git a/mobile/android/base/resources/layout/preference_rightalign_icon.xml b/mobile/android/base/resources/layout/preference_rightalign_icon.xml
new file mode 100644
index 000000000..413faf2aa
--- /dev/null
+++ b/mobile/android/base/resources/layout/preference_rightalign_icon.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- This custom layout matches the Android layout for preferences in
+ padding and margins, so it is visually consistent. -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:paddingRight="?android:attr/scrollbarSize">
+
+ <RelativeLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:gravity="right"
+ android:layout_marginLeft="15dip"
+ android:layout_marginRight="6dip"
+ android:layout_marginTop="6dip"
+ android:layout_marginBottom="6dip"
+ android:paddingRight="6dip"
+ android:layout_weight="1">
+
+ <TextView android:id="@+android:id/title"
+ android:layout_gravity="right"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:ellipsize="marquee"
+ android:fadingEdge="horizontal" />
+
+ </RelativeLayout>
+
+ <ImageView android:src="@drawable/menu_item_more"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:paddingRight="16dp" />
+
+</LinearLayout>
diff --git a/mobile/android/base/resources/layout/preference_search_engine.xml b/mobile/android/base/resources/layout/preference_search_engine.xml
new file mode 100644
index 000000000..97ce95a3f
--- /dev/null
+++ b/mobile/android/base/resources/layout/preference_search_engine.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<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:gravity="center_vertical"
+ android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingRight="?android:attr/scrollbarSize">
+
+ <org.mozilla.gecko.widget.FaviconView
+ android:id="@+id/search_engine_icon"
+ android:layout_width="@dimen/favicon_bg"
+ android:layout_height="@dimen/favicon_bg"
+ android:layout_gravity="center"
+ android:minWidth="@dimen/favicon_bg"
+ android:minHeight="@dimen/favicon_bg" />
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:layout_marginLeft="15dip"
+ android:layout_marginRight="6dip"
+ android:layout_marginTop="6dip"
+ android:layout_marginBottom="6dip">
+
+ <TextView android:id="@+android:id/title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:singleLine="true"
+ android:ellipsize="marquee"
+ android:fadingEdge="horizontal" />
+
+ <TextView android:id="@+android:id/summary"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:maxLines="2" />
+
+ </LinearLayout>
+
+</LinearLayout>
diff --git a/mobile/android/base/resources/layout/preference_search_tip.xml b/mobile/android/base/resources/layout/preference_search_tip.xml
new file mode 100644
index 000000000..e03b171b4
--- /dev/null
+++ b/mobile/android/base/resources/layout/preference_search_tip.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- Ignore UseCompoundDrawables because they caused a regression in bug 1208790. -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ tools:ignore="UseCompoundDrawables"
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingRight="?android:attr/scrollbarSize">
+
+ <TextView android:id="@+id/label_search_hint"
+ android:layout_height="wrap_content"
+ android:layout_width="0dp"
+ android:text="@string/pref_search_hint"
+ android:layout_marginTop="5dip"
+ android:layout_marginBottom="6dip"
+ android:layout_marginLeft="15dip"
+ android:layout_marginRight="6dip"
+ android:paddingTop="8dp"
+ android:paddingBottom="8dp"
+ android:paddingRight="6dip"
+ android:layout_weight="1"/>
+
+ <ImageView android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:paddingRight="8dp"
+ android:paddingTop="12dip"
+ android:src="@drawable/tip_addsearch"/>
+
+</LinearLayout>
diff --git a/mobile/android/base/resources/layout/preference_set_homepage.xml b/mobile/android/base/resources/layout/preference_set_homepage.xml
new file mode 100644
index 000000000..d30221a23
--- /dev/null
+++ b/mobile/android/base/resources/layout/preference_set_homepage.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<RadioGroup xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/homepage_layout"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingLeft="20dp"
+ android:paddingRight="20dp"
+ android:orientation="vertical">
+
+ <RadioButton android:id="@+id/radio_default"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8dp"
+ android:text="@string/home_homepage_radio_default"
+ android:textColor="@color/text_and_tabs_tray_grey"/>
+
+ <RadioButton android:id="@+id/radio_user_address"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8dp"
+ android:text="@string/home_homepage_radio_user_address"
+ android:textColor="@color/text_and_tabs_tray_grey"/>
+
+ <!-- RadioGroup is a LinearLayout under the hood, so including this View is fine.
+ The visibility changes with RadioButton state so we hide it to start. -->
+ <EditText android:id="@+id/edittext_user_address"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8dp"
+ android:inputType="textUri"
+ android:hint="@string/home_homepage_hint_user_address"
+ android:textColorHint="@color/disabled_grey"
+ android:visibility="gone"/>
+
+</RadioGroup>
diff --git a/mobile/android/base/resources/layout/private_tabs_panel.xml b/mobile/android/base/resources/layout/private_tabs_panel.xml
new file mode 100644
index 000000000..2c553abd7
--- /dev/null
+++ b/mobile/android/base/resources/layout/private_tabs_panel.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+ <ImageView android:id="@+id/private_tabs_empty"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:src="@drawable/private_masq"
+ android:layout_gravity="center"/>
+
+ <!-- Note: for an unknown reason, scrolling in the TabsLayout
+ does not work unless it is laid out after the empty view. -->
+ <view class="org.mozilla.gecko.tabs.TabsPanel$TabsLayout"
+ android:id="@+id/private_tabs_layout"
+ style="@style/TabsLayout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:choiceMode="singleChoice"
+ gecko:tabs="tabs_private"/>
+
+</merge>
diff --git a/mobile/android/base/resources/layout/restricted_firstrun_welcome_fragment.xml b/mobile/android/base/resources/layout/restricted_firstrun_welcome_fragment.xml
new file mode 100644
index 000000000..94ee43b7b
--- /dev/null
+++ b/mobile/android/base/resources/layout/restricted_firstrun_welcome_fragment.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:fillViewport="true"
+ android:orientation="vertical">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/restricted_profile_background_gold"
+ android:minHeight="@dimen/firstrun_min_height"
+ android:orientation="vertical"
+ android:weightSum="50">
+
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="21"
+ android:padding="30dp">
+
+ <TextView
+ android:layout_width="320dp"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:background="@color/restricted_profile_background_green"
+ android:gravity="center"
+ android:paddingBottom="40dp"
+ android:paddingLeft="30dp"
+ android:paddingRight="30dp"
+ android:paddingTop="40dp"
+ android:text="@string/firstrun_welcome_restricted"
+ android:textColor="#ffffff"
+ android:textSize="22sp" />
+
+ </FrameLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="29"
+ android:background="@color/android:white"
+ android:gravity="center_horizontal"
+ android:orientation="vertical"
+ android:padding="40dp">
+
+ <Button
+ android:id="@+id/welcome_browse"
+ style="@style/Widget.Firstrun.Button"
+ android:layout_gravity="center"
+ android:layout_marginBottom="20dp"
+ android:background="@drawable/button_background_action_blue_round"
+ android:text="@string/firstrun_welcome_button_browser" />
+
+ <TextView
+ android:id="@+id/learn_more_link"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:padding="20dp"
+ android:text="@string/pref_learn_more"
+ android:textAppearance="@style/TextAppearance.FirstrunRegular.Link" />
+
+ </LinearLayout>
+ </LinearLayout>
+
+</ScrollView>
diff --git a/mobile/android/base/resources/layout/search_activity_main.xml b/mobile/android/base/resources/layout/search_activity_main.xml
new file mode 100644
index 000000000..93da2e083
--- /dev/null
+++ b/mobile/android/base/resources/layout/search_activity_main.xml
@@ -0,0 +1,65 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<merge
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ tools:context=".SearchActivity">
+
+ <org.mozilla.search.autocomplete.SearchBar
+ android:id="@+id/search_bar"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/search_bar_height"
+ android:paddingTop="@dimen/search_bar_padding_y"
+ android:paddingBottom="@dimen/search_bar_padding_y"
+ android:paddingLeft="@dimen/search_row_padding"
+ android:paddingRight="@dimen/search_row_padding"
+ android:layout_gravity="top"/>
+
+ <fragment
+ android:id="@+id/postsearch"
+ android:name="org.mozilla.search.PostSearchFragment"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginTop="@dimen/search_bar_height"
+ android:layout_gravity="top"
+ android:visibility="invisible"/>
+
+ <fragment
+ android:id="@+id/presearch"
+ android:name="org.mozilla.search.PreSearchFragment"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginTop="@dimen/search_bar_height"
+ android:layout_gravity="top"/>
+
+ <fragment
+ android:id="@+id/suggestions"
+ android:name="org.mozilla.search.autocomplete.SuggestionsFragment"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginTop="@dimen/search_bar_height"
+ android:layout_gravity="top"/>
+
+
+ <ImageButton
+ android:id="@+id/settings_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@android:color/transparent"
+ android:padding="15dp"
+ android:src="@drawable/ic_action_settings"
+ android:layout_gravity="bottom|right"
+ android:contentDescription="@string/search_pref_button_content_description"/>
+
+ <View
+ android:id="@+id/animation_card"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginTop="@dimen/search_bar_height"
+ android:background="@color/row_background"
+ android:visibility="invisible"
+ android:layout_gravity="top"/>
+
+</merge>
diff --git a/mobile/android/base/resources/layout/search_bar.xml b/mobile/android/base/resources/layout/search_bar.xml
new file mode 100644
index 000000000..69232ff07
--- /dev/null
+++ b/mobile/android/base/resources/layout/search_bar.xml
@@ -0,0 +1,43 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <org.mozilla.search.ui.BackCaptureEditText
+ android:id="@+id/edit_text"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:imeOptions="actionSearch"
+ android:inputType="textNoSuggestions"
+ android:drawableLeft="@drawable/search_icon_inactive"
+ android:drawablePadding="5dp"
+ android:textSize="@dimen/query_text_size"
+ android:focusable="false"
+ android:focusableInTouchMode="false"
+ android:textColorHighlight="@color/fennec_ui_orange"
+ android:textSelectHandle="@drawable/handle_middle"
+ android:textSelectHandleLeft="@drawable/handle_start"
+ android:textSelectHandleRight="@drawable/handle_end" />
+
+ <ImageButton
+ android:id="@+id/clear_button"
+ android:layout_width="30dp"
+ android:layout_height="30dp"
+ android:paddingLeft="10dp"
+ android:layout_gravity="right|center_vertical"
+ android:background="@android:color/transparent"
+ android:src="@drawable/search_clear"
+ android:scaleType="centerInside"
+ android:visibility="gone"/>
+
+ <ImageView
+ android:id="@+id/engine_icon"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_gravity="right|center_vertical"
+ android:background="@android:color/transparent"
+ android:visibility="gone"/>
+
+</merge>
diff --git a/mobile/android/base/resources/layout/search_empty.xml b/mobile/android/base/resources/layout/search_empty.xml
new file mode 100644
index 000000000..9177a9dde
--- /dev/null
+++ b/mobile/android/base/resources/layout/search_empty.xml
@@ -0,0 +1,51 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:gravity="center"
+ android:paddingLeft="50dp"
+ android:paddingRight="50dp">
+
+ <!-- Empty spacer view -->
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1"/>
+
+ <ImageView
+ android:id="@+id/empty_image"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="15dp"
+ android:gravity="top|center"
+ android:scaleType="fitCenter"/>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:orientation="vertical"
+ android:layout_weight="3">
+
+ <TextView
+ android:id="@+id/empty_title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="15dp"
+ style="@style/TextAppearance.EmptyView.Title"
+ android:gravity="center"/>
+
+ <TextView
+ android:id="@+id/empty_message"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ style="@style/TextAppearance.EmptyView.Message"
+ android:gravity="center"/>
+
+ </LinearLayout>
+
+</LinearLayout>
diff --git a/mobile/android/base/resources/layout/search_engine_bar_item.xml b/mobile/android/base/resources/layout/search_engine_bar_item.xml
new file mode 100644
index 000000000..f8c546d93
--- /dev/null
+++ b/mobile/android/base/resources/layout/search_engine_bar_item.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- TwoWayView doesn't let us set the margin around items (except as
+ gecko:itemMargin, but that doesn't increase the hit area) so we
+ have to surround the main View by a ViewGroup to create a pressable margin.
+
+ Note: the layout_height values are shared with the parent
+ View (browser_search at the time of this writing).
+
+ The actual width of the FrameLayout is calculated at runtime by the
+ SearchEngineBar class to spread the icons across the device's width. -->
+<FrameLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/search_engine_icon_container"
+ android:layout_width="72dp"
+ android:layout_height="match_parent"
+ android:clickable="true"
+ android:background="@color/pressed_about_page_header_grey">
+
+ <!-- Width & height are set to make the Favicons as sharp as possible
+ based on asset size. -->
+ <ImageView
+ android:id="@+id/search_engine_icon"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_gravity="center"
+ android:scaleType="fitCenter"/>
+
+</FrameLayout>
diff --git a/mobile/android/base/resources/layout/search_engine_bar_label.xml b/mobile/android/base/resources/layout/search_engine_bar_label.xml
new file mode 100644
index 000000000..057e9bf31
--- /dev/null
+++ b/mobile/android/base/resources/layout/search_engine_bar_label.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- TwoWayView doesn't let us set the margin around items (except as
+ gecko:itemMargin, but that doesn't increase the hit area) so we
+ have to surround the main View by a ViewGroup to create a pressable margin. -->
+<FrameLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="48dp"
+ android:layout_height="match_parent"
+ android:clickable="true"
+ android:background="@color/pressed_about_page_header_grey">
+
+ <ImageView
+ android:id="@+id/search_engine_label"
+ android:layout_width="16dp"
+ android:layout_height="16dp"
+ android:layout_gravity="center"
+ android:scaleType="fitXY"/>
+
+</FrameLayout>
diff --git a/mobile/android/base/resources/layout/search_engine_row.xml b/mobile/android/base/resources/layout/search_engine_row.xml
new file mode 100644
index 000000000..5c2f2dfb9
--- /dev/null
+++ b/mobile/android/base/resources/layout/search_engine_row.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <org.mozilla.gecko.widget.FaviconView android:id="@+id/suggestion_icon"
+ android:layout_width="@dimen/favicon_bg"
+ android:layout_height="@dimen/favicon_bg"
+ android:layout_marginLeft="16dip"
+ android:layout_marginRight="16dip"
+ android:layout_centerVertical="true"
+ android:minWidth="@dimen/favicon_bg"
+ android:minHeight="@dimen/favicon_bg"/>
+
+ <org.mozilla.gecko.widget.FlowLayout android:id="@+id/suggestion_layout"
+ android:layout_toRightOf="@id/suggestion_icon"
+ android:layout_centerVertical="true"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="15dp"
+ android:duplicateParentState="true">
+
+ <include layout="@layout/suggestion_item"
+ android:id="@+id/suggestion_user_entered"/>
+
+ </org.mozilla.gecko.widget.FlowLayout>
+
+</merge>
diff --git a/mobile/android/base/resources/layout/search_fragment_post_search.xml b/mobile/android/base/resources/layout/search_fragment_post_search.xml
new file mode 100644
index 000000000..4bbfd36b3
--- /dev/null
+++ b/mobile/android/base/resources/layout/search_fragment_post_search.xml
@@ -0,0 +1,30 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <ProgressBar
+ android:id="@+id/progress_bar"
+ style="@android:style/Widget.ProgressBar.Horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/progress_bar_height"
+ android:progressDrawable="@drawable/progressbar"/>
+
+ <WebView
+ android:id="@+id/webview"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"/>
+
+ <ViewStub
+ android:id="@+id/error_view_stub"
+ android:layout="@layout/search_empty"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:visibility="gone"/>
+
+</LinearLayout>
diff --git a/mobile/android/base/resources/layout/search_fragment_pre_search.xml b/mobile/android/base/resources/layout/search_fragment_pre_search.xml
new file mode 100644
index 000000000..82ce15b1b
--- /dev/null
+++ b/mobile/android/base/resources/layout/search_fragment_pre_search.xml
@@ -0,0 +1,27 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:background="@color/toolbar_grey">
+
+ <ViewStub android:id="@+id/empty_view_stub"
+ android:layout="@layout/search_empty"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"/>
+
+ <ListView
+ android:id="@+id/list_view"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:scrollbarStyle="outsideOverlay"
+ android:paddingLeft="@dimen/search_row_padding"
+ android:paddingRight="@dimen/search_row_padding"/>
+
+</LinearLayout>
diff --git a/mobile/android/base/resources/layout/search_history_row.xml b/mobile/android/base/resources/layout/search_history_row.xml
new file mode 100644
index 000000000..d47185bcc
--- /dev/null
+++ b/mobile/android/base/resources/layout/search_history_row.xml
@@ -0,0 +1,14 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<TextView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/site_name"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@drawable/search_row_background"
+ android:drawableLeft="@drawable/search_history"
+ android:drawablePadding="@dimen/search_history_drawable_padding"
+ android:padding="@dimen/search_row_padding"
+ android:textSize="@dimen/query_text_size"/>
diff --git a/mobile/android/base/resources/layout/search_sugestions.xml b/mobile/android/base/resources/layout/search_sugestions.xml
new file mode 100644
index 000000000..1fb989fe8
--- /dev/null
+++ b/mobile/android/base/resources/layout/search_sugestions.xml
@@ -0,0 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<ListView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/toolbar_grey"
+ android:paddingLeft="@dimen/search_row_padding"
+ android:paddingRight="@dimen/search_row_padding"
+ android:visibility="invisible"/>
diff --git a/mobile/android/base/resources/layout/search_suggestions_row.xml b/mobile/android/base/resources/layout/search_suggestions_row.xml
new file mode 100644
index 000000000..8c3f3e7a1
--- /dev/null
+++ b/mobile/android/base/resources/layout/search_suggestions_row.xml
@@ -0,0 +1,31 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@drawable/search_row_background"
+ android:padding="@dimen/search_row_padding"
+ android:descendantFocusability="blocksDescendants"
+ android:orientation="horizontal">
+
+ <TextView
+ android:id="@+id/auto_complete_row_text"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:textSize="@dimen/query_text_size"/>
+
+ <ImageButton
+ android:id="@+id/auto_complete_row_jump_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right|center_vertical"
+ android:paddingLeft="@dimen/search_row_padding"
+ android:src="@drawable/search_plus"
+ android:contentDescription="@string/search_plus_content_description"
+ android:background="@android:color/transparent" />
+
+</LinearLayout>
diff --git a/mobile/android/base/resources/layout/search_widget.xml b/mobile/android/base/resources/layout/search_widget.xml
new file mode 100644
index 000000000..e5db2d774
--- /dev/null
+++ b/mobile/android/base/resources/layout/search_widget.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- A homescreen widget for launching Fennec or the search activity. We can't use styles in here
+ so make sure any changes you make are also made to launch_widget.xml which doesn't have
+ the search widget button. -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/widget_header_height"
+ android:orientation="horizontal"
+ android:background="@drawable/widget_bg">
+
+ <ImageView android:id="@+id/logo_button"
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:padding="@dimen/widget_padding"
+ android:background="@drawable/widget_button_left"
+ android:layout_height="match_parent"
+ android:src="@drawable/widget_icon"/>
+
+ <LinearLayout android:id="@+id/search_button"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:gravity="center"
+ android:contentDescription="@string/search_widget_button_label"
+ android:orientation="horizontal"
+ android:background="@drawable/widget_button_middle">
+
+ <TextView android:id="@+id/search_button_label"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:drawableLeft="@drawable/ic_widget_search"
+ android:drawablePadding="@dimen/widget_padding"
+ android:text="@string/search_widget_button_label"
+ android:gravity="center"
+ android:fontFamily="sans-serif"
+ android:textSize="@dimen/widget_text_size"
+ android:textColor="@color/toolbar_icon_grey"/>
+
+ </LinearLayout>
+
+ <LinearLayout android:id="@+id/new_tab_button"
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="match_parent"
+ android:contentDescription="@string/new_tab"
+ android:gravity="center"
+ android:orientation="horizontal"
+ android:background="@drawable/widget_button_right">
+
+ <TextView android:id="@+id/new_tab_button_label"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:drawableLeft="@drawable/ic_widget_new_tab"
+ android:drawablePadding="@dimen/widget_padding"
+ android:gravity="center"
+ android:text="@string/new_tab"
+ android:fontFamily="sans-serif"
+ android:textSize="@dimen/widget_text_size"
+ android:textColor="@color/toolbar_icon_grey"/>
+
+ </LinearLayout>
+
+</LinearLayout>
diff --git a/mobile/android/base/resources/layout/select_dialog_list.xml b/mobile/android/base/resources/layout/select_dialog_list.xml
new file mode 100644
index 000000000..ed6a7ecea
--- /dev/null
+++ b/mobile/android/base/resources/layout/select_dialog_list.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- This is used for select lists for multiple selection enabled -->
+<ListView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/select_list"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:cacheColorHint="@null"
+ android:scrollbars="vertical"
+ android:overScrollMode="ifContentScrolls" />
diff --git a/mobile/android/base/resources/layout/select_dialog_multichoice.xml b/mobile/android/base/resources/layout/select_dialog_multichoice.xml
new file mode 100644
index 000000000..0fc9f9494
--- /dev/null
+++ b/mobile/android/base/resources/layout/select_dialog_multichoice.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 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.
+-->
+
+<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@android:id/text1"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textAppearance="@style/TextAppearance.Widget.TextView"
+ style="@style/Widget.ListItem"/>
diff --git a/mobile/android/base/resources/layout/select_dialog_singlechoice.xml b/mobile/android/base/resources/layout/select_dialog_singlechoice.xml
new file mode 100644
index 000000000..0bffa830d
--- /dev/null
+++ b/mobile/android/base/resources/layout/select_dialog_singlechoice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 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.
+-->
+
+<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@android:id/text1"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textAppearance="@style/TextAppearance.Widget.TextView"
+ style="@style/Widget.ListItem"
+ android:checkMark="?android:attr/listChoiceIndicatorSingle"
+ android:ellipsize="marquee"/>
diff --git a/mobile/android/base/resources/layout/site_identity.xml b/mobile/android/base/resources/layout/site_identity.xml
new file mode 100644
index 000000000..b74c97c83
--- /dev/null
+++ b/mobile/android/base/resources/layout/site_identity.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <LinearLayout android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:paddingLeft="@dimen/doorhanger_section_padding_small"
+ android:paddingRight="@dimen/doorhanger_section_padding_small"
+ android:paddingBottom="@dimen/doorhanger_section_padding_large"
+ android:paddingTop="@dimen/doorhanger_section_padding_medium">
+
+ <ImageView android:id="@+id/site_identity_icon"
+ android:layout_width="@dimen/doorhanger_icon_size"
+ android:layout_height="@dimen/doorhanger_icon_size"
+ android:gravity="center_horizontal"
+ android:padding="@dimen/doorhanger_section_padding_small"
+ android:layout_marginRight="@dimen/doorhanger_section_padding_small"/>
+
+ <LinearLayout android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:layout_weight="1.0">
+
+ <TextView android:id="@+id/site_identity_title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textAppearance="@style/TextAppearance.DoorHanger.Medium.Light"/>
+
+ <TextView android:id="@+id/site_identity_state"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/doorhanger_subsection_padding"
+ android:textAppearance="@style/TextAppearance.DoorHanger.Medium.Bold"/>
+
+ <TextView android:id="@+id/mixed_content_activity"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/doorhanger_section_padding_medium"
+ android:textAppearance="@style/TextAppearance.DoorHanger.Medium"
+ android:visibility="gone"/>
+
+ <LinearLayout android:id="@+id/site_identity_known_container"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:visibility="gone"
+ android:orientation="vertical">
+
+ <TextView android:id="@+id/owner"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/doorhanger_section_padding_small"
+ android:textAppearance="@style/TextAppearance.DoorHanger.Medium"
+ android:textStyle="bold"/>
+
+ <TextView android:id="@+id/owner_supplemental"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textAppearance="@style/TextAppearance.DoorHanger.Medium"/>
+
+ <TextView android:id="@+id/verifier"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/doorhanger_section_padding_medium"
+ android:textAppearance="@style/TextAppearance.DoorHanger.Medium.Light"/>
+
+ </LinearLayout>
+
+ <TextView android:id="@+id/site_identity_link"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textAppearance="@style/TextAppearance.DoorHanger.Medium"
+ android:textColor="@color/link_blue"
+ android:layout_marginTop="@dimen/doorhanger_section_padding_large"
+ android:text="@string/learn_more"
+ android:visibility="gone"/>
+
+ <TextView android:id="@+id/site_settings_link"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textAppearance="@style/TextAppearance.DoorHanger.Medium"
+ android:textColor="@color/link_blue"
+ android:layout_marginTop="@dimen/doorhanger_section_padding_large"
+ android:text="@string/contextmenu_site_settings"
+ android:visibility="gone"/>
+ </LinearLayout>
+ </LinearLayout>
+
+ <View android:id="@+id/divider_doorhanger"
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="@color/toolbar_divider_grey"
+ android:visibility="gone"/>
+
+</LinearLayout>
diff --git a/mobile/android/base/resources/layout/site_setting_item.xml b/mobile/android/base/resources/layout/site_setting_item.xml
new file mode 100644
index 000000000..a8feba7e3
--- /dev/null
+++ b/mobile/android/base/resources/layout/site_setting_item.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<org.mozilla.gecko.widget.CheckableLinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:gravity="center_vertical"
+ android:paddingLeft="16dip"
+ android:paddingRight="12dip"
+ android:minHeight="?android:attr/listPreferredItemHeight"
+ android:focusable="false">
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:gravity="center_vertical"
+ android:focusable="false">
+
+ <TextView
+ android:id="@+id/setting"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ style="Widget.ListItem"
+ android:gravity="center_vertical|left"
+ android:singleLine="true"
+ android:ellipsize="marquee"/>
+
+ <TextView
+ android:id="@+id/value"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ style="Widget.ListItem"
+ android:gravity="center_vertical|left"
+ android:singleLine="true"
+ android:ellipsize="marquee"/>
+
+ </LinearLayout>
+
+ <android.support.v7.widget.AppCompatCheckBox
+ android:id="@+id/checkbox"
+ android:layout_width="35dip"
+ android:layout_height="wrap_content"
+ android:paddingRight="12dip"
+ android:gravity="center_vertical"
+ android:focusable="false"
+ android:clickable="false"/>
+
+</org.mozilla.gecko.widget.CheckableLinearLayout>
diff --git a/mobile/android/base/resources/layout/suggestion_item.xml b/mobile/android/base/resources/layout/suggestion_item.xml
new file mode 100644
index 000000000..8dc0dbe6c
--- /dev/null
+++ b/mobile/android/base/resources/layout/suggestion_item.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:minHeight="32dp"
+ android:orientation="horizontal"
+ android:background="@drawable/search_suggestion_button"
+ android:gravity="center_vertical"
+ android:clickable="true"
+ android:padding="5dp">
+
+ <ImageView android:id="@+id/suggestion_item_icon"
+ android:src="@drawable/icon_most_recent_empty"
+ android:layout_marginRight="3dip"
+ android:layout_width="18dip"
+ android:layout_height="18dip"
+ android:visibility="gone"/>
+
+ <TextView android:id="@+id/suggestion_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@color/text_and_tabs_tray_grey"
+ android:textSize="14sp"
+ android:gravity="center_vertical"
+ android:layout_gravity="center_vertical"/>
+
+</LinearLayout>
diff --git a/mobile/android/base/resources/layout/tab_history_item_row.xml b/mobile/android/base/resources/layout/tab_history_item_row.xml
new file mode 100644
index 000000000..c9de09506
--- /dev/null
+++ b/mobile/android/base/resources/layout/tab_history_item_row.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko= "http://schemas.android.com/apk/res-auto"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:background="@color/state_pressed_toolbar_grey_pressed" >
+
+ <LinearLayout android:id="@+id/tab_history_timeline_combo"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:layout_marginLeft="@dimen/tab_history_combo_margin_left"
+ android:layout_marginRight="@dimen/tab_history_combo_margin_right" >
+
+ <ImageView android:id="@+id/tab_history_timeline_top"
+ android:layout_width="@dimen/tab_history_timeline_width"
+ android:layout_height="@dimen/tab_history_timeline_height"
+ android:layout_gravity="center_horizontal"
+ android:background="@color/tab_history_timeline_separator" />
+
+ <org.mozilla.gecko.widget.FaviconView android:id="@+id/tab_history_icon"
+ android:layout_width="@dimen/tab_history_favicon_bg"
+ android:layout_height="@dimen/tab_history_favicon_bg"
+ android:background="@drawable/tab_history_icon_state"
+ android:padding="@dimen/tab_history_favicon_padding"
+ android:scaleType="centerInside"
+ gecko:overrideScaleType="false"
+ gecko:dominantBorderEnabled="false" />
+
+ <ImageView android:id="@+id/tab_history_timeline_bottom"
+ android:layout_width="@dimen/tab_history_timeline_width"
+ android:layout_height="@dimen/tab_history_timeline_height"
+ android:layout_gravity="center_horizontal"
+ android:background="@color/tab_history_timeline_separator" />
+
+ </LinearLayout>
+
+ <!-- HACK: Widget.TwoLinePageRow overrides the background attr but really shouldn't
+ (bug 1271797). So we override the override and set the background equal to null. -->
+ <org.mozilla.gecko.widget.FadedSingleColorTextView
+ android:id="@+id/tab_history_title"
+ style="@style/Widget.TwoLinePageRow.Title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:background="@null"
+ android:paddingRight="@dimen/tab_history_title_margin_right"
+ android:text="@+id/tab_history_title"
+ android:textSize="@dimen/tab_history_title_text_size"
+ android:textColor="@color/text_and_tabs_tray_grey"
+ gecko:fadeWidth="@dimen/tab_history_title_fading_width"/>
+
+</LinearLayout>
diff --git a/mobile/android/base/resources/layout/tab_history_layout.xml b/mobile/android/base/resources/layout/tab_history_layout.xml
new file mode 100644
index 000000000..010ab6c50
--- /dev/null
+++ b/mobile/android/base/resources/layout/tab_history_layout.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<RelativeLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <ListView android:id="@+id/tab_history_list"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:background="@drawable/tab_history_bg"
+ android:divider="@null" />
+</RelativeLayout>
diff --git a/mobile/android/base/resources/layout/tab_menu_strip.xml b/mobile/android/base/resources/layout/tab_menu_strip.xml
new file mode 100644
index 000000000..b3d3952b8
--- /dev/null
+++ b/mobile/android/base/resources/layout/tab_menu_strip.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:minWidth="@dimen/tabs_strip_button_width"
+ android:background="@drawable/tabs_strip_indicator"
+ android:paddingLeft="@dimen/tabs_strip_button_padding"
+ android:paddingRight="@dimen/tabs_strip_button_padding"
+ android:gravity="center"
+ android:focusable="true"
+ style="@style/TextAppearance.Widget.HomePagerTabMenuStrip"/>
diff --git a/mobile/android/base/resources/layout/tab_prompt_input.xml b/mobile/android/base/resources/layout/tab_prompt_input.xml
new file mode 100644
index 000000000..72a73b702
--- /dev/null
+++ b/mobile/android/base/resources/layout/tab_prompt_input.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<TabHost xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@android:id/tabhost"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:minHeight="100dp">
+
+ <TabWidget
+ android:id="@android:id/tabs"
+ style="@style/TabInput.TabWidget"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" >
+ </TabWidget>
+
+ <FrameLayout
+ android:id="@android:id/tabcontent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+ </FrameLayout>
+
+ </LinearLayout>
+
+</TabHost>
diff --git a/mobile/android/base/resources/layout/tab_queue_prompt.xml b/mobile/android/base/resources/layout/tab_queue_prompt.xml
new file mode 100644
index 000000000..d37b431d3
--- /dev/null
+++ b/mobile/android/base/resources/layout/tab_queue_prompt.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<merge
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:clipChildren="false"
+ android:clipToPadding="false">
+
+ <LinearLayout
+ android:id="@+id/tab_queue_container"
+ android:layout_width="@dimen/overlay_prompt_container_width"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom|center"
+ android:background="@android:color/white"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/title"
+ android:layout_width="@dimen/overlay_prompt_content_width"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:fontFamily="sans-serif-light"
+ android:gravity="center_horizontal"
+ android:paddingTop="40dp"
+ android:text="@string/tab_queue_prompt_title"
+ android:textColor="@color/text_and_tabs_tray_grey"
+ android:textSize="20sp"
+
+ tools:text="Opening multiple links?" />
+
+ <TextView
+ android:id="@+id/text"
+ android:layout_width="@dimen/overlay_prompt_content_width"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:gravity="center"
+ android:lineSpacingMultiplier="1.25"
+ android:paddingTop="20dp"
+ android:text="@string/tab_queue_prompt_text"
+ android:textColor="@color/placeholder_grey"
+ android:textSize="16sp"
+ tools:text="Save them until the next time you open Firefox." />
+
+ <TextView
+ android:id="@+id/tip_text"
+ android:layout_width="@dimen/overlay_prompt_content_width"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:gravity="center"
+ android:paddingBottom="30dp"
+ android:paddingTop="20dp"
+ android:text="@string/tab_queue_prompt_tip_text"
+ android:textColor="@color/action_orange"
+ android:textSize="14sp"
+ android:textStyle="italic"
+ tools:text="you can change this later in Settings" />
+
+ <TextView
+ android:id="@+id/settings_permit_text"
+ android:layout_width="@dimen/overlay_prompt_content_width"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:gravity="center"
+ android:paddingBottom="30dp"
+ android:paddingTop="20dp"
+ android:text="@string/tab_queue_prompt_permit_drawing_over_apps"
+ android:textColor="@color/action_orange"
+ android:textSize="14sp"
+ android:textStyle="italic"
+ tools:text="Turn on Permit drawing over other apps" />
+
+ <FrameLayout
+ android:id="@+id/bottom_container"
+ android:layout_width="match_parent"
+ android:layout_height="52dp"
+ android:layout_gravity="center"
+ android:layout_marginBottom="40dp">
+
+ <ImageView
+ android:id="@+id/enabled_confirmation"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:src="@drawable/img_check"
+ android:visibility="gone" />
+
+ <LinearLayout
+ android:id="@+id/button_container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center_horizontal"
+ android:orientation="horizontal">
+
+ <TextView
+ android:id="@+id/cancel_button"
+ style="@style/Widget.BaseButton"
+ android:layout_width="@dimen/overlay_prompt_button_width"
+ android:layout_height="match_parent"
+ android:layout_gravity="center"
+ android:background="@color/android:white"
+ android:text="@string/tab_queue_prompt_negative_action_button"
+ android:textColor="@drawable/tab_queue_dismiss_button_foreground"
+ android:textSize="16sp"
+
+ tools:text="Not now" />
+
+ <Button
+ android:id="@+id/ok_button"
+ style="@style/Widget.BaseButton"
+ android:layout_width="@dimen/overlay_prompt_button_width"
+ android:layout_height="match_parent"
+ android:layout_gravity="center"
+ android:background="@drawable/button_background_action_orange_round"
+ android:text="@string/tab_queue_prompt_positive_action_button"
+ android:textColor="@android:color/white"
+ android:textSize="16sp"
+ tools:text="Enable" />
+
+ <Button
+ android:id="@+id/settings_button"
+ style="@style/Widget.BaseButton"
+ android:layout_width="@dimen/overlay_prompt_button_width"
+ android:layout_height="match_parent"
+ android:layout_gravity="center"
+ android:background="@drawable/button_background_action_orange_round"
+ android:text="@string/tab_queue_prompt_settings_button"
+ android:textColor="@android:color/white"
+ android:textSize="16sp"
+ tools:text="Go to settings" />
+
+ </LinearLayout>
+
+ </FrameLayout>
+
+ </LinearLayout>
+</merge>
diff --git a/mobile/android/base/resources/layout/tab_queue_toast.xml b/mobile/android/base/resources/layout/tab_queue_toast.xml
new file mode 100644
index 000000000..9aaf60f94
--- /dev/null
+++ b/mobile/android/base/resources/layout/tab_queue_toast.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- (lint: UselessParent) The second-outermost layout doesn't have a parent to position itself
+ against and would take up the whole screen without the outermost layout. -->
+<FrameLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ tools:ignore="UselessParent">
+
+ <LinearLayout
+ android:id="@+id/toast"
+ style="@style/Toast">
+
+ <TextView
+ android:id="@+id/toast_message"
+ style="@style/ToastMessage"
+
+ tools:text="Tab queued in firefox" />
+
+ <View
+ android:id="@+id/toast_divider"
+ style="@style/ToastDivider" />
+
+ <Button
+ android:id="@+id/toast_button"
+ style="@style/ToastButton"
+ android:drawableLeft="@drawable/switch_button_icon"
+
+ tools:text="Open" />
+
+ </LinearLayout>
+</FrameLayout> \ No newline at end of file
diff --git a/mobile/android/base/resources/layout/tab_strip.xml b/mobile/android/base/resources/layout/tab_strip.xml
new file mode 100644
index 000000000..fd9d88555
--- /dev/null
+++ b/mobile/android/base/resources/layout/tab_strip.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<org.mozilla.gecko.tabs.TabStrip
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/text_and_tabs_tray_grey"/>
diff --git a/mobile/android/base/resources/layout/tab_strip_inner.xml b/mobile/android/base/resources/layout/tab_strip_inner.xml
new file mode 100644
index 000000000..8e7824818
--- /dev/null
+++ b/mobile/android/base/resources/layout/tab_strip_inner.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+ <org.mozilla.gecko.tabs.TabStripView
+ android:id="@+id/tab_strip"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:paddingTop="8dp"/>
+
+ <!-- The right margin creates a "dead area" on the right side of the button
+ which we compensate for with a touch delegate. See TabStrip -->
+ <org.mozilla.gecko.widget.themed.ThemedImageButton
+ android:id="@+id/add_tab"
+ style="@style/UrlBar.ImageButton"
+ android:layout_width="@dimen/tablet_tab_strip_height"
+ android:src="@drawable/tab_new"
+ gecko:drawableTintList="@color/tab_new_tab_strip_colors"
+ android:contentDescription="@string/new_tab"
+ android:layout_marginRight="9dp"
+ android:background="@drawable/tab_strip_button"/>
+
+</merge>
diff --git a/mobile/android/base/resources/layout/tab_strip_item.xml b/mobile/android/base/resources/layout/tab_strip_item.xml
new file mode 100644
index 000000000..73412458d
--- /dev/null
+++ b/mobile/android/base/resources/layout/tab_strip_item.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- The paddings are asymmetric here to compensate the padding around the
+ the close button within the TabStripItemView -->
+<org.mozilla.gecko.tabs.TabStripItemView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="@dimen/tablet_tab_strip_item_width"
+ android:layout_height="match_parent"
+ android:paddingLeft="28dp"
+ android:paddingRight="12dp"/>
diff --git a/mobile/android/base/resources/layout/tab_strip_item_view.xml b/mobile/android/base/resources/layout/tab_strip_item_view.xml
new file mode 100644
index 000000000..2f56b7702
--- /dev/null
+++ b/mobile/android/base/resources/layout/tab_strip_item_view.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+ <ImageView
+ android:id="@+id/favicon"
+ android:layout_width="@dimen/browser_toolbar_favicon_size"
+ android:layout_height="match_parent"
+ android:layout_marginRight="8dp"
+ android:scaleType="centerInside"
+ android:duplicateParentState="true"/>
+
+ <org.mozilla.gecko.widget.FadedSingleColorTextView
+ android:id="@+id/title"
+ android:layout_width="0dip"
+ android:layout_height="match_parent"
+ android:layout_weight="1.0"
+ android:layout_marginRight="-5dp"
+ android:drawablePadding="6dp"
+ android:gravity="center_vertical"
+ android:textSize="14sp"
+ android:ellipsize="end"
+ android:textColor="@color/tab_strip_item_title"
+ android:maxLines="1"
+ gecko:fadeWidth="30dip"
+ android:duplicateParentState="true"/>
+
+ <org.mozilla.gecko.widget.themed.ThemedImageButton
+ android:id="@+id/close"
+ android:layout_width="40dip"
+ android:layout_height="match_parent"
+ android:background="@android:color/transparent"
+ android:scaleType="center"
+ android:contentDescription="@string/close_tab"
+ android:src="@drawable/tab_close"
+ android:duplicateParentState="true"/>
+
+</merge>
diff --git a/mobile/android/base/resources/layout/tabs_counter.xml b/mobile/android/base/resources/layout/tabs_counter.xml
new file mode 100644
index 000000000..e41081251
--- /dev/null
+++ b/mobile/android/base/resources/layout/tabs_counter.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<org.mozilla.gecko.widget.themed.ThemedTextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="24dip"
+ android:layout_height="24dip"
+ android:layout_margin="12dip"
+ android:paddingTop="2dip"
+ android:paddingLeft="4dip"
+ android:background="@drawable/tabs_count_foreground"
+ android:textAppearance="@style/TextAppearance.Micro"
+ android:textColor="@color/text_and_tabs_tray_grey"
+ android:textStyle="bold"
+ android:duplicateParentState="true"
+ android:gravity="center"/>
diff --git a/mobile/android/base/resources/layout/tabs_layout_item_view.xml b/mobile/android/base/resources/layout/tabs_layout_item_view.xml
new file mode 100644
index 000000000..75f35e467
--- /dev/null
+++ b/mobile/android/base/resources/layout/tabs_layout_item_view.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<org.mozilla.gecko.tabs.TabsLayoutItemView xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto"
+ style="@style/TabsItem"
+ android:id="@+id/info"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:orientation="vertical">
+
+ <LinearLayout android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:duplicateParentState="true"
+ android:paddingLeft="@dimen/tab_highlight_stroke_width"
+ android:paddingRight="@dimen/tab_highlight_stroke_width"
+ android:paddingBottom="@dimen/tab_highlight_stroke_width">
+
+ <org.mozilla.gecko.widget.FadedSingleColorTextView
+ android:id="@+id/title"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1.0"
+ style="@style/TabLayoutItemTextAppearance"
+ android:textSize="14sp"
+ android:textColor="@color/tab_item_title"
+ android:singleLine="true"
+ android:duplicateParentState="true"
+ gecko:fadeWidth="15dp"
+ android:paddingRight="5dp"
+ android:drawablePadding="6dp"/>
+
+ <!-- Use of baselineAlignBottom only supported from API 11+ - if this needs to work on lower API versions
+ we'll need to override getBaseLine() and return image height, but we assume this won't happen -->
+ <ImageView android:id="@+id/close"
+ style="@style/TabsItemClose"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:scaleType="center"
+ android:baselineAlignBottom="true"
+ android:background="@android:color/transparent"
+ android:contentDescription="@string/close_tab"
+ android:src="@drawable/tab_item_close_button"
+ android:duplicateParentState="true"/>
+
+ </LinearLayout>
+
+ <!-- We set state_private on this View dynamically in TabsGridLayout. -->
+ <org.mozilla.gecko.widget.TabThumbnailWrapper
+ android:id="@+id/wrapper"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="@dimen/tab_highlight_stroke_width"
+ android:background="@drawable/tab_thumbnail"
+ android:duplicateParentState="true"
+ android:clipToPadding="false">
+
+ <org.mozilla.gecko.tabs.TabsPanelThumbnailView android:id="@+id/thumbnail"
+ android:layout_width="@dimen/tab_thumbnail_width"
+ android:layout_height="@dimen/tab_thumbnail_height"
+ android:elevation="2dp"
+ android:outlineProvider="bounds"
+ />
+
+ </org.mozilla.gecko.widget.TabThumbnailWrapper>
+
+</org.mozilla.gecko.tabs.TabsLayoutItemView>
diff --git a/mobile/android/base/resources/layout/tabs_list_item_view.xml b/mobile/android/base/resources/layout/tabs_list_item_view.xml
new file mode 100644
index 000000000..8c81e8095
--- /dev/null
+++ b/mobile/android/base/resources/layout/tabs_list_item_view.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<org.mozilla.gecko.tabs.TabsLayoutItemView xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/TabsItem"
+ android:focusable="true"
+ android:id="@+id/info"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingLeft="12dip"
+ android:paddingTop="6dip"
+ android:paddingBottom="6dip"
+ android:background="@drawable/tab_row">
+
+ <!-- We set state_private on this View dynamically in TabsListLayout. -->
+ <org.mozilla.gecko.widget.TabThumbnailWrapper
+ android:id="@+id/wrapper"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="4dip"
+ android:background="@drawable/tab_thumbnail"
+ android:duplicateParentState="true"
+ android:clipToPadding="false">
+
+ <org.mozilla.gecko.tabs.TabsPanelThumbnailView android:id="@+id/thumbnail"
+ android:layout_width="@dimen/tab_thumbnail_width"
+ android:layout_height="@dimen/tab_thumbnail_height"
+ android:elevation="2dp"
+ android:outlineProvider="bounds"/>
+
+ </org.mozilla.gecko.widget.TabThumbnailWrapper>
+
+ <LinearLayout android:layout_width="0dip"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:layout_weight="1.0"
+ android:paddingTop="4dip"
+ android:paddingLeft="8dip"
+ android:paddingRight="4dip"
+ android:duplicateParentState="true">
+
+ <TextView android:id="@+id/title"
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1.0"
+ style="@style/TabLayoutItemTextAppearance"
+ android:textColor="@color/tab_item_title"
+ android:textSize="14sp"
+ android:gravity="center_vertical"
+ android:singleLine="false"
+ android:maxLines="4"
+ android:drawablePadding="6dp"
+ android:duplicateParentState="true"/>
+
+ </LinearLayout>
+
+ <ImageView android:id="@+id/close"
+ style="@style/TabsItemClose"
+ android:layout_width="34dip"
+ android:layout_height="match_parent"
+ android:scaleType="center"
+ android:contentDescription="@string/close_tab"
+ android:src="@drawable/tab_item_close_button"
+ android:duplicateParentState="true"/>
+
+</org.mozilla.gecko.tabs.TabsLayoutItemView> \ No newline at end of file
diff --git a/mobile/android/base/resources/layout/tabs_panel_default.xml b/mobile/android/base/resources/layout/tabs_panel_default.xml
new file mode 100644
index 000000000..a5ef871e8
--- /dev/null
+++ b/mobile/android/base/resources/layout/tabs_panel_default.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+ <!-- The layout_height value is used in TabsPanel.getTabsLayoutContainerHeight
+ and as an offset in PrivateTabsPanel: if you change it here,
+ change it there! -->
+ <RelativeLayout android:id="@+id/tabs_panel_header"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/browser_toolbar_height">
+
+ <view class="org.mozilla.gecko.tabs.TabsPanel$TabsPanelToolbar"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/browser_toolbar_height"
+ android:background="@color/text_and_tabs_tray_grey">
+
+ <org.mozilla.gecko.tabs.TabPanelBackButton
+ android:id="@+id/nav_back"
+ android:layout_width="@dimen/tabs_panel_button_width"
+ android:layout_height="match_parent"
+ android:minWidth="@dimen/tabs_panel_button_width"
+ android:src="@drawable/tabs_panel_nav_back"
+ android:contentDescription="@string/back"
+ android:background="@drawable/action_bar_button_inverse"
+ gecko:dividerVerticalPadding="@dimen/tab_panel_divider_vertical_padding"
+ gecko:rightDivider="@drawable/tab_indicator_divider"/>
+
+ <org.mozilla.gecko.widget.IconTabWidget android:id="@+id/tab_widget"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:tabStripEnabled="false"
+ android:divider="@drawable/tab_indicator_divider"
+ android:dividerPadding="@dimen/tab_panel_divider_vertical_padding"
+ android:layout="@layout/tabs_panel_indicator"/>
+
+ <View android:layout_width="0dip"
+ android:layout_height="match_parent"
+ android:layout_weight="1.0"/>
+
+ <ImageButton android:id="@+id/add_tab"
+ style="@style/UrlBar.ImageButton"
+ android:layout_width="@dimen/tabs_panel_button_width"
+ android:padding="@dimen/browser_toolbar_button_padding"
+ android:src="@drawable/tab_new"
+ android:contentDescription="@string/new_tab"
+ android:background="@drawable/action_bar_button_inverse"/>
+
+ <FrameLayout android:id="@+id/menu"
+ style="@style/UrlBar.ImageButton"
+ android:layout_width="@dimen/tabs_panel_button_width"
+ android:background="@drawable/action_bar_button_inverse"
+ android:contentDescription="@string/menu">
+
+ <ImageView
+ style="@style/UrlBar.ImageButton"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/browser_toolbar_menu_icon_height"
+ android:layout_gravity="center"
+ android:scaleType="centerInside"
+ android:src="@drawable/menu"
+ android:tint="@color/tabs_tray_icon_grey"/>
+
+ </FrameLayout>
+
+ </view>
+
+ <View android:layout_width="match_parent"
+ android:layout_height="2dp"
+ android:layout_alignParentBottom="true"
+ android:background="#1A000000"/>
+
+ </RelativeLayout>
+
+ <FrameLayout
+ android:id="@+id/tabs_container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <view class="org.mozilla.gecko.tabs.TabsPanel$TabsLayout"
+ android:id="@+id/normal_tabs"
+ style="@style/TabsLayout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:choiceMode="singleChoice"
+ android:visibility="gone"
+ gecko:tabs="tabs_normal"/>
+
+ <org.mozilla.gecko.tabs.PrivateTabsPanel
+ android:id="@+id/private_tabs_panel"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:visibility="gone"/>
+
+ </FrameLayout>
+
+</merge>
diff --git a/mobile/android/base/resources/layout/tabs_panel_indicator.xml b/mobile/android/base/resources/layout/tabs_panel_indicator.xml
new file mode 100644
index 000000000..64c9d4afc
--- /dev/null
+++ b/mobile/android/base/resources/layout/tabs_panel_indicator.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<org.mozilla.gecko.widget.themed.ThemedImageButton
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="@dimen/tabs_panel_indicator_width"
+ android:layout_height="@dimen/browser_toolbar_height"
+ android:minWidth="@dimen/tabs_panel_indicator_width"
+ android:paddingTop="@dimen/browser_toolbar_button_padding"
+ android:paddingBottom="@dimen/browser_toolbar_button_padding"
+ android:background="@drawable/tabs_panel_indicator"/>
diff --git a/mobile/android/base/resources/layout/tabs_panel_view.xml b/mobile/android/base/resources/layout/tabs_panel_view.xml
new file mode 100644
index 000000000..1f70b28f5
--- /dev/null
+++ b/mobile/android/base/resources/layout/tabs_panel_view.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- The tabs panel is initial hidden on startup. It will be made
+ visible when the user activates it. See TabsPanel.show() -->
+<org.mozilla.gecko.tabs.TabsPanel xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/tabs_panel"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/text_and_tabs_tray_grey"
+ android:orientation="vertical"
+ android:visibility="invisible"/>
diff --git a/mobile/android/base/resources/layout/toolbar_display_layout.xml b/mobile/android/base/resources/layout/toolbar_display_layout.xml
new file mode 100644
index 000000000..4caacb379
--- /dev/null
+++ b/mobile/android/base/resources/layout/toolbar_display_layout.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+ <!-- The site security icon is misaligned with the page title so
+ we add a bottom margin to align their bottoms.
+ Site security icon must have exact position and size as search icon in
+ edit layout -->
+ <ImageButton android:id="@+id/site_security"
+ style="@style/UrlBar.ImageButton"
+ android:layout_width="@dimen/browser_toolbar_site_security_width"
+ android:layout_height="@dimen/browser_toolbar_site_security_height"
+ android:scaleType="fitCenter"
+ android:layout_marginRight="@dimen/browser_toolbar_site_security_margin_right"
+ android:layout_marginBottom="@dimen/browser_toolbar_site_security_margin_bottom"
+ android:paddingLeft="@dimen/browser_toolbar_site_security_padding_horizontal"
+ android:paddingRight="@dimen/browser_toolbar_site_security_padding_horizontal"
+ android:paddingTop="@dimen/browser_toolbar_site_security_padding_vertical"
+ android:paddingBottom="@dimen/browser_toolbar_site_security_padding_vertical"
+ android:src="@drawable/site_security_level"
+ android:contentDescription="@string/site_security"
+ android:layout_gravity="center_vertical" />
+
+ <org.mozilla.gecko.widget.FadedMultiColorTextView
+ android:id="@+id/url_bar_title"
+ style="@style/UrlBar.Title"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1.0"
+ gecko:fadeWidth="40dip"
+ gecko:fadeBackgroundColor="@color/toolbar_display_layout_bg"
+ gecko:autoUpdateTheme="false"/>
+
+ <org.mozilla.gecko.toolbar.PageActionLayout android:id="@+id/page_action_layout"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:visibility="gone"
+ android:orientation="horizontal"/>
+
+ <ImageButton android:id="@+id/stop"
+ android:layout_width="@dimen/page_action_button_width"
+ android:layout_height="match_parent"
+ android:src="@drawable/urlbar_stop"
+ android:contentDescription="@string/stop"
+ android:background="#00ffffff"
+ android:visibility="gone"/>
+
+</merge>
diff --git a/mobile/android/base/resources/layout/toolbar_edit_layout.xml b/mobile/android/base/resources/layout/toolbar_edit_layout.xml
new file mode 100644
index 000000000..c3d27fadf
--- /dev/null
+++ b/mobile/android/base/resources/layout/toolbar_edit_layout.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+ <!-- Search icon must have exact position and size as site security in
+ display layout -->
+ <ImageView android:id="@+id/search_icon"
+ android:layout_width="@dimen/browser_toolbar_site_security_width"
+ android:layout_height="@dimen/browser_toolbar_site_security_height"
+ android:layout_marginBottom="@dimen/browser_toolbar_site_security_margin_bottom"
+ android:layout_marginRight="@dimen/browser_toolbar_site_security_margin_right"
+ android:paddingBottom="@dimen/browser_toolbar_site_security_padding_vertical"
+ android:paddingLeft="@dimen/browser_toolbar_site_security_padding_horizontal"
+ android:paddingRight="@dimen/browser_toolbar_site_security_padding_horizontal"
+ android:paddingTop="@dimen/browser_toolbar_site_security_padding_vertical"
+ android:scaleType="fitCenter"
+ android:src="@drawable/search_icon_inactive"
+ android:visibility="gone"/>
+
+ <org.mozilla.gecko.toolbar.ToolbarEditText
+ android:id="@+id/url_edit_text"
+ style="@style/UrlBar.Title"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1.0"
+ android:inputType="textUri|textNoSuggestions"
+ android:imeOptions="actionGo|flagNoExtractUi|flagNoFullscreen"
+ android:selectAllOnFocus="true"
+ android:contentDescription="@string/url_bar_default_text"
+ android:paddingRight="8dp"
+ gecko:autoUpdateTheme="false"/>
+
+ <ImageButton android:id="@+id/qrcode"
+ android:layout_width="@dimen/page_action_button_width"
+ android:layout_height="match_parent"
+ android:src="@drawable/ab_qrcode"
+ android:background="@android:color/transparent"/>
+
+ <ImageButton android:id="@+id/mic"
+ android:layout_width="@dimen/page_action_button_width"
+ android:layout_height="match_parent"
+ android:src="@drawable/ab_mic"
+ android:background="@android:color/transparent"/>
+
+</merge>
diff --git a/mobile/android/base/resources/layout/top_sites_grid_item_view.xml b/mobile/android/base/resources/layout/top_sites_grid_item_view.xml
new file mode 100644
index 000000000..6a76514a3
--- /dev/null
+++ b/mobile/android/base/resources/layout/top_sites_grid_item_view.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+ <org.mozilla.gecko.home.TopSitesThumbnailView
+ android:id="@+id/thumbnail"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"/>
+
+ <org.mozilla.gecko.widget.FadedSingleColorTextView
+ android:id="@+id/title"
+ style="@style/Widget.TopSitesGridItemTitle"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/thumbnail"
+ android:duplicateParentState="true"
+ android:drawablePadding="4dip"
+ gecko:fadeWidth="20dip"/>
+
+</merge>
diff --git a/mobile/android/base/resources/layout/tracking_protection_prompt.xml b/mobile/android/base/resources/layout/tracking_protection_prompt.xml
new file mode 100644
index 000000000..5fc993b09
--- /dev/null
+++ b/mobile/android/base/resources/layout/tracking_protection_prompt.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<merge
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/tracking_protection_container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:clipChildren="false"
+ android:clipToPadding="false">
+
+ <LinearLayout
+ android:id="@+id/tracking_protection_inner_container"
+ android:layout_width="@dimen/overlay_prompt_container_width"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom|center"
+ android:background="@android:color/white"
+ android:orientation="vertical"
+ android:paddingBottom="40dp">
+
+ <ScrollView android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:fillViewport="true"
+ android:fadeScrollbars="false">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <ImageView android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@drawable/tracking_protection_toolbar_illustration"
+ android:layout_gravity="center"
+ android:layout_marginTop="40dp"
+ android:layout_marginBottom="20dp"/>
+
+ <TextView
+ android:id="@+id/title"
+ android:layout_width="@dimen/overlay_prompt_content_width"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:fontFamily="sans-serif-light"
+ android:gravity="center_horizontal"
+ android:text="@string/tracking_protection_prompt_title"
+ android:textColor="@color/text_and_tabs_tray_grey"
+ android:textSize="20sp"
+
+ tools:text="Now with Tracking Protection"/>
+
+ <TextView
+ android:id="@+id/text"
+ android:layout_width="@dimen/overlay_prompt_content_width"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:gravity="center"
+ android:lineSpacingMultiplier="1.25"
+ android:paddingTop="20dp"
+ android:text="@string/tracking_protection_prompt_text"
+ android:textColor="@color/placeholder_grey"
+ android:textSize="16sp"
+
+ tools:text="Actively block tracking elements so you don't have to worry."/>
+
+ <TextView
+ android:id="@+id/link_text"
+ android:layout_width="@dimen/overlay_prompt_content_width"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:gravity="center"
+ android:paddingBottom="30dp"
+ android:paddingTop="20dp"
+ android:text="@string/tracking_protection_prompt_tip_text"
+ android:textColor="@color/link_blue"
+ android:textSize="14sp"
+
+ tools:text="Visit Privacy settings to learn more"/>
+
+ </LinearLayout>
+
+ </ScrollView>
+
+ <Button
+ android:id="@+id/ok_button"
+ style="@style/Widget.BaseButton"
+ android:layout_width="match_parent"
+
+ android:layout_height="52dp"
+ android:layout_gravity="center"
+ android:background="@drawable/button_background_action_orange_round"
+ android:text="@string/tracking_protection_prompt_action_button"
+ android:textColor="@android:color/white"
+ android:textSize="16sp"
+
+ android:layout_marginLeft="32dp"
+ android:layout_marginRight="32dp"
+ tools:text="Got it"/>
+
+ </LinearLayout>
+
+</merge>
diff --git a/mobile/android/base/resources/layout/two_line_folder_row.xml b/mobile/android/base/resources/layout/two_line_folder_row.xml
new file mode 100644
index 000000000..3ca52749f
--- /dev/null
+++ b/mobile/android/base/resources/layout/two_line_folder_row.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto"
+ tools:context=".BrowserApp">
+
+ <ImageView android:id="@+id/icon"
+ android:src="@drawable/folder_closed"
+ android:layout_width="24dp"
+ android:layout_height="18dp"
+ android:scaleType="fitXY"
+ android:layout_margin="20dp"/>
+
+ <LinearLayout android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_gravity="center_vertical"
+ android:paddingRight="10dp"
+ android:orientation="vertical">
+
+ <org.mozilla.gecko.widget.FadedSingleColorTextView
+ android:id="@+id/title"
+ style="@style/Widget.TwoLinePageRow.Title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ gecko:fadeWidth="90dp"
+ tools:text="This is a long test title"/>
+
+ <org.mozilla.gecko.widget.FadedSingleColorTextView android:id="@+id/subtitle"
+ style="@style/Widget.TwoLinePageRow.Url"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:visibility="gone"
+ gecko:fadeWidth="90dp"
+ tools:text="1 items"/>
+
+ </LinearLayout>
+
+</merge>
diff --git a/mobile/android/base/resources/layout/two_line_page_row.xml b/mobile/android/base/resources/layout/two_line_page_row.xml
new file mode 100644
index 000000000..344f717d6
--- /dev/null
+++ b/mobile/android/base/resources/layout/two_line_page_row.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto"
+ tools:context=".BrowserApp">
+
+ <org.mozilla.gecko.widget.FaviconView android:id="@+id/icon"
+ android:layout_width="@dimen/favicon_bg"
+ android:layout_height="@dimen/favicon_bg"
+ android:layout_margin="16dp"
+ tools:background="@drawable/favicon_globe"/>
+
+ <LinearLayout android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_gravity="center_vertical"
+ android:paddingRight="10dp"
+ android:orientation="vertical">
+
+ <org.mozilla.gecko.widget.FadedSingleColorTextView
+ android:id="@+id/title"
+ style="@style/Widget.TwoLinePageRow.Title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ gecko:fadeWidth="90dp"
+ tools:text="This is a long test title"/>
+
+ <org.mozilla.gecko.widget.FadedSingleColorTextView android:id="@+id/url"
+ style="@style/Widget.TwoLinePageRow.Url"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:drawablePadding="5dp"
+ android:maxLength="1024"
+ gecko:fadeWidth="90dp"
+ tools:text="http://test.com/test"
+ tools:drawableLeft="@drawable/ic_url_bar_tab"/>
+
+ </LinearLayout>
+
+ <ImageView android:id="@+id/status_icon_bookmark"
+ android:layout_width="20dp"
+ android:layout_height="20dp"
+ android:layout_gravity="center"
+ android:visibility="gone"
+ android:src="@drawable/star_blue"/>
+
+</merge>
diff --git a/mobile/android/base/resources/layout/validation_message.xml b/mobile/android/base/resources/layout/validation_message.xml
new file mode 100644
index 000000000..abcc2ef1e
--- /dev/null
+++ b/mobile/android/base/resources/layout/validation_message.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="50dip">
+
+ <TextView android:id="@+id/validation_message_text"
+ android:layout_width="wrap_content"
+ android:layout_height="40dip"
+ android:layout_marginTop="6dip"
+ android:paddingLeft="20dp"
+ android:paddingRight="20dp"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="@color/validation_message_text"
+ android:background="@drawable/validation_bg"
+ android:gravity="center"
+ android:singleLine="true"
+ android:scrollHorizontally="true"
+ android:ellipsize="marquee"/>
+
+ <ImageView android:id="@+id/validation_message_arrow"
+ android:layout_width="24dip"
+ android:layout_height="10dip"
+ android:layout_centerHorizontal="true"
+ android:layout_alignParentTop="true"
+ android:src="@drawable/validation_arrow"
+ android:scaleType="fitXY"/>
+
+ <ImageView android:id="@+id/validation_message_arrow_inverted"
+ android:layout_width="24dip"
+ android:layout_height="10dip"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="35dip"
+ android:layout_alignParentTop="true"
+ android:src="@drawable/validation_arrow_inverted"
+ android:scaleType="fitXY"
+ android:visibility="gone"/>
+
+</RelativeLayout>
diff --git a/mobile/android/base/resources/layout/zoomed_view.xml b/mobile/android/base/resources/layout/zoomed_view.xml
new file mode 100644
index 000000000..fd5684303
--- /dev/null
+++ b/mobile/android/base/resources/layout/zoomed_view.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-->
+
+<org.mozilla.gecko.ZoomedView xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/zoomed_view_container"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/dropshadow"
+ android:padding="@dimen/drawable_dropshadow_size"
+ android:visibility="gone">
+
+ <RelativeLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true"
+ android:background="@drawable/toolbar_grey_round">
+ <!--
+ Zoom factor button is invisible by default. Set ui.zoomedview.simplified to false
+ in order to display the button in the zoomed view tool bar
+ -->
+ <TextView
+ android:id="@+id/change_zoom_factor"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/zoomed_view_toolbar_height"
+ android:background="@android:color/transparent"
+ android:padding="12dip"
+ android:layout_alignLeft="@+id/zoomed_image_view"
+ android:textSize="16sp"
+ android:textColor="@color/text_and_tabs_tray_grey"
+ android:visibility="invisible"/>
+ <ImageView
+ android:id="@+id/dialog_close"
+ android:scaleType="center"
+ android:layout_width="@dimen/zoomed_view_toolbar_height"
+ android:layout_height="@dimen/zoomed_view_toolbar_height"
+ android:layout_alignRight="@id/zoomed_image_view"
+ android:src="@drawable/close_edit_mode_selector"/>
+ <ImageView
+ android:id="@id/zoomed_image_view"
+ android:layout_below="@id/change_zoom_factor"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
+ </RelativeLayout>
+
+</org.mozilla.gecko.ZoomedView> \ No newline at end of file
diff --git a/mobile/android/base/resources/menu-large/browser_app_menu.xml b/mobile/android/base/resources/menu-large/browser_app_menu.xml
new file mode 100644
index 000000000..a4a8dbd4a
--- /dev/null
+++ b/mobile/android/base/resources/menu-large/browser_app_menu.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- We disable AlwaysShowAction because we interpret the menu
+ attributes ourselves and thus the warning isn't relevant to us. -->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ tools:ignore="AlwaysShowAction">
+
+ <item android:id="@+id/reload"
+ android:icon="@drawable/ic_menu_reload"
+ android:title="@string/reload"
+ android:showAsAction="always"/>
+
+ <item android:id="@+id/back"
+ android:icon="@drawable/ic_menu_back"
+ android:title="@string/back"
+ android:visible="false"/>
+
+ <item android:id="@+id/forward"
+ android:icon="@drawable/ic_menu_forward"
+ android:title="@string/forward"
+ android:visible="false"/>
+
+ <item android:id="@+id/bookmark"
+ android:icon="@drawable/ic_menu_bookmark_add"
+ android:title="@string/bookmark"
+ android:showAsAction="ifRoom"/>
+
+ <item android:id="@+id/share"
+ android:icon="@drawable/ic_menu_share"
+ android:title="@string/share"
+ android:showAsAction="ifRoom"/>
+
+ <item android:id="@+id/new_tab"
+ android:title="@string/new_tab"/>
+
+ <item android:id="@+id/new_private_tab"
+ android:title="@string/new_private_tab"/>
+
+ <item android:id="@+id/bookmarks_list"
+ android:title="@string/bookmarks_title"/>
+
+ <item android:id="@+id/history_list"
+ android:title="@string/history_title"/>
+
+ <item android:id="@+id/find_in_page"
+ android:title="@string/find_in_page" />
+
+ <item android:id="@+id/desktop_mode"
+ android:title="@string/desktop_mode"
+ android:checkable="true" />
+
+ <item android:id="@+id/page"
+ android:title="@string/page">
+
+ <menu>
+
+ <item android:id="@+id/subscribe"
+ android:title="@string/contextmenu_subscribe"/>
+
+ <item android:id="@+id/save_as_pdf"
+ android:title="@string/save_as_pdf"/>
+
+ <item android:id="@+id/print"
+ android:title="@string/print"/>
+
+ <item android:id="@+id/add_search_engine"
+ android:title="@string/contextmenu_add_search_engine"/>
+
+ <item android:id="@+id/add_to_launcher"
+ android:title="@string/contextmenu_add_to_launcher"/>
+
+ </menu>
+
+ </item>
+
+ <item android:id="@+id/tools"
+ android:title="@string/tools">
+
+ <menu>
+
+ <item android:id="@+id/downloads"
+ android:title="@string/downloads"/>
+
+ <item android:id="@+id/addons"
+ android:title="@string/addons"/>
+
+ <item android:id="@+id/logins"
+ android:title="@string/logins"/>
+
+ <item android:id="@+id/new_guest_session"
+ android:visible="false"
+ android:title="@string/new_guest_session"/>
+
+ <item android:id="@+id/exit_guest_session"
+ android:visible="false"
+ android:title="@string/exit_guest_session"/>
+
+ </menu>
+
+ </item>
+
+ <item android:id="@+id/char_encoding"
+ android:visible="false"
+ android:title="@string/char_encoding"/>
+
+ <item android:id="@+id/settings"
+ android:title="@string/settings" />
+
+ <item android:id="@+id/help"
+ android:title="@string/help_menu" />
+
+</menu>
diff --git a/mobile/android/base/resources/menu-v11/preferences_search_menu.xml b/mobile/android/base/resources/menu-v11/preferences_search_menu.xml
new file mode 100644
index 000000000..11fe2cadd
--- /dev/null
+++ b/mobile/android/base/resources/menu-v11/preferences_search_menu.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:id="@+id/restore_defaults"
+ android:drawable="@drawable/menu"
+ android:showAsAction="never"
+ android:title="@string/pref_search_restore_defaults" />
+</menu>
diff --git a/mobile/android/base/resources/menu-v11/tabs_menu.xml b/mobile/android/base/resources/menu-v11/tabs_menu.xml
new file mode 100644
index 000000000..bd974e25b
--- /dev/null
+++ b/mobile/android/base/resources/menu-v11/tabs_menu.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:id="@+id/new_tab"
+ android:title="@string/new_tab"/>
+
+ <item android:id="@+id/new_private_tab"
+ android:title="@string/new_private_tab"/>
+
+ <item android:id="@+id/close_all_tabs"
+ android:title="@string/close_all_tabs"/>
+
+ <item android:id="@+id/close_private_tabs"
+ android:title="@string/close_private_tabs"/>
+
+</menu>
diff --git a/mobile/android/base/resources/menu-v11/titlebar_contextmenu.xml b/mobile/android/base/resources/menu-v11/titlebar_contextmenu.xml
new file mode 100644
index 000000000..0027f0542
--- /dev/null
+++ b/mobile/android/base/resources/menu-v11/titlebar_contextmenu.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:id="@+id/pasteandgo"
+ android:title="@string/contextmenu_pasteandgo"/>
+
+ <item android:id="@+id/paste"
+ android:title="@string/contextmenu_paste"/>
+
+ <item android:id="@+id/copyurl"
+ android:title="@string/contextmenu_copyurl"/>
+
+ <item android:id="@+id/add_to_launcher"
+ android:title="@string/contextmenu_add_to_launcher"/>
+
+</menu>
diff --git a/mobile/android/base/resources/menu-xlarge/browser_app_menu.xml b/mobile/android/base/resources/menu-xlarge/browser_app_menu.xml
new file mode 100644
index 000000000..817a8690a
--- /dev/null
+++ b/mobile/android/base/resources/menu-xlarge/browser_app_menu.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- We disable AlwaysShowAction because we interpret the menu
+ attributes ourselves and thus the warning isn't relevant to us. -->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ tools:ignore="AlwaysShowAction">
+
+ <item android:id="@+id/reload"
+ android:icon="@drawable/ic_menu_reload"
+ android:title="@string/reload"
+ android:showAsAction="always"/>
+
+ <item android:id="@+id/back"
+ android:icon="@drawable/ic_menu_back"
+ android:title="@string/back"
+ android:visible="false"/>
+
+ <item android:id="@+id/forward"
+ android:icon="@drawable/ic_menu_forward"
+ android:title="@string/forward"
+ android:visible="false"/>
+
+ <item android:id="@+id/bookmark"
+ android:icon="@drawable/ic_menu_bookmark_add"
+ android:title="@string/bookmark"
+ android:showAsAction="always"/>
+
+ <item android:id="@+id/share"
+ android:icon="@drawable/ic_menu_share"
+ android:title="@string/share"
+ android:showAsAction="ifRoom"/>
+
+ <item android:id="@+id/new_tab"
+ android:title="@string/new_tab"/>
+
+ <item android:id="@+id/new_private_tab"
+ android:title="@string/new_private_tab"/>
+
+ <item android:id="@+id/bookmarks_list"
+ android:title="@string/bookmarks_title"/>
+
+ <item android:id="@+id/history_list"
+ android:title="@string/history_title"/>
+
+ <item android:id="@+id/find_in_page"
+ android:title="@string/find_in_page" />
+
+ <item android:id="@+id/desktop_mode"
+ android:title="@string/desktop_mode"
+ android:checkable="true" />
+
+
+ <item android:id="@+id/page"
+ android:title="@string/page">
+
+ <menu>
+
+ <item android:id="@+id/subscribe"
+ android:title="@string/contextmenu_subscribe"/>
+
+ <item android:id="@+id/save_as_pdf"
+ android:title="@string/save_as_pdf"/>
+
+ <item android:id="@+id/print"
+ android:title="@string/print"/>
+
+ <item android:id="@+id/add_search_engine"
+ android:title="@string/contextmenu_add_search_engine"/>
+
+ <item android:id="@+id/add_to_launcher"
+ android:title="@string/contextmenu_add_to_launcher"/>
+
+ </menu>
+
+ </item>
+
+ <item android:id="@+id/tools"
+ android:title="@string/tools">
+
+ <menu>
+
+ <item android:id="@+id/downloads"
+ android:title="@string/downloads"/>
+
+ <item android:id="@+id/addons"
+ android:title="@string/addons"/>
+
+ <item android:id="@+id/logins"
+ android:title="@string/logins"/>
+
+ <item android:id="@+id/new_guest_session"
+ android:visible="false"
+ android:title="@string/new_guest_session"/>
+
+ <item android:id="@+id/exit_guest_session"
+ android:visible="false"
+ android:title="@string/exit_guest_session"/>
+
+ </menu>
+
+ </item>
+
+ <item android:id="@+id/char_encoding"
+ android:visible="false"
+ android:title="@string/char_encoding"/>
+
+ <item android:id="@+id/settings"
+ android:title="@string/settings" />
+
+ <item android:id="@+id/help"
+ android:title="@string/help_menu" />
+
+</menu>
diff --git a/mobile/android/base/resources/menu/activitystream_contextmenu.xml b/mobile/android/base/resources/menu/activitystream_contextmenu.xml
new file mode 100644
index 000000000..ce22f14dc
--- /dev/null
+++ b/mobile/android/base/resources/menu/activitystream_contextmenu.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+ <!-- Group ID's are required, otherwise NavigationView won't show any dividers. The ID's are unused, but still required. -->
+ <group android:id="@+id/group0">
+ <item
+ android:id="@+id/bookmark"
+ android:icon="@drawable/as_bookmark"
+ android:title="@string/bookmark"/>
+ <item
+ android:id="@+id/share"
+ android:icon="@drawable/as_share"
+ android:title="@string/share"/>
+ <item
+ android:id="@+id/copy_url"
+ android:icon="@drawable/as_copy"
+ android:title="@string/contextmenu_copyurl"/>
+ <item
+ android:id="@+id/add_homescreen"
+ android:icon="@drawable/as_home"
+ android:title="@string/contextmenu_add_to_launcher"/>
+ </group>
+
+ <group android:id="@+id/group1">
+ <item
+ android:id="@+id/open_new_tab"
+ android:icon="@drawable/as_tab"
+ android:title="@string/contextmenu_open_new_tab"/>
+ <item
+ android:id="@+id/open_new_private_tab"
+ android:icon="@drawable/as_private"
+ android:title="@string/contextmenu_open_private_tab"/>
+ </group>
+
+
+ <group android:id="@+id/group2">
+ <item
+ android:id="@+id/dismiss"
+ android:icon="@drawable/as_dimiss"
+ android:title="@string/activity_stream_dismiss"/>
+
+ <item
+ android:id="@+id/delete"
+ android:icon="@drawable/as_bin"
+ android:visible="false"
+ android:title="@string/activity_stream_delete_history"/>
+ </group>
+</menu> \ No newline at end of file
diff --git a/mobile/android/base/resources/menu/browser_app_menu.xml b/mobile/android/base/resources/menu/browser_app_menu.xml
new file mode 100644
index 000000000..f831ee783
--- /dev/null
+++ b/mobile/android/base/resources/menu/browser_app_menu.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- We disable AlwaysShowAction because we interpret the menu
+ attributes ourselves and thus the warning isn't relevant to us. -->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ tools:ignore="AlwaysShowAction">
+
+ <item android:id="@+id/back"
+ android:icon="@drawable/ic_menu_back"
+ android:title="@string/back"
+ android:showAsAction="always"/>
+
+ <item android:id="@+id/forward"
+ android:icon="@drawable/ic_menu_forward"
+ android:title="@string/forward"
+ android:showAsAction="always"/>
+
+ <item android:id="@+id/bookmark"
+ android:icon="@drawable/ic_menu_bookmark_add"
+ android:title="@string/bookmark"
+ android:showAsAction="always"/>
+
+ <item android:id="@+id/reload"
+ android:icon="@drawable/ic_menu_reload"
+ android:title="@string/reload"
+ android:showAsAction="always"/>
+
+ <item android:id="@+id/share"
+ android:icon="@drawable/ic_menu_share"
+ android:title="@string/share"
+ android:showAsAction="ifRoom"/>
+
+ <item android:id="@+id/new_tab"
+ android:title="@string/new_tab"/>
+
+ <item android:id="@+id/new_private_tab"
+ android:title="@string/new_private_tab"/>
+
+ <item android:id="@+id/bookmarks_list"
+ android:title="@string/bookmarks_title"/>
+
+ <item android:id="@+id/history_list"
+ android:title="@string/history_title"/>
+
+ <item android:id="@+id/find_in_page"
+ android:title="@string/find_in_page" />
+
+ <item android:id="@+id/desktop_mode"
+ android:title="@string/desktop_mode"
+ android:checkable="true" />
+
+ <item android:id="@+id/page"
+ android:title="@string/page">
+
+ <menu>
+
+ <item android:id="@+id/subscribe"
+ android:title="@string/contextmenu_subscribe"/>
+
+ <item android:id="@+id/save_as_pdf"
+ android:title="@string/save_as_pdf"/>
+
+ <item android:id="@+id/print"
+ android:title="@string/print"/>
+
+ <item android:id="@+id/add_search_engine"
+ android:title="@string/contextmenu_add_search_engine"/>
+
+ <item android:id="@+id/add_to_launcher"
+ android:title="@string/contextmenu_add_to_launcher"/>
+
+ </menu>
+
+ </item>
+
+ <item android:id="@+id/tools"
+ android:title="@string/tools">
+
+ <menu>
+
+ <item android:id="@+id/downloads"
+ android:title="@string/downloads"/>
+
+ <item android:id="@+id/addons"
+ android:title="@string/addons"/>
+
+ <item android:id="@+id/logins"
+ android:title="@string/logins"/>
+
+ <item android:id="@+id/new_guest_session"
+ android:visible="false"
+ android:title="@string/new_guest_session"/>
+
+ <item android:id="@+id/exit_guest_session"
+ android:visible="false"
+ android:title="@string/exit_guest_session"/>
+
+ </menu>
+
+ </item>
+
+ <item android:id="@+id/char_encoding"
+ android:visible="false"
+ android:title="@string/char_encoding"/>
+
+ <item android:id="@+id/settings"
+ android:title="@string/settings" />
+
+ <item android:id="@+id/help"
+ android:title="@string/help_menu" />
+
+</menu>
diff --git a/mobile/android/base/resources/menu/browsersearch_contextmenu.xml b/mobile/android/base/resources/menu/browsersearch_contextmenu.xml
new file mode 100644
index 000000000..335490825
--- /dev/null
+++ b/mobile/android/base/resources/menu/browsersearch_contextmenu.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:id="@+id/browsersearch_remove"
+ android:title="@string/contextmenu_remove"/>
+
+</menu>
diff --git a/mobile/android/base/resources/menu/gecko_app_menu.xml b/mobile/android/base/resources/menu/gecko_app_menu.xml
new file mode 100644
index 000000000..a55804fcb
--- /dev/null
+++ b/mobile/android/base/resources/menu/gecko_app_menu.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:id="@+id/quit"
+ android:title="@string/quit"
+ android:orderInCategory="10" />
+</menu>
diff --git a/mobile/android/base/resources/menu/home_contextmenu.xml b/mobile/android/base/resources/menu/home_contextmenu.xml
new file mode 100644
index 000000000..294b8aee5
--- /dev/null
+++ b/mobile/android/base/resources/menu/home_contextmenu.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:id="@+id/home_open_new_tab"
+ android:title="@string/contextmenu_open_new_tab"/>
+
+ <item android:id="@+id/home_open_private_tab"
+ android:title="@string/contextmenu_open_private_tab"/>
+
+ <item android:id="@+id/home_copyurl"
+ android:title="@string/contextmenu_copyurl"/>
+
+ <item android:id="@+id/home_share"
+ android:title="@string/contextmenu_share"/>
+
+ <item android:id="@+id/top_sites_edit"
+ android:title="@string/contextmenu_top_sites_edit"/>
+
+ <item android:id="@+id/top_sites_pin"
+ android:title="@string/contextmenu_top_sites_pin"/>
+
+ <item android:id="@+id/top_sites_unpin"
+ android:title="@string/contextmenu_top_sites_unpin"/>
+
+ <item android:id="@+id/home_edit_bookmark"
+ android:title="@string/contextmenu_edit_bookmark"/>
+
+ <item android:id="@+id/home_remove"
+ android:title="@string/contextmenu_remove"/>
+
+ <item android:id="@+id/home_add_to_launcher"
+ android:title="@string/contextmenu_add_to_launcher"/>
+
+</menu>
diff --git a/mobile/android/base/resources/menu/home_remote_tabs_client_contextmenu.xml b/mobile/android/base/resources/menu/home_remote_tabs_client_contextmenu.xml
new file mode 100644
index 000000000..cd6310bdb
--- /dev/null
+++ b/mobile/android/base/resources/menu/home_remote_tabs_client_contextmenu.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:id="@+id/home_remote_tabs_hide_client"
+ android:title="@string/pref_panels_hide"/>
+
+</menu>
diff --git a/mobile/android/base/resources/menu/preferences_search_menu.xml b/mobile/android/base/resources/menu/preferences_search_menu.xml
new file mode 100644
index 000000000..f3b2453d1
--- /dev/null
+++ b/mobile/android/base/resources/menu/preferences_search_menu.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- Stub to preserve IDs. -->
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:id="@+id/restore_defaults"
+ android:title="" />
+</menu>
diff --git a/mobile/android/base/resources/menu/tabs_menu.xml b/mobile/android/base/resources/menu/tabs_menu.xml
new file mode 100644
index 000000000..bd974e25b
--- /dev/null
+++ b/mobile/android/base/resources/menu/tabs_menu.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:id="@+id/new_tab"
+ android:title="@string/new_tab"/>
+
+ <item android:id="@+id/new_private_tab"
+ android:title="@string/new_private_tab"/>
+
+ <item android:id="@+id/close_all_tabs"
+ android:title="@string/close_all_tabs"/>
+
+ <item android:id="@+id/close_private_tabs"
+ android:title="@string/close_private_tabs"/>
+
+</menu>
diff --git a/mobile/android/base/resources/menu/titlebar_contextmenu.xml b/mobile/android/base/resources/menu/titlebar_contextmenu.xml
new file mode 100644
index 000000000..72c41cdc5
--- /dev/null
+++ b/mobile/android/base/resources/menu/titlebar_contextmenu.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:id="@+id/pasteandgo"
+ android:title="@string/contextmenu_pasteandgo"/>
+
+ <item android:id="@+id/paste"
+ android:title="@string/contextmenu_paste"/>
+
+ <item android:id="@+id/subscribe"
+ android:title="@string/contextmenu_subscribe"/>
+
+ <item android:id="@+id/add_search_engine"
+ android:title="@string/contextmenu_add_search_engine"/>
+
+ <item android:id="@+id/copyurl"
+ android:title="@string/contextmenu_copyurl"/>
+
+ <item android:id="@+id/add_to_launcher"
+ android:title="@string/contextmenu_add_to_launcher"/>
+
+</menu>
diff --git a/mobile/android/base/resources/raw/bookmarkdefaults_favicon_addons.png b/mobile/android/base/resources/raw/bookmarkdefaults_favicon_addons.png
new file mode 100644
index 000000000..2fbc630e6
--- /dev/null
+++ b/mobile/android/base/resources/raw/bookmarkdefaults_favicon_addons.png
Binary files differ
diff --git a/mobile/android/base/resources/raw/bookmarkdefaults_favicon_restricted_support.png b/mobile/android/base/resources/raw/bookmarkdefaults_favicon_restricted_support.png
new file mode 100644
index 000000000..ea7d6a3ae
--- /dev/null
+++ b/mobile/android/base/resources/raw/bookmarkdefaults_favicon_restricted_support.png
Binary files differ
diff --git a/mobile/android/base/resources/raw/bookmarkdefaults_favicon_restricted_webmaker.png b/mobile/android/base/resources/raw/bookmarkdefaults_favicon_restricted_webmaker.png
new file mode 100644
index 000000000..ad177aa86
--- /dev/null
+++ b/mobile/android/base/resources/raw/bookmarkdefaults_favicon_restricted_webmaker.png
Binary files differ
diff --git a/mobile/android/base/resources/raw/bookmarkdefaults_favicon_support.png b/mobile/android/base/resources/raw/bookmarkdefaults_favicon_support.png
new file mode 100644
index 000000000..3255e4cfd
--- /dev/null
+++ b/mobile/android/base/resources/raw/bookmarkdefaults_favicon_support.png
Binary files differ
diff --git a/mobile/android/base/resources/raw/fake_home_items.json b/mobile/android/base/resources/raw/fake_home_items.json
new file mode 100644
index 000000000..59b4ab74e
--- /dev/null
+++ b/mobile/android/base/resources/raw/fake_home_items.json
@@ -0,0 +1,15 @@
+[{
+ "id": 1,
+ "dataset_id": "fake-dataset",
+ "url": "http://example.com/first",
+ "title": "First Example",
+ "description": "This is an example",
+ "image_url": "http://lorempixel.com/64/64?id=1"
+}, {
+ "id": 2,
+ "dataset_id": "fake-dataset",
+ "url": "http://example.com/second",
+ "title": "Second Example",
+ "description": "This is a second example",
+ "image_url": "http://lorempixel.com/64/64?id=2"
+}]
diff --git a/mobile/android/base/resources/raw/topdomains.txt b/mobile/android/base/resources/raw/topdomains.txt
new file mode 100644
index 000000000..de1c19f4b
--- /dev/null
+++ b/mobile/android/base/resources/raw/topdomains.txt
@@ -0,0 +1,455 @@
+google.com
+facebook.com
+amazon.com
+youtube.com
+yahoo.com
+ebay.com
+wikipedia.org
+twitter.com
+reddit.com
+go.com
+craigslist.org
+live.com
+netflix.com
+pinterest.com
+bing.com
+linkedin.com
+imgur.com
+espn.go.com
+walmart.com
+tumblr.com
+target.com
+paypal.com
+cnn.com
+chase.com
+instagram.com
+bestbuy.com
+blogspot.com
+nytimes.com
+msn.com
+imdb.com
+apple.com
+bankofamerica.com
+diply.com
+huffingtonpost.com
+yelp.com
+wellsfargo.com
+etsy.com
+weather.com
+wordpress.com
+buzzfeed.com
+zillow.com
+kohls.com
+aol.com
+homedepot.com
+foxnews.com
+microsoft.com
+comcast.net
+wikia.com
+groupon.com
+macys.com
+washingtonpost.com
+outbrain.com
+microsoftonline.com
+xfinity.com
+usps.com
+hulu.com
+americanexpress.com
+slickdeals.net
+pandora.com
+office.com
+cnet.com
+indeed.com
+capitalone.com
+nfl.com
+ups.com
+ask.com
+verizonwireless.com
+newegg.com
+usatoday.com
+forbes.com
+dailymail.co.uk
+dropbox.com
+att.com
+costco.com
+gfycat.com
+lowes.com
+gap.com
+about.com
+tripadvisor.com
+fedex.com
+baidu.com
+vice.com
+nordstrom.com
+adobe.com
+bbc.com
+twitch.tv
+allrecipes.com
+retailmenot.com
+stackoverflow.com
+citi.com
+sears.com
+jcpenney.com
+webmd.com
+ijreview.com
+nih.gov
+answers.com
+foodnetwork.com
+discovercard.com
+cbssports.com
+overstock.com
+businessinsider.com
+office365.com
+theguardian.com
+staples.com
+bleacherreport.com
+toysrus.com
+verizon.com
+github.com
+wayfair.com
+salesforce.com
+zulily.com
+wsj.com
+flickr.com
+goodreads.com
+realtor.com
+nbcnews.com
+ebates.com
+ancestry.com
+wunderground.com
+instructure.com
+people.com
+stackexchange.com
+drudgereport.com
+fidelity.com
+southwest.com
+deviantart.com
+thesaurus.com
+intuit.com
+woot.com
+pch.com
+soundcloud.com
+force.com
+samsclub.com
+ign.com
+qvc.com
+npr.org
+patch.com
+dell.com
+accuweather.com
+vimeo.com
+expedia.com
+trulia.com
+ca.gov
+swagbucks.com
+spotify.com
+bedbathandbeyond.com
+nypost.com
+aliexpress.com
+blackboard.com
+ticketmaster.com
+ikea.com
+feedly.com
+usaa.com
+tmz.com
+quora.com
+lifehacker.com
+kayak.com
+reference.com
+zappos.com
+gizmodo.com
+slate.com
+faithtap.com
+adp.com
+abcnews.go.com
+sephora.com
+cbs.com
+latimes.com
+shutterfly.com
+t-mobile.com
+littlethings.com
+glassdoor.com
+bloomberg.com
+cbsnews.com
+wikihow.com
+walgreens.com
+usbank.com
+blogger.com
+weebly.com
+gamestop.com
+food.com
+time.com
+kickstarter.com
+okcupid.com
+aa.com
+weather.gov
+nametests.com
+fandango.com
+engadget.com
+steamcommunity.com
+thekitchn.com
+nba.com
+mashable.com
+hp.com
+gamefaqs.com
+delta.com
+breitbart.com
+coupons.com
+eonline.com
+surveymonkey.com
+kmart.com
+barnesandnoble.com
+meetup.com
+bhphotovideo.com
+fanduel.com
+quizlet.com
+nydailynews.com
+sbnation.com
+nbcsports.com
+likes.com
+bbc.co.uk
+ew.com
+nike.com
+rottentomatoes.com
+steampowered.com
+reuters.com
+qq.com
+today.com
+mapquest.com
+audible.com
+priceline.com
+whitepages.com
+united.com
+myfitnesspal.com
+icloud.com
+forever21.com
+theatlantic.com
+microsoftstore.com
+theverge.com
+gawker.com
+houzz.com
+mayoclinic.org
+rei.com
+sfgate.com
+lifebuzz.com
+discover.com
+pnc.com
+pof.com
+iflscience.com
+popsugar.com
+creditkarma.com
+telegraph.co.uk
+airbnb.com
+buzzlie.com
+cnbc.com
+deadspin.com
+sina.com.cn
+legacy.com
+thedailybeast.com
+samsung.com
+nextdoor.com
+evite.com
+shopify.com
+yellowpages.com
+pcmag.com
+redfin.com
+emgn.com
+weibo.com
+alibaba.com
+cabelas.com
+battle.net
+foxsports.com
+taobao.com
+eventbrite.com
+victoriassecret.com
+theblaze.com
+dealnews.com
+cbslocal.com
+cvs.com
+dailymotion.com
+ecollege.com
+gofundme.com
+fitbit.com
+instructables.com
+godaddy.com
+babycenter.com
+squarespace.com
+llbean.com
+dickssportinggoods.com
+6pm.com
+myway.com
+hsn.com
+wired.com
+officedepot.com
+ozztube.com
+usmagazine.com
+match.com
+cracked.com
+evernote.com
+box.com
+starbucks.com
+kbb.com
+mlb.com
+marriott.com
+si.com
+jezebel.com
+pbs.org
+consumerreports.org
+roblox.com
+urbandictionary.com
+kotaku.com
+xbox.com
+marketwatch.com
+refinery29.com
+wikimedia.org
+tvguide.com
+politico.com
+barclaycardus.com
+abc.go.com
+mint.com
+topix.com
+theblackfriday.com
+aarp.org
+hotnewhiphop.com
+yourdailydish.com
+sprint.com
+vox.com
+cafemom.com
+nbc.com
+dailykos.com
+azlyrics.com
+autotrader.com
+hilton.com
+irs.gov
+monster.com
+fatwallet.com
+mailchimp.com
+webex.com
+landsend.com
+wix.com
+usnews.com
+jcrew.com
+jet.com
+capitalone360.com
+sharepoint.com
+schwab.com
+ulta.com
+vistaprint.com
+rollingstone.com
+biblegateway.com
+gamespot.com
+io9.com
+opentable.com
+hm.com
+duckduckgo.com
+chron.com
+photobucket.com
+shareasale.com
+directv.com
+avg.com
+oracle.com
+hotels.com
+timewarnercable.com
+chicagotribune.com
+ehow.com
+primewire.ag
+abs-cbnnews.com
+salon.com
+greatergood.com
+epicurious.com
+fool.com
+patheos.com
+custhelp.com
+purdue.edu
+tickld.com
+frys.com
+indiatimes.com
+amazon.co.uk
+zendesk.com
+tigerdirect.com
+stubhub.com
+healthcare.gov
+archive.org
+qualtrics.com
+ravelry.com
+cars.com
+redbox.com
+jalopnik.com
+speedtest.net
+harvard.edu
+slideshare.net
+kinja.com
+nesn.com
+michaels.com
+mit.edu
+bodybuilding.com
+edmunds.com
+nhl.com
+zergnet.com
+terraclicks.com
+techcrunch.com
+regnok.com
+pogo.com
+backpage.com
+mozilla.org
+naver.com
+giphy.com
+bankrate.com
+msnbc.com
+digitaltrends.com
+fanfiction.net
+skype.com
+disney.go.com
+norton.com
+androidcentral.com
+tomshardware.com
+thefreedictionary.com
+liveleak.com
+247sports.com
+merriam-webster.com
+wnd.com
+earthlink.net
+conservativetribune.com
+independent.co.uk
+drugs.com
+rotoworld.com
+nationalgeographic.com
+ae.com
+noaa.gov
+arstechnica.com
+thinkgeek.com
+stanford.edu
+bizjournals.com
+hootsuite.com
+genius.com
+goodhousekeeping.com
+vanguard.com
+ny.gov
+citibankonline.com
+booking.com
+mic.com
+orbitz.com
+dominos.com
+medium.com
+wow.com
+urbanoutfitters.com
+douban.com
+timeanddate.com
+draftkings.com
+livestrong.com
+livingsocial.com
+cox.net
+theonion.com
+marthastewart.com
+comenity.net
+worldlifestyle.com
+disney.com
+realsimple.com
+vrbo.com
+playstation.com
+potterybarn.com
+zazzle.com
+ksl.com
+tdbank.com
+sourceforge.net
+careerbuilder.com
diff --git a/mobile/android/base/resources/values-land/dimens.xml b/mobile/android/base/resources/values-land/dimens.xml
new file mode 100644
index 000000000..561b81b76
--- /dev/null
+++ b/mobile/android/base/resources/values-land/dimens.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+ <!-- Remote Tabs static view top padding. Less in landscape on phones. -->
+ <dimen name="home_remote_tabs_top_padding">16dp</dimen>
+ <dimen name="tab_panel_grid_padding">48dp</dimen>
+</resources>
diff --git a/mobile/android/base/resources/values-land/integers.xml b/mobile/android/base/resources/values-land/integers.xml
new file mode 100644
index 000000000..c70badd26
--- /dev/null
+++ b/mobile/android/base/resources/values-land/integers.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+ <integer name="number_of_top_sites_cols">3</integer>
+ <integer name="panel_icon_grid_view_columns">6</integer>
+
+</resources>
diff --git a/mobile/android/base/resources/values-land/styles.xml b/mobile/android/base/resources/values-land/styles.xml
new file mode 100644
index 000000000..b9362223a
--- /dev/null
+++ b/mobile/android/base/resources/values-land/styles.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+ <style name="TabsLayout" parent="TabsLayoutBase">
+ <item name="android:orientation">horizontal</item>
+ <item name="android:scrollbars">horizontal</item>
+ </style>
+
+ <style name="TabsItem">
+ <item name="android:nextFocusDown">@+id/close</item>
+ </style>
+
+ <style name="TabsItemClose">
+ <item name="android:nextFocusUp">@+id/info</item>
+ </style>
+
+ <!-- Tabs panel -->
+ <style name="TabsPanelSection" parent="TabsPanelSectionBase">
+ <item name="android:layout_weight">1</item>
+ </style>
+
+ <style name="TabsPanelItem">
+ <item name="android:layout_marginBottom">20dp</item>
+ <item name="android:layout_gravity">left</item>
+ <item name="android:gravity">left</item>
+ </style>
+
+</resources>
diff --git a/mobile/android/base/resources/values-large-land-v11/dimens.xml b/mobile/android/base/resources/values-large-land-v11/dimens.xml
new file mode 100644
index 000000000..4d14ba835
--- /dev/null
+++ b/mobile/android/base/resources/values-large-land-v11/dimens.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+ <!-- Remote Tabs static view top padding. Less in landscape on phones. -->
+ <dimen name="home_remote_tabs_top_padding">48dp</dimen>
+ <dimen name="home_header_item_height">64dp</dimen>
+
+</resources>
diff --git a/mobile/android/base/resources/values-large-land-v11/styles.xml b/mobile/android/base/resources/values-large-land-v11/styles.xml
new file mode 100644
index 000000000..14fbdf342
--- /dev/null
+++ b/mobile/android/base/resources/values-large-land-v11/styles.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+ <style name="TabsLayout" parent="TabsLayoutBase">
+ <item name="android:scrollbars">vertical</item>
+ </style>
+
+ <style name="Widget.BookmarksListView" parent="Widget.HomeListView">
+ <item name="android:scrollbarStyle">outsideOverlay</item>
+ </style>
+
+ <style name="Widget.TopSitesGridView" parent="Widget.GridView">
+ <item name="android:paddingLeft">55dp</item>
+ <item name="android:paddingRight">55dp</item>
+ <item name="android:paddingBottom">30dp</item>
+ <item name="android:horizontalSpacing">20dp</item>
+ <item name="android:verticalSpacing">20dp</item>
+ </style>
+
+ <!-- Tabs panel -->
+ <style name="TabsPanelSection" parent="TabsPanelSectionBase">
+ <item name="android:layout_marginLeft">20dp</item>
+ <item name="android:layout_marginRight">20dp</item>
+ </style>
+
+ <style name="TabsPanelItem" parent="TabsPanelItemBase">
+ <!-- To override the values-land style. -->
+ </style>
+
+</resources>
diff --git a/mobile/android/base/resources/values-large-v16/dimens.xml b/mobile/android/base/resources/values-large-v16/dimens.xml
new file mode 100644
index 000000000..80ce7118d
--- /dev/null
+++ b/mobile/android/base/resources/values-large-v16/dimens.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+ <dimen name="doorhanger_offsetY">124dp</dimen>
+</resources>
diff --git a/mobile/android/base/resources/values-large-v16/styles.xml b/mobile/android/base/resources/values-large-v16/styles.xml
new file mode 100644
index 000000000..1c57a046e
--- /dev/null
+++ b/mobile/android/base/resources/values-large-v16/styles.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <style name="TextAppearance.UrlBar.Title" parent="TextAppearance.Small">
+ <item name="android:textSize">16sp</item>
+ <item name="android:fontFamily">sans-serif-light</item>
+ </style>
+
+</resources>
diff --git a/mobile/android/base/resources/values-large/bool.xml b/mobile/android/base/resources/values-large/bool.xml
new file mode 100644
index 000000000..73fde40be
--- /dev/null
+++ b/mobile/android/base/resources/values-large/bool.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ This Source Code Form is subject to the terms of the Mozilla Public
+ ~ License, v. 2.0. If a copy of the MPL was not distributed with this
+ ~ file, you can obtain one at http://mozilla.org/MPL/2.0/.
+ -->
+
+<resources>
+ <!-- See definition in values/ for explanation. -->
+ <bool name="is_large_resource">true</bool>
+</resources>
diff --git a/mobile/android/base/resources/values-large/dimens.xml b/mobile/android/base/resources/values-large/dimens.xml
new file mode 100644
index 000000000..a94ef6fb1
--- /dev/null
+++ b/mobile/android/base/resources/values-large/dimens.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+ <dimen name="doorhanger_offsetY">100dp</dimen>
+
+ <dimen name="browser_toolbar_height">56dp</dimen>
+ <!-- This value is the height of the Tabs Panel header view
+ (browser_toolbar_height) minus the height of the indicator
+ (6dp). This value should change when the height of the view changes. -->
+ <dimen name="tabs_panel_indicator_selected_padding_top">50dp</dimen>
+
+ <dimen name="browser_toolbar_height_flipper">60dp</dimen>
+ <dimen name="browser_toolbar_button_padding">16dp</dimen>
+ <dimen name="browser_toolbar_favicon_size">16dp</dimen>
+
+ <dimen name="browser_toolbar_site_security_height">60dp</dimen>
+ <dimen name="browser_toolbar_site_security_width">34dp</dimen>
+ <dimen name="browser_toolbar_site_security_margin_right">1dp</dimen>
+ <!-- We primarily use padding (instead of margins) to increase the hit area. -->
+ <dimen name="browser_toolbar_site_security_padding_vertical">21dp</dimen>
+ <dimen name="browser_toolbar_site_security_padding_horizontal">8dp</dimen>
+
+ <dimen name="firstrun_background_height">300dp</dimen>
+
+ <dimen name="tabs_panel_indicator_width">72dp</dimen>
+ <dimen name="tabs_panel_button_width">60dp</dimen>
+ <dimen name="panel_grid_view_column_width">200dp</dimen>
+
+ <dimen name="overlay_prompt_container_width">360dp</dimen>
+
+ <item name="tab_strip_content_start" type="dimen">72dp</item>
+
+</resources>
diff --git a/mobile/android/base/resources/values-large/integers.xml b/mobile/android/base/resources/values-large/integers.xml
new file mode 100644
index 000000000..2688e5de5
--- /dev/null
+++ b/mobile/android/base/resources/values-large/integers.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+ <integer name="number_of_inline_share_devices">3</integer>
+ <integer name="max_search_suggestions">4</integer>
+ <integer name="max_saved_suggestions">4</integer>
+
+</resources>
diff --git a/mobile/android/base/resources/values-large/styles.xml b/mobile/android/base/resources/values-large/styles.xml
new file mode 100644
index 000000000..79867a802
--- /dev/null
+++ b/mobile/android/base/resources/values-large/styles.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+ <style name="UrlBar.ImageButton" parent="UrlBar.ImageButtonBase">
+ <item name="android:layout_width">@dimen/tablet_browser_toolbar_menu_item_width</item>
+ </style>
+
+ <!-- If this style wasn't actually shared outside the
+ url bar, this name could be improved (bug 1197424). -->
+ <style name="UrlBar.ImageButton.BrowserToolbarColors">
+ <item name="drawableTintList">@color/action_bar_menu_item_colors</item>
+ </style>
+
+ <style name="UrlBar.Button.Container">
+ <item name="android:layout_marginTop">6dp</item>
+ <item name="android:layout_marginBottom">6dp</item>
+ <!-- Start with forward hidden -->
+ <item name="android:orientation">horizontal</item>
+ </style>
+
+ <style name="TabsLayout" parent="TabsLayoutBase">
+ <item name="android:scrollbars">vertical</item>
+ </style>
+
+ <style name="TabsItem">
+ <item name="android:nextFocusDown">@+id/close</item>
+ </style>
+
+ <style name="TabsItemClose">
+ <item name="android:nextFocusUp">@+id/info</item>
+ </style>
+
+ <style name="Toast" parent="ToastBase">
+ <item name="android:layout_width">400dp</item>
+
+ <!-- Same as pre-19 Toast style, but with no left and right margins.
+ They're removed since large tablets are never going to be only 400dp wide. -->
+ </style>
+
+ <style name="Widget.MenuItemActionBar">
+ <item name="android:layout_width">wrap_content</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:background">@drawable/browser_toolbar_action_bar_button</item>
+ <item name="drawableTintList">@color/action_bar_menu_item_colors</item>
+ <item name="android:scaleType">center</item>
+
+ <!-- layout_width/height doesn't work here, likely because it's only
+ added programmatically, so we use padding for the width instead.
+ layout_height is set to MATCH_PARENT programmatically in
+ org.mozilla.gecko.toolbar.BrowserToolbarTabletBase.addActionItem(View) -->
+
+ <item name="android:paddingLeft">@dimen/tablet_browser_toolbar_menu_item_padding_horizontal</item>
+ <item name="android:paddingRight">@dimen/tablet_browser_toolbar_menu_item_padding_horizontal</item>
+ </style>
+
+ <style name="Widget.BookmarksListView" parent="Widget.HomeListView">
+ <item name="android:scrollbarStyle">outsideOverlay</item>
+ </style>
+
+ <style name="Widget.TopSitesGridView" parent="Widget.GridView">
+ <item name="android:paddingLeft">5dp</item>
+ <item name="android:paddingRight">5dp</item>
+ <item name="android:paddingBottom">30dp</item>
+ <item name="android:horizontalSpacing">10dp</item>
+ <item name="android:verticalSpacing">10dp</item>
+ </style>
+
+ <style name="Widget.TopSitesListView" parent="Widget.BookmarksListView">
+ <item name="android:paddingTop">30dp</item>
+ <item name="android:paddingLeft">32dp</item>
+ <item name="android:paddingRight">32dp</item>
+ <item name="android:clipToPadding">false</item>
+ <item name="topDivider">false</item>
+ </style>
+
+ <style name="Widget.HomeBanner">
+ <item name="android:paddingLeft">32dp</item>
+ <item name="android:paddingRight">32dp</item>
+ </style>
+
+ <style name="TextAppearance.UrlBar.Title" parent="TextAppearance.Medium">
+ <item name="android:textSize">16sp</item>
+ </style>
+
+</resources>
diff --git a/mobile/android/base/resources/values-sw240dp/dimens.xml b/mobile/android/base/resources/values-sw240dp/dimens.xml
new file mode 100644
index 000000000..ee2bf0e8d
--- /dev/null
+++ b/mobile/android/base/resources/values-sw240dp/dimens.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+ <dimen name="tab_panel_column_width">143dip</dimen>
+ <dimen name="tab_thumbnail_height">100dip</dimen>
+ <dimen name="tab_thumbnail_width">135dip</dimen>
+</resources>
diff --git a/mobile/android/base/resources/values-sw360dp/dimens.xml b/mobile/android/base/resources/values-sw360dp/dimens.xml
new file mode 100644
index 000000000..da14a185c
--- /dev/null
+++ b/mobile/android/base/resources/values-sw360dp/dimens.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+ <dimen name="tab_panel_column_width">156dip</dimen>
+ <dimen name="tab_thumbnail_height">110dip</dimen>
+ <dimen name="tab_thumbnail_width">148dip</dimen>
+
+ <dimen name="firstrun_background_height">180dp</dimen>
+ <dimen name="firstrun_min_height">180dp</dimen>
+</resources>
diff --git a/mobile/android/base/resources/values-sw400dp/dimens.xml b/mobile/android/base/resources/values-sw400dp/dimens.xml
new file mode 100644
index 000000000..94567a220
--- /dev/null
+++ b/mobile/android/base/resources/values-sw400dp/dimens.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+ <dimen name="tab_panel_column_width">176dip</dimen>
+ <dimen name="tab_thumbnail_height">120dip</dimen>
+ <dimen name="tab_thumbnail_width">168dip</dimen>
+</resources>
diff --git a/mobile/android/base/resources/values-v11/dimens.xml b/mobile/android/base/resources/values-v11/dimens.xml
new file mode 100644
index 000000000..fbcb27bd1
--- /dev/null
+++ b/mobile/android/base/resources/values-v11/dimens.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+ <!-- This is chosen to be close to Android's listPreferredItemHeightSmall.
+ TODO: We should inherit these from the system.
+ http://androidxref.com/4.2.2_r1/xref/frameworks/base/core/res/res/values/themes.xml#1287 -->
+ <dimen name="menu_item_row_height">48dp</dimen>
+
+</resources>
diff --git a/mobile/android/base/resources/values-v11/styles.xml b/mobile/android/base/resources/values-v11/styles.xml
new file mode 100644
index 000000000..1550c18b8
--- /dev/null
+++ b/mobile/android/base/resources/values-v11/styles.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <!--
+ Only overriden styles for Honeycomb/Ice cream sandwich are specified here.
+ Please refer to values/styles.xml for default styles.
+ -->
+
+ <!--
+ Base application styles. This could be overridden in other res/values-XXX/themes.xml.
+ -->
+ <style name="Widget.BaseButton" parent="android:style/Widget.Holo.Light.Button"/>
+
+ <style name="Widget.BaseDropDownItem" parent="android:style/Widget.Holo.Light.DropDownItem"/>
+
+ <style name="Widget.BaseEditText" parent="android:style/Widget.Holo.Light.EditText"/>
+
+ <style name="Widget.BaseListView" parent="android:style/Widget.Holo.ListView"/>
+
+ <style name="Widget.BaseGridView" parent="android:style/Widget.Holo.GridView"/>
+
+ <style name="Widget.BaseTextView" parent="android:style/Widget.Holo.Light.TextView"/>
+
+ <style name="Widget.ProgressBar.Horizontal" parent="android:style/Widget.Holo.ProgressBar.Horizontal"/>
+
+
+ <!--
+ Application styles. All customizations that are not specific
+ to a particular API level can go here.
+ -->
+ <style name="Widget.ListItem">
+ <item name="android:textColor">@color/select_item_multichoice</item>
+ <item name="android:minHeight">?android:attr/listPreferredItemHeight</item>
+ <item name="android:textAppearance">?android:attr/textAppearanceLarge</item>
+ <item name="android:gravity">center_vertical</item>
+ <item name="android:paddingLeft">12dip</item>
+ <item name="android:paddingRight">7dip</item>
+ <item name="android:checkMark">?android:attr/listChoiceIndicatorMultiple</item>
+ <item name="android:ellipsize">marquee</item>
+ </style>
+
+ <!-- ActionBar -->
+ <style name="ActionBar" parent="android:style/Widget.Holo.ActionBar" />
+
+ <!-- TabsLayout ActionBar -->
+ <style name="ActionBar.TabsLayout">
+ <item name="android:visibility">gone</item>
+ </style>
+
+ <!-- DropDown List View -->
+ <style name="DropDownListView" parent="@android:style/Widget.Holo.ListView.DropDown">
+ <item name="android:listSelector">@drawable/action_bar_button</item>
+ <item name="android:divider">@color/toolbar_divider_grey</item>
+ <item name="android:dividerHeight">@dimen/page_row_divider_height</item>
+ </style>
+
+ <!-- Spinner DropDown Item -->
+ <style name="Widget.DropDownItem.Spinner" parent="@android:style/Widget.Holo.Light.DropDownItem.Spinner">
+ <item name="android:textColor">#FF000000</item>
+ </style>
+
+ <style name="Widget.Spinner" parent="android:style/Widget.Holo.Light.Spinner">
+ <item name="android:minWidth">@dimen/doorhanger_input_width</item>
+ </style>
+
+ <style name="Widget.TextView.SpinnerItem" parent="android:style/Widget.Holo.Light.TextView.SpinnerItem">
+ <item name="android:textColor">#FF000000</item>
+ </style>
+
+ <style name="TextAppearance.Widget.ActionBar.Title" parent="@android:style/TextAppearance.Medium"/>
+
+ <style name="GeckoActionBar.Title" parent="TextAppearance.Widget.ActionBar.Title">
+ <item name="android:drawableLeft">@drawable/ab_done</item>
+ <item name="android:background">@android:color/transparent</item>
+ <item name="android:paddingLeft">15dp</item>
+ <item name="android:paddingRight">15dp</item>
+ <!-- gravity and minWidth are added here to more resemble our values/styles.xml
+ counterpart. This is solely to correct bug 1233709 -->
+ <item name="android:gravity">center_vertical</item>
+ <item name="android:minWidth">0dp</item>
+ </style>
+
+ <style name="GeckoActionBar.Button" parent="android:style/Widget.Holo.Light.ActionButton">
+ <item name="android:padding">8dip</item>
+ <!-- The default implementation doesn't do any image scaling. Our custom menus mean we can't just use the same image
+ in both menus and the actionbar without doing some scaling though. -->
+ <item name="android:scaleType">centerInside</item>
+ </style>
+
+ <style name="GeckoActionBar.Button.MenuButton" parent="android:style/Widget.Holo.Light.ActionButton.Overflow">
+ <item name="android:scaleType">centerInside</item>
+ <item name="android:background">@android:color/transparent</item>
+ <item name="android:src">@drawable/menu</item>
+ <item name="android:tint">@color/toolbar_icon_grey</item>
+ <item name="android:layout_marginTop">16dp</item>
+ <item name="android:layout_marginBottom">16dp</item>
+ </style>
+
+ <style name="TabInput"></style>
+
+ <style name="TabInput.TabWidget" parent="android:style/Widget.Holo.Light.TabWidget"/>
+
+ <style name="TabInput.Tab" parent="android:style/Widget.Holo.Light.Tab">
+ <item name="android:minHeight">@dimen/menu_item_row_height</item>
+ <item name="android:textAllCaps">true</item>
+ </style>
+
+</resources>
diff --git a/mobile/android/base/resources/values-v11/themes.xml b/mobile/android/base/resources/values-v11/themes.xml
new file mode 100644
index 000000000..af8145226
--- /dev/null
+++ b/mobile/android/base/resources/values-v11/themes.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <!--
+ Base application theme. This could be overridden by GeckoBaseTheme
+ in other res/values-XXX/themes.xml.
+ -->
+ <style name="GeckoBase" parent="Theme.AppCompat.Light.DarkActionBar">
+ <item name="android:windowContentOverlay">@null</item>
+ <item name="windowActionBar">false</item>
+ <item name="windowNoTitle">true</item>
+ </style>
+
+ <style name="GeckoDialogBase" parent="@android:style/Theme.Holo.Light.Dialog">
+ <item name="android:windowContentOverlay">@null</item>
+ <item name="android:windowActionBar">false</item>
+ <item name="android:windowNoTitle">true</item>
+ <item name="android:windowBackground">@android:color/transparent</item>
+ </style>
+
+ <style name="GeckoTitleDialogBase" parent="@android:style/Theme.Holo.Light.Dialog" />
+
+ <!--
+ Activity based themes for API 11+. This theme completely replaces
+ GeckoAppBase from res/values/themes.xml on API 11+ devices.
+ -->
+ <style name="GeckoAppBase" parent="Gecko">
+ <item name="android:actionButtonStyle">@style/GeckoActionBar.Button</item>
+ <item name="android:actionModeCopyDrawable">@drawable/ab_copy</item>
+ <item name="android:actionModeCutDrawable">@drawable/ab_cut</item>
+ <item name="android:actionModePasteDrawable">@drawable/ab_paste</item>
+ <item name="android:listViewStyle">@style/Widget.ListView</item>
+ <item name="android:spinnerDropDownItemStyle">@style/Widget.DropDownItem.Spinner</item>
+ <item name="android:spinnerItemStyle">@style/Widget.TextView.SpinnerItem</item>
+ <item name="menuItemSwitcherLayoutStyle">@style/Widget.MenuItemSwitcherLayout</item>
+ <item name="menuItemDefaultStyle">@style/Widget.MenuItemDefault</item>
+ <item name="menuItemSecondaryActionBarStyle">@style/Widget.MenuItemSecondaryActionBar</item>
+ <item name="tabGridLayoutViewStyle">@style/Widget.TabsGridLayout</item>
+ </style>
+
+</resources>
diff --git a/mobile/android/base/resources/values-v13/search_styles.xml b/mobile/android/base/resources/values-v13/search_styles.xml
new file mode 100644
index 000000000..f493891e8
--- /dev/null
+++ b/mobile/android/base/resources/values-v13/search_styles.xml
@@ -0,0 +1,20 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+ <!-- Base application theme. -->
+ <style name="AppTheme" parent="@android:style/Theme.Holo.Light.NoActionBar">
+ <item name="android:windowBackground">@color/toolbar_grey</item>
+ <item name="android:colorBackground">@color/toolbar_grey</item>
+
+ <!--This attribute is required so that we can create a facet button-->
+ <!--pragmatically. The defStyle param used in the View constructor-->
+ <!--must be an attr, see: https://code.google.com/p/android/issues/detail?id=12683-->
+ <item name="facetButtonStyle">@style/FacetButtonStyle</item>
+ </style>
+
+ <style name="SettingsTheme" parent="@android:style/Theme.Holo.Light"/>
+
+</resources>
diff --git a/mobile/android/base/resources/values-v13/styles.xml b/mobile/android/base/resources/values-v13/styles.xml
new file mode 100644
index 000000000..307f57180
--- /dev/null
+++ b/mobile/android/base/resources/values-v13/styles.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <style name="GeckoDialogTitle">
+ <!-- Override this to use a Holo theme on v13+ -->
+ <item name="android:textAppearance">@android:style/TextAppearance.Holo.DialogWindowTitle</item>
+ </style>
+
+ <style name="TextAppearance.Widget.ActionBar.Title" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title"/>
+
+</resources>
diff --git a/mobile/android/base/resources/values-v14/themes.xml b/mobile/android/base/resources/values-v14/themes.xml
new file mode 100644
index 000000000..a04cf54d8
--- /dev/null
+++ b/mobile/android/base/resources/values-v14/themes.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <!--
+ Activity based themes for API 14+. This theme completely replaces
+ GeckoAppBase from res/values/themes.xml on API 14+ devices.
+ -->
+ <style name="GeckoAppBase" parent="Gecko">
+ <item name="android:actionButtonStyle">@style/GeckoActionBar.Button</item>
+ <item name="android:actionModeCopyDrawable">@drawable/ab_copy</item>
+ <item name="android:actionModeCutDrawable">@drawable/ab_cut</item>
+ <item name="android:actionModePasteDrawable">@drawable/ab_paste</item>
+ <item name="android:actionModeSelectAllDrawable">@drawable/ab_select_all</item>
+ <item name="android:actionModeStyle">@style/GeckoActionBar</item>
+ <item name="android:listViewStyle">@style/Widget.ListView</item>
+ <item name="android:spinnerDropDownItemStyle">@style/Widget.DropDownItem.Spinner</item>
+ <item name="android:spinnerItemStyle">@style/Widget.TextView.SpinnerItem</item>
+ <item name="menuItemSwitcherLayoutStyle">@style/Widget.MenuItemSwitcherLayout</item>
+ <item name="menuItemDefaultStyle">@style/Widget.MenuItemDefault</item>
+ <item name="menuItemSecondaryActionBarStyle">@style/Widget.MenuItemSecondaryActionBar</item>
+ </style>
+
+</resources>
diff --git a/mobile/android/base/resources/values-v16/search_styles.xml b/mobile/android/base/resources/values-v16/search_styles.xml
new file mode 100644
index 000000000..3da95f06a
--- /dev/null
+++ b/mobile/android/base/resources/values-v16/search_styles.xml
@@ -0,0 +1,19 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+ <style name="TextAppearance.EmptyView.Title" parent="@android:style/TextAppearance.Small">
+ <item name="android:textColor">@color/text_and_tabs_tray_grey</item>
+ <item name="android:textSize">20sp</item>
+ <item name="android:fontFamily">sans-serif-light</item>
+ </style>
+
+ <style name="TextAppearance.EmptyView.Message" parent="@android:style/TextAppearance.Small">
+ <item name="android:textColor">@color/placeholder_grey</item>
+ <item name="android:textSize">16sp</item>
+ <item name="android:lineSpacingExtra">4sp</item>
+ </style>
+
+</resources>
diff --git a/mobile/android/base/resources/values-v16/styles.xml b/mobile/android/base/resources/values-v16/styles.xml
new file mode 100644
index 000000000..15243891e
--- /dev/null
+++ b/mobile/android/base/resources/values-v16/styles.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <style name="TextAppearance.EmptyMessage" parent="TextAppearance.Large">
+ <item name="android:fontFamily">sans-serif-light</item>
+ </style>
+
+ <style name="TextAppearance.Widget.Home.ItemTitle" parent="TextAppearance.Medium">
+ <item name="android:fontFamily">sans-serif-light</item>
+ </style>
+
+ <style name="TextAppearance.FirstrunTextLight">
+ <item name="android:fontFamily">sans-serif-light</item>
+ </style>
+
+ <style name="TextAppearance.FirstrunTextRegular">
+ <item name="android:fontFamily">sans-serif</item>
+ </style>
+
+ <style name="TextAppearance.UrlBar.Title" parent="TextAppearance.Small">
+ <item name="android:textSize">15sp</item>
+ <item name="android:fontFamily">sans-serif-light</item>
+ </style>
+
+</resources>
diff --git a/mobile/android/base/resources/values-v19/dimens.xml b/mobile/android/base/resources/values-v19/dimens.xml
new file mode 100644
index 000000000..e2c964d82
--- /dev/null
+++ b/mobile/android/base/resources/values-v19/dimens.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+ <dimen name="toast_button_corner_radius">24dp</dimen>
+</resources>
diff --git a/mobile/android/base/resources/values-v19/styles.xml b/mobile/android/base/resources/values-v19/styles.xml
new file mode 100644
index 000000000..6114c8229
--- /dev/null
+++ b/mobile/android/base/resources/values-v19/styles.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <style name="Toast" parent="ToastBase">
+ <item name="android:layout_marginLeft">8dp</item>
+ <item name="android:layout_marginRight">8dp</item>
+ </style>
+
+ <style name="ToastElementBase">
+ <item name="android:background">@null</item>
+ <item name="android:paddingLeft">24dp</item>
+ <item name="android:paddingRight">24dp</item>
+ <item name="android:paddingTop">11dp</item>
+ <item name="android:paddingBottom">11dp</item>
+ </style>
+
+ <style name="ToastDivider" parent="ToastDividerBase">
+ <item name="android:layout_marginTop">12dp</item>
+ <item name="android:layout_marginBottom">12dp</item>
+ </style>
+
+ <style name="ToastMessage" parent="ToastMessageBase">
+ <item name="android:textSize">16sp</item>
+ <item name="android:fontFamily">sans-serif-condensed</item>
+ <item name="android:shadowColor">#BB000000</item>
+ <item name="android:shadowRadius">2.75</item>
+ </style>
+
+ <style name="ToastButton" parent="ToastButtonBase">
+ <item name="android:textSize">12sp</item>
+ <item name="android:textStyle">bold</item>
+ <item name="android:fontFamily">sans-serif-condensed</item>
+ <item name="android:shadowColor">#BB000000</item>
+ <item name="android:shadowRadius">2.75</item>
+ </style>
+
+</resources>
diff --git a/mobile/android/base/resources/values-v21/dimens.xml b/mobile/android/base/resources/values-v21/dimens.xml
new file mode 100644
index 000000000..dbf33ea28
--- /dev/null
+++ b/mobile/android/base/resources/values-v21/dimens.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+ <dimen name="context_menu_item_horizontal_padding">17dp</dimen>
+</resources>
diff --git a/mobile/android/base/resources/values-v21/integers.xml b/mobile/android/base/resources/values-v21/integers.xml
new file mode 100644
index 000000000..76fd5f483
--- /dev/null
+++ b/mobile/android/base/resources/values-v21/integers.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+ <integer name="search_assist_launch_res">@drawable/search_launcher</integer>
+
+</resources>
diff --git a/mobile/android/base/resources/values-v21/styles.xml b/mobile/android/base/resources/values-v21/styles.xml
new file mode 100644
index 000000000..5449c2334
--- /dev/null
+++ b/mobile/android/base/resources/values-v21/styles.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+ <style name="ActionBarTitleTextStyle" parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title">
+ <item name="android:textColor">#fff</item>
+ </style>
+
+</resources>
diff --git a/mobile/android/base/resources/values-v21/themes.xml b/mobile/android/base/resources/values-v21/themes.xml
new file mode 100644
index 000000000..ddb08d052
--- /dev/null
+++ b/mobile/android/base/resources/values-v21/themes.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+ <!--
+ Base application theme.
+ -->
+ <style name="GeckoBase" parent="Theme.AppCompat.Light.DarkActionBar">
+ <item name="colorPrimary">@color/text_and_tabs_tray_grey</item>
+ <item name="colorPrimaryDark">@color/text_and_tabs_tray_grey</item>
+ <item name="windowActionBar">false</item>
+ <item name="windowNoTitle">true</item>
+ <item name="android:windowContentOverlay">@null</item>
+ <item name="android:alertDialogTheme">@style/GeckoAlertDialog</item>
+ </style>
+
+ <style name="GeckoAlertDialog" parent="@android:style/Theme.Material.Light.Dialog.Alert">
+ <item name="android:colorAccent">@color/fennec_ui_orange</item>
+ </style>
+
+ <style name="ActionBar.FxAccountStatusActivity" parent="@android:style/Widget.Material.ActionBar.Solid">
+ <item name="android:displayOptions">homeAsUp|showTitle</item>
+ <item name="android:titleTextStyle">@style/ActionBarTitleTextStyle</item>
+ </style>
+
+ <style name="GeckoAppBase" parent="Gecko">
+ <item name="android:actionButtonStyle">@style/GeckoActionBar.Button</item>
+ <item name="android:listViewStyle">@style/Widget.ListView</item>
+ <item name="android:spinnerDropDownItemStyle">@style/Widget.DropDownItem.Spinner</item>
+ <item name="android:spinnerItemStyle">@style/Widget.TextView.SpinnerItem</item>
+ <item name="menuItemSwitcherLayoutStyle">@style/Widget.MenuItemSwitcherLayout</item>
+ <item name="menuItemDefaultStyle">@style/Widget.MenuItemDefault</item>
+ <item name="menuItemSecondaryActionBarStyle">@style/Widget.MenuItemSecondaryActionBar</item>
+ <item name="tabGridLayoutViewStyle">@style/Widget.TabsGridLayout</item>
+ </style>
+
+</resources>
diff --git a/mobile/android/base/resources/values-w400dp/styles.xml b/mobile/android/base/resources/values-w400dp/styles.xml
new file mode 100644
index 000000000..5308af9ca
--- /dev/null
+++ b/mobile/android/base/resources/values-w400dp/styles.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+ <style name="Toast" parent="ToastBase">
+ <item name="android:layout_width">400dp</item>
+ </style>
+
+</resources>
diff --git a/mobile/android/base/resources/values-xlarge-land-v11/dimens.xml b/mobile/android/base/resources/values-xlarge-land-v11/dimens.xml
new file mode 100644
index 000000000..ca605a31b
--- /dev/null
+++ b/mobile/android/base/resources/values-xlarge-land-v11/dimens.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+ <dimen name="tab_panel_grid_padding">64dp</dimen>
+
+</resources>
diff --git a/mobile/android/base/resources/values-xlarge-land-v11/styles.xml b/mobile/android/base/resources/values-xlarge-land-v11/styles.xml
new file mode 100644
index 000000000..1b8666f29
--- /dev/null
+++ b/mobile/android/base/resources/values-xlarge-land-v11/styles.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+ <style name="Widget.TopSitesListView" parent="Widget.BookmarksListView">
+ <item name="android:paddingTop">30dp</item>
+ <item name="android:paddingLeft">120dp</item>
+ <item name="android:paddingRight">120dp</item>
+ <item name="android:clipToPadding">false</item>
+ <item name="topDivider">false</item>
+ </style>
+
+ <style name="Widget.TopSitesGridView" parent="Widget.GridView">
+ <item name="android:paddingLeft">55dp</item>
+ <item name="android:paddingRight">55dp</item>
+ <item name="android:paddingBottom">30dp</item>
+ <item name="android:horizontalSpacing">56dp</item>
+ <item name="android:verticalSpacing">20dp</item>
+ </style>
+
+</resources>
diff --git a/mobile/android/base/resources/values-xlarge-v11/dimens.xml b/mobile/android/base/resources/values-xlarge-v11/dimens.xml
new file mode 100644
index 000000000..a666854f1
--- /dev/null
+++ b/mobile/android/base/resources/values-xlarge-v11/dimens.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+ <dimen name="panel_grid_view_column_width">250dp</dimen>
+ <dimen name="tab_panel_grid_padding">48dp</dimen>
+
+</resources>
diff --git a/mobile/android/base/resources/values-xlarge-v11/integers.xml b/mobile/android/base/resources/values-xlarge-v11/integers.xml
new file mode 100644
index 000000000..55e1babea
--- /dev/null
+++ b/mobile/android/base/resources/values-xlarge-v11/integers.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+ <integer name="number_of_top_sites">9</integer>
+ <integer name="number_of_top_sites_cols">3</integer>
+ <integer name="panel_icon_grid_view_columns">6</integer>
+ <integer name="number_of_inline_share_devices">4</integer>
+
+</resources>
diff --git a/mobile/android/base/resources/values-xlarge-v11/styles.xml b/mobile/android/base/resources/values-xlarge-v11/styles.xml
new file mode 100644
index 000000000..d0bcbae31
--- /dev/null
+++ b/mobile/android/base/resources/values-xlarge-v11/styles.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+ <!--
+ Only overriden styles for Honeycomb/Ice cream sandwich XLARGE tablets are specified here.
+ Please refer to values/styles.xml for default styles.
+ -->
+
+ <!-- TabWidget -->
+ <style name="TabWidget">
+ <item name="android:layout_width">300dip</item>
+ <item name="android:layout_height">48dip</item>
+ </style>
+
+ <style name="Widget.TopSitesListView" parent="Widget.BookmarksListView">
+ <item name="android:paddingTop">30dp</item>
+ <item name="android:paddingLeft">32dp</item>
+ <item name="android:paddingRight">32dp</item>
+ <item name="android:clipToPadding">false</item>
+ <item name="topDivider">false</item>
+ </style>
+
+</resources>
diff --git a/mobile/android/base/resources/values/arrays.xml b/mobile/android/base/resources/values/arrays.xml
new file mode 100644
index 000000000..d220ca9bb
--- /dev/null
+++ b/mobile/android/base/resources/values/arrays.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+
+<resources>
+ <string-array name="pref_home_updates_entries">
+ <item>@string/pref_home_updates_enabled</item>
+ <item>@string/pref_home_updates_wifi</item>
+ </string-array>
+ <string-array name="pref_home_updates_values">
+ <item>0</item>
+ <item>1</item>
+ </string-array>
+ <string-array name="pref_plugins_entries">
+ <item>@string/pref_plugins_enabled</item>
+ <item>@string/pref_plugins_tap_to_play</item>
+ <item>@string/pref_plugins_disabled</item>
+ </string-array>
+ <string-array name="pref_plugins_values">
+ <item>1</item>
+ <item>2</item>
+ <item>0</item>
+ </string-array>
+ <string-array name="pref_font_size_entries">
+ <item>@string/pref_font_size_tiny</item>
+ <item>@string/pref_font_size_small</item>
+ <item>@string/pref_font_size_medium</item>
+ <item>@string/pref_font_size_large</item>
+ <item>@string/pref_font_size_xlarge</item>
+ </string-array>
+ <string-array name="pref_font_size_values">
+ <item>0</item>
+ <item>80</item>
+ <item>120</item>
+ <item>160</item>
+ <item>240</item>
+ </string-array>
+ <string-array name="pref_char_encoding_entries">
+ <item>@string/pref_char_encoding_on</item>
+ <item>@string/pref_char_encoding_off</item>
+ </string-array>
+ <string-array name="pref_char_encoding_values">
+ <item>true</item>
+ <item>false</item>
+ </string-array>
+ <string-array name="pref_cookies_entries">
+ <item>@string/pref_cookies_accept_all</item>
+ <item>@string/pref_cookies_not_accept_foreign</item>
+ <item>@string/pref_cookies_disabled</item>
+ </string-array>
+ <string-array name="pref_tracking_protection_values">
+ <item>2</item>
+ <item>1</item>
+ <item>0</item>
+ </string-array>
+ <string-array name="pref_tracking_protection_entries">
+ <item>@string/pref_tracking_protection_enabled</item>
+ <item>@string/pref_tracking_protection_enabled_pb</item>
+ <item>@string/pref_tracking_protection_disabled</item>
+ </string-array>
+ <string-array name="pref_cookies_values">
+ <item>0</item>
+ <item>1</item>
+ <item>2</item>
+ </string-array>
+ <string-array name="pref_import_android_entries">
+ <item>@string/bookmarks_title</item>
+ <item>@string/history_title</item>
+ </string-array>
+ <string-array name="pref_import_android_defaults">
+ <item>true</item>
+ <item>true</item>
+ </string-array>
+ <string-array name="pref_import_android_values">
+ <item>android_import.data.bookmarks</item>
+ <item>android_import.data.history</item>
+ </string-array>
+ <string-array name="pref_private_data_entries">
+ <item>@string/pref_private_data_history2</item>
+ <item>@string/pref_private_data_searchHistory</item>
+ <item>@string/pref_private_data_downloadFiles2</item>
+ <item>@string/pref_private_data_formdata2</item>
+ <item>@string/pref_private_data_cookies2</item>
+ <item>@string/pref_private_data_cache</item>
+ <item>@string/pref_private_data_offlineApps</item>
+ <item>@string/pref_private_data_siteSettings</item>
+ <item>@string/pref_private_data_syncedTabs</item>
+ <item>@string/pref_private_data_passwords</item>
+ </string-array>
+ <string-array name="pref_private_data_defaults">
+ <item>true</item>
+ <item>true</item>
+ <item>true</item>
+ <item>true</item>
+ <item>true</item>
+ <item>true</item>
+ <item>true</item>
+ <item>true</item>
+ <item>true</item>
+ <item>false</item>
+ </string-array>
+ <string-array name="pref_private_data_values">
+ <item>private.data.history</item>
+ <item>private.data.searchHistory</item>
+ <item>private.data.downloadFiles</item>
+ <item>private.data.formdata</item>
+ <item>private.data.cookies_sessions</item>
+ <item>private.data.cache</item>
+ <item>private.data.offlineApps</item>
+ <item>private.data.siteSettings</item>
+ <item>private.data.syncedTabs</item>
+ <item>private.data.passwords</item>
+ </string-array>
+ <string-array name="pref_private_data_keys">
+ <item>private.data.history</item>
+ <item>private.data.searchHistory</item>
+ <item>private.data.downloadFiles</item>
+ <item>private.data.formdata</item>
+ <item>private.data.cookies_sessions</item>
+ <item>private.data.cache</item>
+ <item>private.data.offlineApps</item>
+ <item>private.data.siteSettings</item>
+ <item>private.data.syncedTabs</item>
+ <item>private.data.passwords</item>
+ </string-array>
+ <string-array name="pref_clear_on_exit_defaults">
+ <item>false</item>
+ <item>false</item>
+ <item>false</item>
+ <item>false</item>
+ <item>false</item>
+ <item>false</item>
+ <item>false</item>
+ <item>false</item>
+ <item>false</item>
+ <item>false</item>
+ </string-array>
+ <string-array name="pref_restore_entries">
+ <item>@string/pref_restore_always</item>
+ <item>@string/pref_restore_quit</item>
+ </string-array>
+ <string-array name="pref_restore_values">
+ <item>always</item>
+ <item>quit</item>
+ </string-array>
+ <string-array name="pref_update_autodownload_entries">
+ <item>@string/pref_update_autodownload_enabled</item>
+ <item>@string/pref_update_autodownload_wifi</item>
+ <item>@string/pref_update_autodownload_disabled</item>
+ </string-array>
+ <string-array name="pref_update_autodownload_values">
+ <item>enabled</item>
+ <item>wifi</item>
+ <item>disabled</item>
+ </string-array>
+ <!-- This value is similar to config_longPressVibePattern in android frameworks/base/core/res/res/values/config.xml-->
+ <integer-array name="long_press_vibrate_msec">
+ <item>0</item>
+ <item>1</item>
+ <item>20</item>
+ <item>21</item>
+ </integer-array>
+ <!-- browser.image_blocking -->
+ <string-array name="pref_browser_image_blocking_entries">
+ <item>@string/pref_tap_to_load_images_enabled</item>
+ <item>@string/pref_tap_to_load_images_data</item>
+ <item>@string/pref_tap_to_load_images_disabled2</item>
+ </string-array>
+ <string-array name="pref_browser_image_blocking_values">
+ <item>1</item> <!-- Always -->
+ <item>2</item> <!-- Wifi-only -->
+ <item>0</item> <!-- Blocked -->
+ </string-array>
+</resources>
diff --git a/mobile/android/base/resources/values/attrs.xml b/mobile/android/base/resources/values/attrs.xml
new file mode 100644
index 000000000..0a75f9884
--- /dev/null
+++ b/mobile/android/base/resources/values/attrs.xml
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+ <!-- Theme level attributes -->
+ <declare-styleable name="GeckoTheme">
+
+ <!-- Style for GeckoMenu ListView -->
+ <attr name="geckoMenuListViewStyle" format="reference"/>
+
+ <!-- Style for MenuItemActionBar -->
+ <attr name="menuItemActionBarStyle" format="reference"/>
+
+ <!-- Style for MenuItemActionBar -->
+ <attr name="menuItemActionModeStyle" format="reference"/>
+
+ <!-- Style for MenuItemSwitcherLayout -->
+ <attr name="menuItemSwitcherLayoutStyle" format="reference"/>
+
+ <!-- Style for MenuItemDefault -->
+ <attr name="menuItemDefaultStyle" format="reference"/>
+
+ <!-- Style for MenuItemActionBar when shown in SecondaryActionBar -->
+ <attr name="menuItemSecondaryActionBarStyle" format="reference"/>
+
+ <!-- Default style for the BookmarksListView -->
+ <attr name="bookmarksListViewStyle" format="reference" />
+
+ <!-- Default style for the TopSitesGridItemView -->
+ <attr name="topSitesGridItemViewStyle" format="reference" />
+
+ <!-- Styles for dynamic panel grid views -->
+ <attr name="panelIconViewStyle" format="reference" />
+
+ <!-- Style for the TabsGridLayout -->
+ <attr name="tabGridLayoutViewStyle" format="reference" />
+
+ <!-- Default style for the TopSitesGridView -->
+ <attr name="topSitesGridViewStyle" format="reference" />
+
+ <!-- Default style for the TopSitesThumbnailView -->
+ <attr name="topSitesThumbnailViewStyle" format="reference" />
+
+ <!-- Default style for the HomeListView -->
+ <attr name="homeListViewStyle" format="reference" />
+
+ </declare-styleable>
+
+ <declare-styleable name="MenuItem">
+ <attr name="android:id"/>
+ <attr name="android:orderInCategory"/>
+ <attr name="android:title"/>
+ <attr name="android:icon"/>
+ <attr name="android:checkable"/>
+ <attr name="android:checked"/>
+ <attr name="android:visible"/>
+ <attr name="android:enabled"/>
+ <attr name="android:showAsAction"/>
+ </declare-styleable>
+
+ <declare-styleable name="MenuItemDefault">
+ <attr name="state_more" format="boolean"/>
+ </declare-styleable>
+
+ <declare-styleable name="TabThumbnailWrapper">
+ <attr name="state_recording" format="boolean"/>
+ </declare-styleable>
+
+ <declare-styleable name="FlowLayout">
+ <attr name="spacing" format="dimension"/>
+ </declare-styleable>
+
+ <declare-styleable name="MultiChoicePreference">
+ <attr name="entries" format="string"/>
+ <attr name="entryValues" format="string"/>
+ <attr name="initialValues" format="string"/>
+ </declare-styleable>
+
+ <declare-styleable name="MultiPrefMultiChoicePreference">
+ <attr name="entryKeys" format="string"/>
+ </declare-styleable>
+
+ <declare-styleable name="TabsLayout">
+ <attr name="tabs">
+ <flag name="tabs_normal" value="0x00" />
+ <flag name="tabs_private" value ="0x01" />
+ </attr>
+ </declare-styleable>
+
+ <declare-styleable name="TabCounter">
+ <attr name="android:layout"/>
+ </declare-styleable>
+
+ <declare-styleable name="PrivateBrowsing">
+ <attr name="state_private" format="boolean"/>
+ </declare-styleable>
+
+ <declare-styleable name="LightweightTheme">
+ <attr name="state_light" format="boolean"/>
+ <attr name="state_dark" format="boolean"/>
+ <attr name="autoUpdateTheme" format="boolean"/>
+ </declare-styleable>
+
+ <declare-styleable name="TwoWayView">
+ <attr name="android:orientation"/>
+ <attr name="android:choiceMode"/>
+ <attr name="android:listSelector"/>
+ <attr name="android:drawSelectorOnTop"/>
+ </declare-styleable>
+
+ <declare-styleable name="HomeListView">
+ <!-- Draws a divider on top of the list, if true. Defaults to false. -->
+ <attr name="topDivider" format="boolean"/>
+ </declare-styleable>
+
+ <declare-styleable name="FadedTextView">
+ <attr name="fadeWidth" format="dimension"/>
+ </declare-styleable>
+
+ <declare-styleable name="FadedMultiColorTextView">
+ <!-- The background color we should be fading over. Useful because the
+ background is full alpha and we need to copy the background underneath. -->
+ <attr name="fadeBackgroundColor" format="dimension"/>
+ </declare-styleable>
+
+ <declare-styleable name="IconTabWidget">
+ <attr name="android:layout"/>
+
+ <!-- Sets the tab's content type. Defaults to icon. -->
+ <attr name="display">
+ <enum name="icon" value="0x00" />
+ <enum name="text" value="0x01" />
+ </attr>
+ </declare-styleable>
+
+ <declare-styleable name="TopSitesGridView">
+ <attr name="android:horizontalSpacing"/>
+ <attr name="android:verticalSpacing"/>
+ </declare-styleable>
+
+ <declare-styleable name="TabMenuStrip">
+ <attr name="strip" format="reference"/>
+ <attr name="tabsMarginLeft" format="dimension" />
+ <attr name="activeTextColor" format="color" />
+ <attr name="inactiveTextColor" format="color" />
+ <attr name="titlebarFill" format="boolean" />
+ </declare-styleable>
+
+ <declare-styleable name="CustomColorPreference">
+ <attr name="titleColor" format="color" />
+ <attr name="summaryColor" format="color" />
+ </declare-styleable>
+
+ <declare-styleable name="TabPanelBackButton">
+ <attr name="rightDivider" format="reference"/>
+ <attr name="dividerVerticalPadding" format="dimension"/>
+ </declare-styleable>
+
+ <declare-styleable name="EllipsisTextView">
+ <attr name="ellipsizeAtLine" format="integer"/>
+ </declare-styleable>
+
+ <declare-styleable name="FaviconView">
+ <attr name="dominantBorderEnabled" format="boolean" />
+ <attr name="overrideScaleType" format="boolean" />
+ <attr name="enableRoundCorners" format="boolean"/>
+ </declare-styleable>
+
+ <declare-styleable name="OverlayDialogButton">
+ <attr name="drawable" format="reference" />
+ <attr name="enabledText" format="string" />
+ <attr name="disabledText" format="string" />
+ </declare-styleable>
+
+ <declare-styleable name="ThemedView">
+ <!-- A reimplementation of android:tintList which is
+ otherwise only available on API 21+.
+
+ Using this attribute is mutually exclusive with android:tint
+ and setting colorFilters in code. This is because on pre-Lollipop,
+ android:tint and DrawableCompat.tint* uses colorFilters under the hood. -->
+ <attr name="drawableTintList" format="color" />
+ </declare-styleable>
+
+</resources>
+
diff --git a/mobile/android/base/resources/values/bool.xml b/mobile/android/base/resources/values/bool.xml
new file mode 100644
index 000000000..6ef7090c6
--- /dev/null
+++ b/mobile/android/base/resources/values/bool.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ This Source Code Form is subject to the terms of the Mozilla Public
+ ~ License, v. 2.0. If a copy of the MPL was not distributed with this
+ ~ file, you can obtain one at http://mozilla.org/MPL/2.0/.
+ -->
+
+<resources>
+ <!-- Some devices use resources based on configuration (e.g. large, xlarge) that are inconsistent
+ with the configuration retrieved by HardwareUtils (e.g. some custom ROMs allow the user to
+ choose a phone or tablet version of the UI even though the hardware stays the same). This
+ can cause crashes when we branch on the value returned by HardwareUtils.
+
+ In order to work around this, we define the resource size in resources with the expectation that
+ we branch on that value, rather than HardwareUtils, so our code is consistent with the used resources.
+ See bug 1277379 for a initiative to move all of the HardwareUtils code over. -->
+ <bool name="is_large_resource">false</bool>
+</resources>
diff --git a/mobile/android/base/resources/values/colors.xml b/mobile/android/base/resources/values/colors.xml
new file mode 100644
index 000000000..318ad5026
--- /dev/null
+++ b/mobile/android/base/resources/values/colors.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+ <!-- Fennec color palette (bug 1127517) -->
+ <color name="fennec_ui_orange">#FF9500</color>
+ <color name="affirmative_green">#6FBE4A</color>
+ <color name="rejection_red">#D23228</color>
+ <color name="action_orange">#E66000</color>
+ <color name="action_orange_pressed">#DC5600</color>
+ <color name="link_blue">#0096DD</color>
+ <color name="link_blue_pressed">#0082C6</color>
+ <color name="private_browsing_purple">#CF68FF</color>
+
+ <color name="placeholder_active_grey">#222222</color>
+ <color name="placeholder_grey">#777777</color>
+ <color name="private_toolbar_grey">#292C29</color>
+ <color name="text_and_tabs_tray_grey">#363B40</color>
+ <color name="tabs_tray_grey_pressed">#45494E</color>
+ <color name="toolbar_icon_grey">#5F6368</color>
+
+ <color name="tabs_tray_icon_grey">#AFB1B3</color>
+ <color name="disabled_grey">#BFBFBF</color>
+ <color name="toolbar_grey_pressed">#D7D7DC</color>
+ <color name="toolbar_menu_dark_grey">#E1E1E6</color>
+ <color name="toolbar_grey">#EBEBF0</color>
+ <color name="about_page_header_grey">#F5F5F5</color>
+
+ <color name="url_bar_shadow_private">#7878A5</color>
+
+ <!-- Restricted profiles palette -->
+
+ <color name="restricted_profile_background_gold">#ffffcb51</color>
+ <color name="restricted_profile_background_green">#1aaa86</color>
+
+ <!-- Non-palette colors -->
+
+ <!-- Synced w/ toolbar_grey -->
+ <color name="background_normal_lwt">#DDEBEBF0</color>
+
+ <color name="highlight">#33000000</color>
+ <color name="highlight_focused">#1A000000</color>
+ <color name="highlight_dark">#33FFFFFF</color>
+ <color name="highlight_dark_focused">#1AFFFFFF</color>
+
+ <!-- Synced w/ toolbar_grey_pressed -->
+ <color name="tablet_highlight_lwt">#AAD7D7DC</color>
+
+ <!-- Synced w/ tabs_tray_grey_pressed -->
+ <color name="tablet_highlight_dark_lwt">#AA45494E</color>
+
+ <!-- (bug 1077195) Focused state values are temporary. -->
+ <color name="tablet_highlight_focused">#C0C9D0</color>
+
+ <!-- highlight on shaped button: 20% white over text_and_tabs_tray_grey -->
+ <color name="highlight_shaped">#FF696D71</color>
+
+ <!-- highlight-focused on shaped button: 10% white over text_and_tabs_tray_grey -->
+ <color name="highlight_shaped_focused">#FF565B60</color>
+
+ <!-- highlight on private nav button: 20% white over private_toolbar_grey -->
+ <color name="highlight_nav_pb">#FF545654</color>
+
+ <color name="dark_transparent_overlay">#99000000</color>
+
+ <!-- Firstrun tour -->
+ <color name="firstrun_pager_header">#E8E8E8</color>
+
+ <!-- Tab Queue -->
+ <color name="tab_queue_dismiss_button_foreground">#16A3DF</color>
+ <color name="tab_queue_dismiss_button_foreground_pressed">#1193CB</color>
+
+ <!--
+ Application theme colors
+ -->
+ <!-- Default colors -->
+ <color name="text_color_tertiary">#9198A1</color>
+
+ <!-- Default inverse colors -->
+ <color name="text_color_secondary_inverse">#DDDDDD</color>
+
+ <!-- Disabled colors -->
+ <color name="text_color_primary_disable_only">#999999</color>
+
+ <!-- Hint colors -->
+ <color name="text_color_hint">#666666</color>
+ <color name="text_color_hint_inverse">#7F828A</color>
+
+ <!-- Highlight colors -->
+ <color name="text_color_highlight_inverse">#D06BFF</color>
+
+ <!-- Link colors -->
+ <color name="text_color_link">#22629E</color>
+
+ <!-- Divider colors -->
+ <color name="toolbar_divider_grey">#D7D9DB</color>
+
+ <color name="doorhanger_link">#FF2AA1FE</color>
+
+ <color name="validation_message_text">#ffffff</color>
+ <color name="url_bar_text_highlight_pb">#FFD06BFF</color>
+ <color name="tab_row_pressed">#4D000000</color>
+
+ <color name="url_bar_urltext">#AFB1B3</color>
+ <color name="url_bar_urltext_private">#777777</color>
+ <color name="url_bar_domaintext">#363B40</color>
+ <color name="url_bar_domaintext_private">#FFFFFF</color>
+ <color name="url_bar_blockedtext">#b14646</color>
+ <color name="url_bar_shadow">#12000000</color>
+
+ <color name="panel_image_item_background">#D1D9E1</color>
+ <color name="panel_icon_item_title_background">#32000000</color>
+ <color name="panel_tab_text_normal">#FFBFBFBF</color>
+
+ <!-- Remote tabs setup -->
+ <color name="remote_tabs_setup_button_background_hit">#D95300</color>
+
+ <!-- Button toast colors. -->
+ <color name="toast_background">#DD222222</color>
+ <color name="toast_button_background">#00000000</color>
+ <color name="toast_button_pressed">#DD2C3136</color>
+ <color name="toast_button_text">#FFFFFFFF</color>
+
+ <!-- Tab History colors. -->
+ <color name="tab_history_timeline_separator">#D7D9DB</color>
+ <color name="tab_history_favicon_border">#D7D9DB</color>
+ <color name="tab_history_favicon_background">#FFFFFF</color>
+ <color name="tab_history_border_color">#DADADF</color>
+
+ <!-- Canvas delegate paint color -->
+ <color name="canvas_delegate_paint">#FFFF0000</color>
+
+ <!-- Top sites thumbnail colors -->
+ <color name="top_site_default">#FFECF0F3</color>
+ <color name="top_site_border">#FFCFD9E1</color>
+
+ <color name="private_active_text">#FFFFFF</color>
+
+ <color name="action_bar_bg_color">@color/toolbar_grey</color>
+
+ <color name="activity_stream_divider">#FFD2D2D2</color>
+ <color name="activity_stream_subtitle">#FF919191</color>
+ <color name="activity_stream_timestamp">#FFD3D3D3</color>
+ <color name="activity_stream_icon">#FF919191</color>
+
+</resources>
diff --git a/mobile/android/base/resources/values/dimens.xml b/mobile/android/base/resources/values/dimens.xml
new file mode 100644
index 000000000..b730f9671
--- /dev/null
+++ b/mobile/android/base/resources/values/dimens.xml
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+ <dimen name="standard_corner_radius">4dp</dimen>
+
+ <dimen name="autocomplete_min_width">200dp</dimen>
+ <dimen name="autocomplete_row_height">32dp</dimen>
+
+ <dimen name="browser_toolbar_height">48dp</dimen>
+ <!-- This value is the height of the Tabs Panel header view
+ (browser_toolbar_height) minus the height of the indicator
+ (6dp). This value should change when the height of the view changes. -->
+ <dimen name="tabs_panel_indicator_selected_padding_top">42dp</dimen>
+
+ <!-- We use two different values for browser_toolbar_height on tablet
+ which is inconsistent. Temporary value until bug 1150730 is fixed. -->
+ <dimen name="browser_toolbar_height_flipper">48dp</dimen>
+ <dimen name="browser_toolbar_button_padding">12dp</dimen>
+ <dimen name="browser_toolbar_icon_width">48dp</dimen>
+ <dimen name="browser_toolbar_menu_icon_height">16dp</dimen>
+
+ <!-- favicon_size includes 4dp of right padding. We can't use margin (which would allow us to
+ specify the actual size) because that would decrease the size of our hit target. -->
+ <dimen name="browser_toolbar_favicon_size">21.33dip</dimen>
+ <dimen name="browser_toolbar_shadow_size">2dp</dimen>
+
+ <!-- If you update one of these values, update the others. -->
+ <dimen name="tablet_nav_button_width">42dp</dimen>
+ <dimen name="tablet_nav_button_width_half">21dp</dimen>
+ <dimen name="tablet_nav_button_width_plus_half">63dp</dimen>
+
+ <!-- This is the system default for the vertical padding for the divider of the TabWidget.
+ Used to mimic the divider padding on the tablet tabs panel back button. -->
+ <dimen name="tab_panel_divider_vertical_padding">12dp</dimen>
+
+ <dimen name="tablet_tab_strip_height">48dp</dimen>
+ <dimen name="tablet_tab_strip_item_width">208dp</dimen>
+ <dimen name="tablet_tab_strip_item_margin">-28dp</dimen>
+ <dimen name="tablet_tab_strip_fading_edge_size">15dp</dimen>
+ <dimen name="tablet_browser_toolbar_menu_item_width">56dp</dimen>
+ <!-- Padding combines with an 18dp image to form the menu item width and height. -->
+ <dimen name="tablet_browser_toolbar_menu_item_padding_horizontal">19dp</dimen>
+ <dimen name="tablet_browser_toolbar_menu_item_inset_vertical">5dp</dimen>
+ <dimen name="tablet_browser_toolbar_menu_item_inset_horizontal">3dp</dimen>
+ <dimen name="tablet_tab_strip_button_inset">5dp</dimen>
+
+ <!-- Dimensions used by Favicons and FaviconView -->
+ <dimen name="favicon_bg">32dp</dimen>
+ <dimen name="favicon_corner_radius">4dp</dimen>
+ <!-- Set the upper limit on the size of favicon that will be processed. Favicons larger than
+ this will be downscaled to this value. If you need to use larger Favicons (Due to a UI
+ redesign sometime after this is written) you should increase this value to the largest
+ commonly-used size of favicon and, performance permitting, fetch the remainder from the
+ database. The largest available size is always stored in the database, regardless of this
+ value.-->
+ <dimen name="favicon_largest_interesting_size">32dp</dimen>
+
+ <dimen name="firstrun_content_width">300dp</dimen>
+ <dimen name="firstrun_min_height">120dp</dimen>
+ <dimen name="firstrun_background_height">120dp</dimen>
+
+ <dimen name="overlay_prompt_content_width">260dp</dimen>
+ <dimen name="overlay_prompt_button_width">148dp</dimen>
+ <dimen name="overlay_prompt_container_width">@dimen/match_parent</dimen>
+
+ <!-- Site security icon -->
+ <dimen name="browser_toolbar_site_security_height">32dp</dimen>
+ <dimen name="browser_toolbar_site_security_width">32dp</dimen>
+ <dimen name="browser_toolbar_site_security_margin_right">0dp</dimen>
+ <dimen name="browser_toolbar_site_security_padding_vertical">7dp</dimen>
+ <dimen name="browser_toolbar_site_security_padding_horizontal">7dp</dimen>
+
+ <!-- If one of these values changes, they all should. -->
+ <dimen name="browser_toolbar_site_security_margin_bottom">.5dp</dimen>
+ <dimen name="site_security_unknown_inset_top">1dp</dimen>
+ <dimen name="site_security_unknown_inset_bottom">-1dp</dimen>
+
+ <dimen name="home_folder_title_oneline_textsize">16sp</dimen>
+ <dimen name="home_folder_title_twoline_textsize">14sp</dimen>
+ <dimen name="home_twolinepagerow_title_textsize">16sp</dimen>
+
+ <dimen name="page_row_edge_padding">16dp</dimen>
+
+ <!-- Regular page row on about:home -->
+ <dimen name="page_row_height">64dp</dimen>
+
+ <!-- Group/heading page row on about:home -->
+ <dimen name="page_group_height">56dp</dimen>
+ <dimen name="home_header_item_height">56dp</dimen>
+ <dimen name="page_row_divider_height">1dp</dimen>
+
+ <!-- Remote Tabs static view top padding. Less in landscape on phones. -->
+ <dimen name="home_remote_tabs_top_padding">48dp</dimen>
+
+ <!-- Remote Tabs Hidden devices row height -->
+ <dimen name="home_remote_tabs_hidden_footer_height">40dp</dimen>
+
+ <!-- Search Engine Row height -->
+ <dimen name="search_row_height">48dp</dimen>
+
+ <dimen name="doorhanger_width">300dp</dimen>
+ <dimen name="doorhanger_input_width">250dp</dimen>
+ <dimen name="doorhanger_offsetX">12dp</dimen>
+ <dimen name="doorhanger_offsetY">67dp</dimen>
+ <dimen name="doorhanger_drawable_padding">5dp</dimen>
+ <dimen name="doorhanger_subsection_padding">8dp</dimen>
+ <dimen name="doorhanger_section_padding_small">10dp</dimen>
+ <dimen name="doorhanger_section_padding_medium">20dp</dimen>
+ <dimen name="doorhanger_section_padding_large">30dp</dimen>
+ <dimen name="doorhanger_icon_size">60dp</dimen>
+ <dimen name="doorhanger_rounded_corner_radius">4dp</dimen>
+
+ <dimen name="context_menu_item_horizontal_padding">10dp</dimen>
+
+ <dimen name="flow_layout_spacing">6dp</dimen>
+ <dimen name="menu_item_icon">21dp</dimen>
+ <dimen name="menu_item_textsize">16sp</dimen>
+ <dimen name="menu_item_state_icon">18dp</dimen>
+ <!-- This is chosen to match Android's listPreferredItemHeight.
+ TODO: We should inherit these from the system.
+ http://androidxref.com/4.2.2_r1/xref/frameworks/base/core/res/res/values/themes.xml#123 -->
+ <dimen name="menu_item_row_height">64dip</dimen>
+ <dimen name="menu_item_row_width">240dp</dimen>
+ <dimen name="menu_popup_width">256dp</dimen>
+ <dimen name="nav_button_border_width">1dp</dimen>
+ <dimen name="prompt_service_group_padding_size">32dp</dimen>
+ <dimen name="prompt_service_icon_size">36dp</dimen>
+ <dimen name="prompt_service_icon_text_padding">10dp</dimen>
+ <dimen name="prompt_service_inputs_padding">16dp</dimen>
+ <dimen name="prompt_service_left_right_text_with_icon_padding">10dp</dimen>
+ <dimen name="prompt_service_top_bottom_text_with_icon_padding">8dp</dimen>
+ <dimen name="tabs_panel_indicator_width">60dp</dimen>
+ <dimen name="tabs_panel_button_width">48dp</dimen>
+ <dimen name="tabs_strip_height">48dp</dimen>
+ <dimen name="tabs_strip_button_width">100dp</dimen>
+ <dimen name="tabs_strip_button_padding">18dp</dimen>
+ <dimen name="tabs_strip_shadow_size">1dp</dimen>
+ <dimen name="validation_message_height">50dp</dimen>
+ <dimen name="validation_message_margin_top">6dp</dimen>
+
+ <dimen name="tab_thumbnail_width">121dp</dimen>
+ <dimen name="tab_thumbnail_height">90dp</dimen>
+ <dimen name="tab_panel_column_width">129dp</dimen>
+ <dimen name="tab_panel_grid_padding">20dp</dimen>
+ <dimen name="tab_panel_grid_vspacing">20dp</dimen>
+ <dimen name="tab_panel_grid_padding_top">19dp</dimen>
+
+ <dimen name="tab_highlight_stroke_width">4dp</dimen>
+
+ <!-- PageActionButtons dimensions -->
+ <dimen name="page_action_button_width">32dp</dimen>
+
+ <!-- Banner -->
+ <dimen name="home_banner_height">72dp</dimen>
+ <dimen name="home_banner_close_width">42dp</dimen>
+ <dimen name="home_banner_icon_height">48dip</dimen>
+ <dimen name="home_banner_icon_width">48dip</dimen>
+
+ <!-- Icon Grid -->
+ <dimen name="icongrid_columnwidth">128dp</dimen>
+ <dimen name="icongrid_padding">16dp</dimen>
+
+ <!-- PanelRecyclerView dimensions -->
+ <dimen name="panel_grid_view_column_width">150dp</dimen>
+ <dimen name="panel_grid_view_horizontal_spacing">3dp</dimen>
+ <dimen name="panel_grid_view_vertical_spacing">3dp</dimen>
+ <dimen name="panel_grid_view_outer_spacing">3dp</dimen>
+
+ <!-- PanelItemView dimensions -->
+ <dimen name="panel_article_item_height">95dp</dimen>
+
+ <!-- Button toast dimenstions. -->
+ <dimen name="toast_button_corner_radius">2dp</dimen>
+
+ <!-- TabHistoryItemRow dimensions. -->
+ <dimen name="tab_history_timeline_width">3dp</dimen>
+ <dimen name="tab_history_timeline_height">14dp</dimen>
+ <dimen name="tab_history_favicon_bg">32dp</dimen>
+ <dimen name="tab_history_favicon_padding">5dp</dimen>
+ <dimen name="tab_history_favicon_border_enabled">3dp</dimen>
+ <dimen name="tab_history_favicon_border_disabled">1dp</dimen>
+ <dimen name="tab_history_combo_margin_left">15dp</dimen>
+ <dimen name="tab_history_combo_margin_right">15dp</dimen>
+ <dimen name="tab_history_title_fading_width">50dp</dimen>
+ <dimen name="tab_history_title_margin_right">15dp</dimen>
+ <dimen name="tab_history_title_text_size">14sp</dimen>
+ <dimen name="tab_history_bg_width">2dp</dimen>
+ <dimen name="tab_history_border_padding">2dp</dimen>
+
+ <!-- ZoomedView dimensions. -->
+ <dimen name="zoomed_view_toolbar_height">44dp</dimen>
+ <dimen name="drawable_dropshadow_size">3dp</dimen>
+
+ <!-- Find-In-Page dialog dimensions. -->
+ <dimen name="find_in_page_text_margin_left">5dip</dimen>
+ <dimen name="find_in_page_text_margin_right">12dip</dimen>
+ <dimen name="find_in_page_text_padding_left">10dip</dimen>
+ <dimen name="find_in_page_text_padding_right">10dip</dimen>
+ <dimen name="find_in_page_status_margin_right">10dip</dimen>
+ <dimen name="find_in_page_control_margin_top">2dip</dimen>
+ <dimen name="progress_bar_scroll_offset">1.5dp</dimen>
+
+ <!-- Matches the built-in divider height. fwiw, in the framework
+ I suspect this is a drawable rather than a dimen. -->
+ <dimen name="action_bar_divider_height">2dp</dimen>
+
+ <!-- http://blog.danlew.net/2015/01/06/handling-android-resources-with-non-standard-formats/ -->
+ <item name="match_parent" type="dimen">-1</item>
+ <item name="wrap_content" type="dimen">-2</item>
+
+ <item name="tab_strip_content_start" type="dimen">12dp</item>
+ <item name="firstrun_tab_strip_content_start" type="dimen">15dp</item>
+
+ <item name="notification_media_cover" type="dimen">128dp</item>
+
+ <item name="activity_stream_base_margin" type="dimen">10dp</item>
+ <item name="activity_stream_desired_tile_width" type="dimen">90dp</item>
+ <item name="activity_stream_desired_tile_height" type="dimen">70dp</item>
+ <item name="activity_stream_top_sites_text_height" type="dimen">30dp</item>
+
+ <!-- Default touch target size for buttons/imageviews that might be of small size -->
+ <item name="touch_target_size" type="dimen">48dp</item>
+</resources>
diff --git a/mobile/android/base/resources/values/ids.xml b/mobile/android/base/resources/values/ids.xml
new file mode 100644
index 000000000..2fe1ca793
--- /dev/null
+++ b/mobile/android/base/resources/values/ids.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+ <item type="id" name="tabQueueNotification"/>
+ <item type="id" name="tabQueueSettingsNotification" />
+ <item type="id" name="guestNotification"/>
+ <item type="id" name="original_height"/>
+ <item type="id" name="menu_items"/>
+ <item type="id" name="menu_margin"/>
+ <item type="id" name="recycler_view_click_support" />
+ <item type="id" name="range_list"/>
+ <item type="id" name="pref_header_general"/>
+ <item type="id" name="pref_header_privacy"/>
+ <item type="id" name="pref_header_search"/>
+ <item type="id" name="updateServicePermissionNotification" />
+ <item type="id" name="websiteContentNotification" />
+ <item type="id" name="foregroundNotification" />
+
+</resources>
diff --git a/mobile/android/base/resources/values/integers.xml b/mobile/android/base/resources/values/integers.xml
new file mode 100644
index 000000000..b3451e05d
--- /dev/null
+++ b/mobile/android/base/resources/values/integers.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+ <integer name="number_of_top_sites">6</integer>
+ <integer name="number_of_top_sites_cols">2</integer>
+ <integer name="max_icon_grid_columns">4</integer>
+ <integer name="panel_icon_grid_view_columns">3</integer>
+ <integer name="number_of_inline_share_devices">2</integer>
+ <integer name="max_search_suggestions">2</integer>
+ <integer name="max_saved_suggestions">2</integer>
+ <integer name="search_assist_launch_res">0</integer>
+
+</resources>
diff --git a/mobile/android/base/resources/values/search_attrs.xml b/mobile/android/base/resources/values/search_attrs.xml
new file mode 100644
index 000000000..d1b0ded59
--- /dev/null
+++ b/mobile/android/base/resources/values/search_attrs.xml
@@ -0,0 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+ <declare-styleable name="FacetButton"/>
+
+ <!--This attribute is required so that we can create a facet button-->
+ <!--pragmatically. The defStyle param used in the View constructor-->
+ <!--must be an attr, see: https://code.google.com/p/android/issues/detail?id=12683-->
+ <attr name="facetButtonStyle" />
+</resources>
diff --git a/mobile/android/base/resources/values/search_colors.xml b/mobile/android/base/resources/values/search_colors.xml
new file mode 100644
index 000000000..8718d1b51
--- /dev/null
+++ b/mobile/android/base/resources/values/search_colors.xml
@@ -0,0 +1,24 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+ <!-- card colors -->
+ <color name="row_background">#ffffff</color>
+ <color name="row_background_pressed">#DCDCE1</color>
+
+ <color name="widget_button_pressed">#33000000</color>
+
+ <!--Facet button colors-->
+ <color name="facet_button_background_color_default">@android:color/white</color>
+ <color name="facet_button_background_color_pressed">#FAFAFA</color>
+
+ <color name="facet_button_text_color_default">#ADB0B1</color>
+ <color name="facet_button_text_color_selected">#383E42</color>
+
+ <color name="network_error_link">#0092DB</color>
+
+ <!-- Suggestion highlight color -->
+ <color name="suggestion_highlight">#FF999999</color>
+</resources>
diff --git a/mobile/android/base/resources/values/search_dimens.xml b/mobile/android/base/resources/values/search_dimens.xml
new file mode 100644
index 000000000..d35641a16
--- /dev/null
+++ b/mobile/android/base/resources/values/search_dimens.xml
@@ -0,0 +1,30 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+ <!-- The height of the search bar is also used to offset the PreSearchFragment
+ and PostSearchFragment contents -->
+ <dimen name="search_bar_height">65dp</dimen>
+ <dimen name="progress_bar_height">3dp</dimen>
+
+ <!-- Size of the text for query input and suggestions -->
+ <dimen name="query_text_size">16sp</dimen>
+
+ <dimen name="search_row_padding">15dp</dimen>
+ <dimen name="search_bar_padding_y">10dp</dimen>
+
+ <!-- Padding to account for search engine icon/clear button -->
+ <dimen name="search_bar_padding_right">25dp</dimen>
+
+ <dimen name="search_history_drawable_padding">10dp</dimen>
+
+ <!-- Widget Buttons -->
+ <dimen name="widget_header_height">70dp</dimen>
+ <dimen name="widget_text_size">14sp</dimen>
+ <dimen name="widget_padding">7dp</dimen>
+ <dimen name="widget_drawable_corner_radius">4dp</dimen>
+ <dimen name="widget_bg_border_offset">3dp</dimen>
+
+ <dimen name="facet_button_underline_thickness">5dp</dimen>
+</resources>
diff --git a/mobile/android/base/resources/values/search_styles.xml b/mobile/android/base/resources/values/search_styles.xml
new file mode 100644
index 000000000..bc5adcd2e
--- /dev/null
+++ b/mobile/android/base/resources/values/search_styles.xml
@@ -0,0 +1,40 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+ <!-- Base application theme. -->
+ <style name="AppTheme" parent="@android:style/Theme.Light.NoTitleBar">
+ <item name="android:windowBackground">@color/toolbar_grey</item>
+ <item name="android:colorBackground">@color/toolbar_grey</item>
+
+ <!--This attribute is required so that we can create a facet button-->
+ <!--pragmatically. The defStyle param used in the View constructor-->
+ <!--must be an attr, see: https://code.google.com/p/android/issues/detail?id=12683-->
+ <item name="facetButtonStyle">@style/FacetButtonStyle</item>
+ </style>
+
+ <style name="SettingsTheme" parent="@android:style/Theme.Light" />
+
+ <style name="FacetButtonStyle">
+ <!--Since we're not inflating xml, we have to apply the layout params -->
+ <!--after instantiation. See FacetBar.addFacet.-->
+ <item name="android:textSize">15sp</item>
+ <item name="android:textColor">@color/facet_button_text_color</item>
+ <item name="android:background">@drawable/facet_button_background</item>
+ <item name="android:gravity">center</item>
+ <item name="android:clickable">true</item>
+ </style>
+
+ <style name="TextAppearance.EmptyView.Title" parent="@android:style/TextAppearance.Small">
+ <item name="android:textColor">@color/text_and_tabs_tray_grey</item>
+ <item name="android:textSize">20sp</item>
+ </style>
+
+ <style name="TextAppearance.EmptyView.Message" parent="@android:style/TextAppearance.Small">
+ <item name="android:textColor">@color/placeholder_grey</item>
+ <item name="android:textSize">16sp</item>
+ </style>
+
+</resources>
diff --git a/mobile/android/base/resources/values/styles.xml b/mobile/android/base/resources/values/styles.xml
new file mode 100644
index 000000000..dd22ef00b
--- /dev/null
+++ b/mobile/android/base/resources/values/styles.xml
@@ -0,0 +1,832 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
+
+ <!--
+ Base application styles. This could be overridden in other res/values-XXX/themes.xml.
+ -->
+ <style name="Widget"/>
+
+ <style name="Widget.BaseButton" parent="android:style/Widget.Button"/>
+
+ <style name="Widget.BaseDropDownItem" parent="android:style/Widget.DropDownItem"/>
+
+ <style name="Widget.BaseEditText" parent="android:style/Widget.EditText"/>
+
+ <style name="Widget.BaseListView" parent="android:style/Widget.ListView"/>
+
+ <style name="Widget.BaseGridView" parent="android:style/Widget.GridView"/>
+
+ <style name="Widget.BaseTextView" parent="android:style/Widget.TextView"/>
+
+ <style name="Widget.ProgressBar.Horizontal" parent="android:style/Widget.ProgressBar.Horizontal"/>
+
+ <!--
+ Application styles. All customizations that are not specific
+ to a particular API level can go here.
+ -->
+ <style name="Widget.Button" parent="Widget.BaseButton">
+ <item name="android:textAppearance">@style/TextAppearance.Widget.Button</item>
+ </style>
+
+ <style name="Widget.DropDownItem" parent="Widget.BaseDropDownItem">
+ <item name="android:textAppearance">@style/TextAppearance.Widget.DropDownItem</item>
+ </style>
+
+ <style name="Widget.EditText" parent="Widget.BaseEditText">
+ <item name="android:textAppearance">@style/TextAppearance.Widget.EditText</item>
+ </style>
+
+ <style name="Widget.TextView" parent="Widget.BaseTextView">
+ <item name="android:textAppearance">@style/TextAppearance.Widget.TextView</item>
+ </style>
+
+ <style name="Widget.ListView" parent="Widget.BaseListView">
+ <item name="android:divider">@color/toolbar_divider_grey</item>
+ <item name="android:dividerHeight">@dimen/page_row_divider_height</item>
+ <item name="android:cacheColorHint">@android:color/transparent</item>
+ <item name="android:listSelector">@drawable/action_bar_button</item>
+ </style>
+
+ <style name="Widget.ExpandableListView" parent="Widget.ListView">
+ <item name="android:groupIndicator">@android:color/transparent</item>
+ </style>
+
+ <style name="Widget.GridView" parent="Widget.BaseGridView">
+ <item name="android:verticalSpacing">0dip</item>
+ <item name="android:horizontalSpacing">0dip</item>
+ <item name="android:cacheColorHint">@android:color/transparent</item>
+ <item name="android:listSelector">@drawable/action_bar_button</item>
+ </style>
+
+ <style name="Widget.Home.HomeList">
+ <item name="android:scrollbarStyle">outsideOverlay</item>
+ </style>
+
+ <style name="Widget.ListItem">
+ <item name="android:minHeight">?android:attr/listPreferredItemHeight</item>
+ <item name="android:textAppearance">?android:attr/textAppearanceLargeInverse</item>
+ <item name="android:gravity">center_vertical</item>
+ <item name="android:paddingLeft">12dip</item>
+ <item name="android:paddingRight">7dip</item>
+ <item name="android:checkMark">?android:attr/listChoiceIndicatorMultiple</item>
+ <item name="android:ellipsize">marquee</item>
+ </style>
+
+ <style name="Widget.Spinner" parent="android:style/Widget.Spinner">
+ <item name="android:minWidth">@dimen/doorhanger_input_width</item>
+ </style>
+
+ <style name="Widget.GeckoMenuListView" parent="Widget.ListView">
+ <item name="android:listSelector">@drawable/menu_item_action_bar_bg</item>
+ <item name="android:divider">@null</item>
+ <item name="android:dividerHeight">0dp</item>
+ </style>
+
+ <style name="Widget.MenuItemActionBar">
+ <item name="android:padding">10dip</item>
+ <item name="android:background">@drawable/menu_item_action_bar_bg</item>
+ <item name="android:scaleType">fitCenter</item>
+ <item name="drawableTintList">@color/action_bar_menu_item_colors</item>"
+ </style>
+
+ <style name="Widget.MenuItemSecondaryActionBar">
+ <item name="android:padding">8dip</item>
+ <item name="android:background">@drawable/menu_item_action_bar_bg</item>
+ <item name="android:scaleType">centerInside</item>
+ <item name="drawableTintList">@color/action_bar_secondary_menu_item_colors</item>
+ </style>
+
+ <style name="Widget.MenuItemSwitcherLayout">
+ <item name="android:gravity">left</item>
+ </style>
+
+ <style name="Widget.MenuItemDefault">
+ <item name="android:paddingLeft">15dip</item>
+ <item name="android:paddingRight">10dip</item>
+ <item name="android:drawablePadding">6dip</item>
+ <item name="android:gravity">center_vertical</item>
+ <item name="android:textAppearance">@style/TextAppearance</item>
+ <item name="android:singleLine">true</item>
+ <item name="android:ellipsize">middle</item>
+ <item name="android:textSize">@dimen/menu_item_textsize</item>
+ </style>
+
+ <style name="Widget.FolderTitle">
+ <item name="android:textAppearance">@style/TextAppearance.Widget.Home.ItemTitle</item>
+ </style>
+
+ <style name="Widget.FolderTitle.OneLine">
+ <item name="android:textSize">@dimen/home_folder_title_oneline_textsize</item>
+ </style>
+
+ <style name="Widget.FolderTitle.TwoLine">
+ <item name="android:textSize">@dimen/home_folder_title_twoline_textsize</item>
+ </style>
+
+ <style name="Widget.TwoLinePageRow" >
+ <item name="android:background">@color/pressed_about_page_header_grey</item>
+ </style>
+
+ <style name="Widget.TwoLinePageRow.Title">
+ <item name="android:textAppearance">@style/TextAppearance.Widget.Home.ItemTitle</item>
+ <item name="android:textSize">@dimen/home_twolinepagerow_title_textsize</item>
+ </style>
+
+ <style name="Widget.TwoLinePageRow.Url">
+ <item name="android:textAppearance">@style/TextAppearance.Widget.Home.ItemDescription</item>
+ <item name="android:includeFontPadding">false</item>
+ <item name="android:singleLine">true</item>
+ </style>
+
+ <style name="Widget.FolderView" parent="Widget.FolderTitle.OneLine">
+ <item name="android:layout_height">@dimen/page_group_height</item>
+ <item name="android:minHeight">@dimen/page_group_height</item>
+ <item name="android:singleLine">true</item>
+ <item name="android:ellipsize">none</item>
+ <item name="android:background">@color/about_page_header_grey</item>
+ <item name="android:paddingLeft">20dp</item>
+ <item name="android:drawablePadding">20dp</item>
+ </style>
+
+ <style name="Widget.PanelItemView" />
+
+ <style name="Widget.PanelItemView.Title">
+ <item name="android:textAppearance">@style/TextAppearance.Widget.Home.ItemTitle</item>
+ <item name="android:maxLines">2</item>
+ <item name="android:ellipsize">end</item>
+ </style>
+
+ <style name="Widget.PanelItemView.Description">
+ <item name="android:textAppearance">@style/TextAppearance.Widget.Home.ItemDescription</item>
+ <item name="android:includeFontPadding">false</item>
+ <item name="android:maxLines">2</item>
+ <item name="android:ellipsize">end</item>
+ </style>
+
+ <style name="Widget.TopSitesGridView" parent="Widget.GridView">
+ <item name="android:padding">7dp</item>
+ <item name="android:horizontalSpacing">0dp</item>
+ <item name="android:verticalSpacing">7dp</item>
+ </style>
+
+ <style name="Widget.TopSitesGridItemView">
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_height">match_parent</item>
+ <item name="android:padding">5dip</item>
+ <item name="android:orientation">vertical</item>
+ </style>
+
+ <style name="Widget.TabsGridLayout" parent="Widget.GridView">
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_height">match_parent</item>
+ <item name="android:paddingTop">0dp</item>
+ <item name="android:stretchMode">spacingWidth</item>
+ <item name="android:scrollbarStyle">outsideOverlay</item>
+ <item name="android:gravity">center</item>
+ <item name="android:numColumns">auto_fit</item>
+ <item name="android:columnWidth">@dimen/tab_panel_column_width</item>
+ <item name="android:horizontalSpacing">2dp</item>
+ <item name="android:verticalSpacing">@dimen/tab_panel_grid_vspacing</item>
+ <item name="android:drawSelectorOnTop">true</item>
+ <item name="android:clipToPadding">false</item>
+ </style>
+
+ <style name="Widget.BookmarkItemView" parent="Widget.TwoLinePageRow"/>
+
+ <style name="Widget.BookmarksListView" parent="Widget.HomeListView"/>
+
+ <style name="Widget.TopSitesThumbnailView">
+ <item name="android:padding">0dip</item>
+ <item name="android:scaleType">centerCrop</item>
+ </style>
+
+ <style name="Widget.TopSitesGridItemPin">
+ <item name="android:minWidth">30dip</item>
+ <item name="android:minHeight">30dip</item>
+ <item name="android:padding">0dip</item>
+ </style>
+
+ <style name="Widget.TopSitesGridItemTitle">
+ <item name="android:textColor">@color/top_sites_grid_item_title</item>
+ <item name="android:textSize">12sp</item>
+ <item name="android:paddingTop">5dip</item>
+ <item name="android:gravity">left</item>
+ </style>
+
+ <style name="Widget.HomeListView" parent="Widget.ListView">
+ <item name="android:divider">@color/toolbar_divider_grey</item>
+ </style>
+
+ <style name="Widget.TopSitesListView" parent="Widget.BookmarksListView"/>
+
+ <style name="Widget.HomeBanner"/>
+
+ <style name="Widget.Home" />
+
+ <style name="Widget.Home.HeaderItem">
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_height">36dp</item>
+ <item name="android:textAppearance">@style/TextAppearance.Widget.Home.Header</item>
+ <item name="android:background">@android:color/white</item>
+ <item name="android:focusable">false</item>
+ <item name="android:gravity">center|left</item>
+ <item name="android:paddingLeft">16dp</item>
+ <item name="android:paddingRight">16dp</item>
+ <item name="android:paddingTop">11dp</item>
+ <item name="android:paddingBottom">11dp</item>
+ <item name="android:includeFontPadding">false</item>
+ </style>
+
+ <style name="Widget.Home.ActionButton">
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_height">48dp</item>
+ <item name="android:textColor">@color/text_and_tabs_tray_grey</item>
+ <item name="android:textSize">14sp</item>
+ <item name="android:background">@drawable/home_history_clear_button_bg</item>
+ <item name="android:focusable">true</item>
+ <item name="android:gravity">center</item>
+ <item name="android:paddingLeft">10dip</item>
+ <item name="android:paddingRight">10dip</item>
+ </style>
+
+ <style name="Widget.Home.ActionItem">
+ <item name="android:layout_width">fill_parent</item>
+ <item name="android:layout_height">40dip</item>
+ <item name="android:textColor">#000000</item>
+ <item name="android:gravity">center</item>
+ </style>
+
+ <style name="Widget.Firstrun.Button" parent="Widget.BaseButton">
+ <item name="android:layout_width">@dimen/firstrun_content_width</item>
+ <item name="android:layout_height">60dp</item>
+ <item name="android:textColor">@color/android:white</item>
+ <item name="android:background">@color/action_orange</item>
+ <item name="android:textSize">18sp</item>
+ </style>
+
+ <style name="Widget.Doorhanger.Button" parent="Widget.BaseButton">
+ <item name="android:layout_width">0dp</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:layout_weight">1</item>
+ <item name="android:minHeight">48dp</item>
+ <item name="android:textSize">14sp</item>
+ </style>
+
+ <!--
+ We are overriding the snackbar message style to guarantee a consistent style across Android versions (bug 1217416).
+ -->
+ <style name="TextAppearance.Design.Snackbar.Message" parent="android:TextAppearance" tools:override="true">
+ <item name="android:textSize">@dimen/design_snackbar_text_size</item>
+ <item name="android:textColor">@android:color/white</item>
+ </style>
+
+ <!--
+ TextAppearance
+ Note: Gecko uses light theme as default, while Android uses dark.
+ If Android convention has to be followd, the list of colors specified
+ in themes.xml would be inverse, and things would get confusing.
+ Hence, Gecko's TextAppearance is based on text over light theme and
+ TextAppearance.Inverse is based on text over dark theme.
+ -->
+ <style name="TextAppearance">
+ <item name="android:textColor">?android:attr/textColorPrimary</item>
+ <item name="android:textColorHighlight">@color/fennec_ui_orange</item>
+ <item name="android:textColorHint">?android:attr/textColorHint</item>
+ <item name="android:textColorLink">?android:attr/textColorLink</item>
+ <item name="android:textSize">@dimen/menu_item_textsize</item>
+ <item name="android:textStyle">normal</item>
+ </style>
+
+ <style name="TextAppearance.Inverse">
+ <item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
+ <item name="android:textColorHint">?android:attr/textColorHintInverse</item>
+ <item name="android:textColorHighlight">@color/text_color_highlight_inverse</item>
+ <item name="android:textColorLink">?android:attr/textColorLink</item>
+ </style>
+
+ <style name="TextAppearance.Large">
+ <item name="android:textSize">22sp</item>
+ </style>
+
+ <style name="TextAppearance.Large.Inverse">
+ <item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
+ <item name="android:textColorHint">?android:attr/textColorHintInverse</item>
+ <item name="android:textColorHighlight">@color/text_color_highlight_inverse</item>
+ <item name="android:textColorLink">?android:attr/textColorLink</item>
+ </style>
+
+ <style name="TextAppearance.Medium">
+ <item name="android:textSize">18sp</item>
+ </style>
+
+ <style name="TextAppearance.Medium.Inverse">
+ <item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
+ <item name="android:textColorHint">?android:attr/textColorHintInverse</item>
+ <item name="android:textColorHighlight">@color/text_color_highlight_inverse</item>
+ <item name="android:textColorLink">?android:attr/textColorLink</item>
+ </style>
+
+ <style name="TextAppearance.Small">
+ <item name="android:textSize">14sp</item>
+ <item name="android:textColor">?android:attr/textColorSecondary</item>
+ </style>
+
+ <style name="TextAppearance.Small.Inverse">
+ <item name="android:textColor">?android:attr/textColorSecondaryInverse</item>
+ <item name="android:textColorHint">?android:attr/textColorHintInverse</item>
+ <item name="android:textColorHighlight">@color/text_color_highlight_inverse</item>
+ <item name="android:textColorLink">?android:attr/textColorLink</item>
+ </style>
+
+ <style name="TextAppearance.EmptyMessage" parent="TextAppearance.Large"/>
+
+ <style name="TextAppearance.EmptyHint" parent="TextAppearance.Medium">
+ <item name="android:textColor">#FFA62F</item>
+ <item name="android:textStyle">italic</item>
+ </style>
+
+ <style name="TextAppearance.Micro">
+ <item name="android:textSize">12sp</item>
+ <item name="android:textColor">?android:attr/textColorTertiary</item>
+ </style>
+
+ <style name="TextAppearance.Micro.Inverse">
+ <item name="android:textColor">?android:attr/textColorTertiaryInverse</item>
+ <item name="android:textColorHint">?android:attr/textColorHintInverse</item>
+ <item name="android:textColorHighlight">@color/text_color_highlight_inverse</item>
+ <item name="android:textColorLink">?android:attr/textColorLink</item>
+ </style>
+
+ <style name="TextAppearance.Widget" />
+
+ <style name="TextAppearance.Widget.Button" parent="TextAppearance.Small">
+ <item name="android:textColor">@color/primary_text</item>
+ </style>
+
+ <style name="TextAppearance.Widget.DropDownItem">
+ <item name="android:textColor">@color/primary_text</item>
+ </style>
+
+ <style name="TextAppearance.Widget.EditText">
+ <item name="android:textColor">@color/primary_text</item>
+ </style>
+
+ <style name="TextAppearance.Widget.TextView">
+ <item name="android:textColor">@color/primary_text</item>
+ </style>
+
+ <style name="TextAppearance.Widget.HomePagerTabMenuStrip" parent="TextAppearance.Small">
+ <item name="android:textColor">?android:attr/textColorHint</item>
+ <item name="android:textSize">14sp</item>
+ </style>
+
+ <style name="TextAppearance.Widget.Home" />
+
+ <style name="TextAppearance.Widget.Home.Header" parent="TextAppearance.Small">
+ <item name="android:textColor">@color/disabled_grey</item>
+ <item name="android:textSize">12sp</item>
+ </style>
+
+ <style name="TextAppearance.Widget.Home.ItemTitle" parent="TextAppearance">
+ <item name="android:textSize">16dp</item>
+ </style>
+
+ <style name="TextAppearance.Widget.Home.ItemDescription" parent="TextAppearance.Micro">
+ <item name="android:textColor">@color/tabs_tray_icon_grey</item>
+ </style>
+
+ <style name="TextAppearance.Widget.HomeBanner" parent="TextAppearance.Small">
+ <item name="android:textColor">?android:attr/textColorHint</item>
+ </style>
+
+ <style name="TextAppearance.DoorHanger">
+ <item name="android:textColor">@color/placeholder_active_grey</item>
+ <item name="android:textColorLink">@color/doorhanger_link</item>
+ </style>
+
+ <style name="TextAppearance.DoorHanger.Medium">
+ <item name="android:textSize">16dp</item>
+ </style>
+
+ <style name="TextAppearance.DoorHanger.Medium.Bold">
+ <item name="android:fontFamily">sans-serif-medium</item>
+ </style>
+
+ <style name="TextAppearance.DoorHanger.Medium.Light">
+ <item name="android:fontFamily">sans-serif-light</item>
+ </style>
+
+ <style name="TextAppearance.DoorHanger.Small">
+ <item name="android:textSize">14sp</item>
+ </style>
+
+ <style name="TextAppearance.UrlBar.Title" parent="TextAppearance.Small">
+ <item name="android:textSize">15sp</item>
+ </style>
+
+ <!-- BrowserToolbar -->
+ <style name="BrowserToolbar">
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_height">@dimen/browser_toolbar_height</item>
+ <item name="android:orientation">horizontal</item>
+ </style>
+
+ <!-- URL bar -->
+ <style name="UrlBar">
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_height">match_parent</item>
+ <item name="android:orientation">horizontal</item>
+ </style>
+
+ <!-- URL bar - Button -->
+ <style name="UrlBar.Button">
+ <item name="android:layout_height">match_parent</item>
+ <item name="android:background">@android:color/transparent</item>
+ </style>
+
+ <!-- URL bar - Button -->
+ <style name="UrlBar.Title" parent="UrlBar.Button">
+ <item name="android:textAppearance">@style/TextAppearance.UrlBar.Title</item>
+ <item name="android:textColor">@color/url_bar_title</item>
+ <item name="android:textColorHint">@color/url_bar_title_hint</item>
+ <item name="android:textColorHighlight">@color/fennec_ui_orange</item>
+ <item name="android:textSelectHandle">@drawable/handle_middle</item>
+ <item name="android:textSelectHandleLeft">@drawable/handle_start</item>
+ <item name="android:textSelectHandleRight">@drawable/handle_end</item>
+ <item name="android:textCursorDrawable">@null</item>
+ <item name="android:singleLine">true</item>
+ <item name="android:gravity">center_vertical|left</item>
+ <item name="android:hint">@string/url_bar_default_text</item>
+ </style>
+
+ <!-- URL bar - Image Button -->
+ <style name="UrlBar.ImageButtonBase" parent="UrlBar.Button">
+ <item name="android:scaleType">center</item>
+ <item name="android:layout_gravity">center_vertical</item>
+ <item name="android:background">@android:color/transparent</item>
+ </style>
+
+ <style name="UrlBar.ImageButton" parent="UrlBar.ImageButtonBase">
+ <item name="android:layout_width">@dimen/browser_toolbar_height</item>
+ </style>
+
+ <!-- TabsLayout -->
+ <style name="TabsLayoutBase">
+ <item name="android:background">@android:color/transparent</item>
+ <item name="android:listSelector">@android:color/transparent</item>
+ </style>
+
+ <style name="TabsLayout" parent="TabsLayoutBase">
+ <item name="android:orientation">vertical</item>
+ <item name="android:scrollbars">vertical</item>
+ </style>
+
+ <style name="TabsItem">
+ <item name="android:nextFocusRight">@+id/close</item>
+ </style>
+
+ <style name="TabsItemClose">
+ <item name="android:nextFocusLeft">@+id/info</item>
+ </style>
+
+ <!-- Tabs panel -->
+ <style name="TabsPanelSectionBase">
+ <item name="android:orientation">vertical</item>
+ <item name="android:layout_marginLeft">40dp</item>
+ <item name="android:layout_marginRight">40dp</item>
+ </style>
+
+ <style name="TabsPanelSection" parent="TabsPanelSectionBase">
+ <!-- We set values in landscape. -->
+ </style>
+
+ <style name="TabsPanelItemBase">
+ <item name="android:layout_marginBottom">28dp</item>
+ <item name="android:layout_gravity">center</item>
+ <item name="android:gravity">center</item>
+ </style>
+
+ <style name="TabsPanelItem" parent="TabsPanelItemBase">
+ <!-- We set values in landscape. -->
+ </style>
+
+ <style name="TabsPanelItem.TextAppearance">
+ <item name="android:textColor">#C0C9D0</item>
+ <item name="android:textSize">14sp</item>
+ <item name="android:lineSpacingMultiplier">1.35</item>
+ </style>
+
+ <style name="TabsPanelItem.TextAppearance.Header">
+ <item name="android:textSize">18sp</item>
+ <item name="android:layout_marginBottom">16dp</item>
+ </style>
+
+ <style name="TabsPanelItem.TextAppearance.Linkified">
+ <item name="android:clickable">true</item>
+ <item name="android:focusable">true</item>
+ <item name="android:textColor">#0292D6</item>
+ </style>
+
+ <style name="Widget.RemoteTabsItemView" parent="Widget.TwoLinePageRow"/>
+
+ <style name="Widget.RemoteTabsClientView" parent="Widget.TwoLinePageRow">
+ <item name="android:background">@color/about_page_header_grey</item>
+ </style>
+
+ <style name="Widget.RemoteTabsListView" parent="Widget.HomeListView">
+ <item name="android:childDivider">@color/toolbar_divider_grey</item>
+ </style>
+
+ <style name="Widget.HistoryListView" parent="Widget.HomeListView">
+ <item name="android:childDivider">@color/toolbar_divider_grey</item>
+ <item name="android:drawSelectorOnTop">true</item>
+ </style>
+
+ <!-- TabsLayout Row -->
+ <style name="TabLayoutItemTextAppearance">
+ <item name="android:textColor">#FFFFFFFF</item>
+ <item name="android:singleLine">true</item>
+ <item name="android:ellipsize">middle</item>
+ </style>
+
+ <!-- TabsLayout RemoteTabs Row Url -->
+ <style name="TabLayoutItemTextAppearance.Url">
+ <item name="android:textColor">#FFA4A7A9</item>
+ </style>
+
+ <!-- TabWidget -->
+ <style name="TabWidget">
+ <item name="android:layout_width">wrap_content</item>
+ <item name="android:layout_height">40dip</item>
+ <item name="android:layout_weight">1.0</item>
+ </style>
+
+ <!-- Find bar -->
+ <style name="FindBar">
+ <item name="android:background">@color/text_and_tabs_tray_grey</item>
+ <item name="android:paddingLeft">3dip</item>
+ <item name="android:paddingRight">3dip</item>
+ <item name="android:paddingTop">6dip</item>
+ <item name="android:paddingBottom">6dip</item>
+ </style>
+
+ <!-- Find bar - Image Button -->
+ <style name="FindBar.ImageButton">
+ <item name="android:layout_width">wrap_content</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:layout_marginLeft">5dip</item>
+ <item name="android:layout_marginRight">5dip</item>
+ <item name="android:scaleType">fitCenter</item>
+ <item name="android:layout_centerVertical">true</item>
+ <item name="android:background">@drawable/action_bar_button_inverse</item>
+ </style>
+
+ <style name="GeckoDialogTitle">
+ <item name="android:textAppearance">@android:style/TextAppearance.DialogWindowTitle</item>
+ </style>
+
+ <style name="GeckoDialogTitle.SubTitle" />
+
+ <style name="PopupAnimation">
+ <item name="@android:windowEnterAnimation">@anim/popup_show</item>
+ <item name="@android:windowExitAnimation">@anim/popup_hide</item>
+ </style>
+
+ <style name="ToastBase">
+ <item name="android:background">@drawable/toast_background</item>
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:layout_alignParentBottom">true</item>
+ <item name="android:layout_centerHorizontal">true</item>
+ <item name="android:layout_gravity">bottom|center_horizontal</item>
+ <item name="android:layout_marginBottom">64dp</item>
+ <item name="android:layout_marginTop">0dp</item>
+ <item name="android:orientation">horizontal</item>
+ <item name="android:clickable">true</item>
+ </style>
+
+ <style name="Toast" parent="ToastBase">
+ <item name="android:layout_marginLeft">16dp</item>
+ <item name="android:layout_marginRight">16dp</item>
+ </style>
+
+ <style name="ToastElementBase">
+ <item name="android:background">@null</item>
+ <item name="android:paddingLeft">12dp</item>
+ <item name="android:paddingRight">12dp</item>
+ <item name="android:paddingTop">11dp</item>
+ <item name="android:paddingBottom">11dp</item>
+ </style>
+
+ <style name="ToastDividerBase">
+ <item name="android:background">@color/toolbar_divider_grey</item>
+ <item name="android:layout_width">1dp</item>
+ <item name="android:layout_height">match_parent</item>
+ </style>
+
+ <style name="ToastMessageBase" parent="ToastElementBase">
+ <item name="android:textColor">@color/toast_button_text</item>
+ <item name="android:layout_width">0dp</item>
+ <item name="android:layout_weight">1</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:layout_gravity">center_vertical</item>
+ <item name="android:ellipsize">end</item>
+ <item name="android:maxLines">1</item>
+ <item name="android:clickable">false</item>
+ <item name="android:focusable">false</item>
+ </style>
+
+ <style name="ToastButtonBase" parent="ToastElementBase">
+ <item name="android:background">@drawable/toast_button_background</item>
+ <item name="android:textColor">@color/toast_button_text</item>
+ <item name="android:minHeight">0dp</item>
+ <item name="android:minWidth">0dp</item>
+ <item name="android:layout_width">wrap_content</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:layout_gravity">center_vertical</item>
+ <item name="android:drawablePadding">12dp</item>
+ <item name="android:maxWidth">160dp</item>
+ </style>
+
+ <style name="ToastDivider" parent="ToastDividerBase">
+ <item name="android:layout_marginTop">14dp</item>
+ <item name="android:layout_marginBottom">14dp</item>
+ </style>
+
+ <style name="ToastMessage" parent="ToastMessageBase">
+ <item name="android:textAppearance">?android:textAppearanceSmall</item>
+ </style>
+
+ <style name="ToastButton" parent="ToastButtonBase">
+ <item name="android:textAppearance">?android:textAppearanceSmall</item>
+ <item name="android:textStyle">bold</item>
+ </style>
+
+ <!-- Ideally, we use the same style for the action bar & action mode, but unfortunately
+ some attrs that share a purpose have different names so instead we inherit. -->
+ <style name="GeckoActionBar" parent="ThemeOverlay.AppCompat.ActionBar">
+ <item name="android:colorBackground">@color/action_bar_bg_color</item>
+ <item name="colorAccent">@color/fennec_ui_orange</item>
+ <item name="colorControlNormal">@color/toolbar_icon_grey</item>
+ </style>
+ <style name="GeckoActionBar.ActionMode">
+ <item name="android:background">@color/action_bar_bg_color</item>
+ <!-- Note: the bottom divider is drawn in code. -->
+ </style>
+
+ <style name="PreferencesActionBar" parent="Widget.AppCompat.ActionBar.Solid">
+ <item name="displayOptions">showHome|homeAsUp|showTitle</item>
+ </style>
+
+ <style name="GeckoActionBar.Title">
+ <item name="android:gravity">center_vertical</item>
+ <item name="android:minWidth">0dp</item>
+ <item name="android:background">@android:color/transparent</item>
+ <item name="android:textAppearance">@style/TextAppearance.Medium</item>
+ <item name="android:drawableLeft">@drawable/ab_done</item>
+ <item name="android:paddingLeft">15dp</item>
+ <item name="android:paddingRight">15dp</item>
+ <item name="android:contentDescription">@string/actionbar_done</item>
+ </style>
+
+ <style name="GeckoActionBar.Button" parent="Widget.MenuItemActionBar">
+ <item name="android:padding">8dp</item>
+ </style>
+
+ <style name="GeckoActionBar.Button.MenuButton">
+ <item name="android:scaleType">center</item>
+ <item name="android:src">@drawable/menu</item>
+ <item name="android:tint">@color/toolbar_icon_grey</item>
+ <item name="android:contentDescription">@string/actionbar_menu</item>
+ <item name="android:background">@android:color/transparent</item>
+ </style>
+
+ <style name="GeckoActionBar.Buttons">
+ <item name="android:background">@android:color/transparent</item>
+ <item name="android:textColor">@color/placeholder_active_grey</item>
+ <item name="android:gravity">right</item>
+ </style>
+
+ <style name="ShareOverlayTitle">
+ <item name="android:gravity">center_horizontal</item>
+ <item name="android:paddingLeft">15dp</item>
+ <item name="android:paddingRight">15dp</item>
+ </style>
+
+ <style name="TextAppearance.ShareOverlay">
+ <item name="android:fontFamily">sans-serif</item>
+ </style>
+
+ <style name="TextAppearance.ShareOverlay.Header">
+ <item name="android:textColor">@android:color/white</item>
+ <item name="android:fontFamily">sans-serif-light</item>
+ <item name="android:textStyle">normal</item>
+ </style>
+
+ <style name="ShareOverlayRow">
+ <item name="android:minHeight">60dp</item>
+ <item name="android:gravity">center_vertical</item>
+ <item name="android:background">@drawable/overlay_share_button_background</item>
+ <item name="android:focusableInTouchMode">false</item>
+ </style>
+
+ <style name="TabInput"></style>
+
+ <style name="TabInput.TabWidget">
+ <item name="android:divider">@drawable/divider_vertical</item>
+ <item name="android:background">@drawable/tab_indicator_background</item>
+ </style>
+
+ <style name="TabInput.Tab">
+ <item name="android:background">@drawable/tabs_strip_indicator</item>
+ <item name="android:gravity">center</item>
+ <item name="android:minHeight">@dimen/menu_item_row_height</item>
+ </style>
+
+ <style name="TextAppearance.FirstrunLight"/>
+ <style name="TextAppearance.FirstrunRegular"/>
+
+ <style name="TextAppearance.FirstrunLight.Main">
+ <item name="android:textSize">20sp</item>
+ <item name="android:textColor">@color/text_and_tabs_tray_grey</item>
+ </style>
+
+ <style name="TextAppearance.FirstrunRegular.Body">
+ <item name="android:textSize">16sp</item>
+ <item name="android:textColor">@color/placeholder_grey</item>
+ <item name="android:lineSpacingMultiplier">1.25</item>
+ </style>
+
+ <style name="TextAppearance.FirstrunRegular.Link">
+ <item name="android:textSize">16sp</item>
+ <item name="android:textColor">@color/link_blue</item>
+ </style>
+
+ <!-- Remote Tabs home panel -->
+ <style name="RemoteTabsPanelFrame">
+ <item name="android:paddingLeft">32dp</item>
+ <item name="android:paddingRight">32dp</item>
+ <item name="android:paddingTop">@dimen/home_remote_tabs_top_padding</item>
+ <item name="android:orientation">vertical</item>
+ <item name="android:layout_gravity">center_horizontal</item>
+ <item name="android:layout_width">wrap_content</item>
+ <item name="android:layout_height">wrap_content</item>
+ </style>
+
+ <style name="RemoteTabsPanelItem">
+ <item name="android:layout_gravity">center</item>
+ <item name="android:gravity">center</item>
+ <item name="android:layout_marginBottom">16dp</item>
+ <item name="android:maxWidth">320dp</item>
+ </style>
+
+ <style name="RemoteTabsPanelItem.TextAppearance">
+ <item name="android:textColor">@color/placeholder_grey</item>
+ <item name="android:textSize">16sp</item>
+ <item name="android:lineSpacingMultiplier">1.25</item>
+ <item name="android:layout_marginLeft">8dp</item>
+ <item name="android:layout_marginRight">8dp</item>
+ </style>
+
+ <style name="RemoteTabsPanelItem.TextAppearance.Header">
+ <item name="android:textColor">@color/placeholder_active_grey</item>
+ <item name="android:textSize">20sp</item>
+ <item name="android:layout_marginBottom">8dp</item>
+ </style>
+
+ <style name="RemoteTabsPanelItem.TextAppearance.Linkified">
+ <item name="android:clickable">true</item>
+ <item name="android:focusable">true</item>
+ <item name="android:textColor">#0092DB</item>
+ </style>
+
+ <style name="RemoteTabsPanelItem.Button">
+ <item name="android:background">@drawable/remote_tabs_setup_button_background</item>
+ <item name="android:textColor">#FFFFFF</item>
+ <item name="android:textSize">20sp</item>
+ <item name="android:gravity">center</item>
+ <item name="android:paddingTop">16dp</item>
+ <item name="android:paddingBottom">16dp</item>
+ <item name="android:paddingLeft">8dp</item>
+ <item name="android:paddingRight">8dp</item>
+
+ <!-- AppCompat sets Button text to all caps so we override that here. -->
+ <item name="textAllCaps">false</item>
+ </style>
+
+ <style name="TabQueueActivity" parent="android:style/Theme.NoDisplay" />
+
+ <style name="ActivityStreamContextMenuText">
+ <item name="android:textSize">16sp</item>
+ </style>
+
+ <!-- We use this style to provide our own divider that has an inset on the left side -->
+ <style name="ActivityStreamContextMenuStyle">
+ <item name="android:listDivider">@drawable/as_contextmenu_divider</item>
+ </style>
+
+</resources>
diff --git a/mobile/android/base/resources/values/themes.xml b/mobile/android/base/resources/values/themes.xml
new file mode 100644
index 000000000..f62a9d454
--- /dev/null
+++ b/mobile/android/base/resources/values/themes.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+ <!--
+ Base application theme. This could be overridden by GeckoBaseTheme
+ in other res/values-XXX/themes.xml.
+ -->
+ <style name="GeckoBase" parent="Theme.AppCompat.Light.DarkActionBar">
+ <item name="windowNoTitle">true</item>
+ <item name="windowActionBar">false</item>
+ <item name="android:windowContentOverlay">@null</item>
+ </style>
+
+ <style name="GeckoDialogBase" parent="@android:style/Theme.Dialog">
+ <item name="android:windowNoTitle">true</item>
+ <item name="android:windowContentOverlay">@null</item>
+ </style>
+
+ <style name="GeckoTitleDialogBase" parent="@android:style/Theme.Dialog" />
+
+ <style name="Gecko.Preferences">
+ <item name="windowActionBar">true</item>
+ <item name="windowNoTitle">false</item>
+ <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
+ <item name="actionBarStyle">@style/PreferencesActionBar</item>
+ </style>
+
+ <!--
+ Application Theme. All customizations that are not specific
+ to a particular API level can go here.
+ -->
+ <style name="Gecko" parent="GeckoBase">
+ <!-- Default colors -->
+ <item name="android:textColorPrimary">@color/primary_text</item>
+ <item name="android:textColorSecondary">@color/secondary_text</item>
+ <item name="android:textColorTertiary">@color/tertiary_text</item>
+
+ <!-- Default inverse colors -->
+ <item name="android:textColorPrimaryInverse">@color/primary_text</item>
+ <item name="android:textColorSecondaryInverse">@color/secondary_text</item>
+ <item name="android:textColorTertiaryInverse">@color/tertiary_text</item>
+
+ <!-- Disabled colors -->
+ <item name="android:textColorPrimaryDisableOnly">@color/text_color_primary_disable_only</item>
+
+ <!-- Hint colors -->
+ <item name="android:textColorHint">@color/text_color_hint</item>
+ <item name="android:textColorHintInverse">@color/text_color_hint_inverse</item>
+
+ <!-- Highlight colors -->
+ <item name="android:textColorHighlight">@color/fennec_ui_orange</item>
+ <item name="android:textColorHighlightInverse">@color/text_color_highlight_inverse</item>
+
+ <!-- Link colors -->
+ <item name="android:textColorLink">@color/text_color_link</item>
+
+ <!-- TextAppearances -->
+ <item name="android:textAppearance">@style/TextAppearance</item>
+ <item name="android:textAppearanceInverse">@style/TextAppearance.Inverse</item>
+ <item name="android:textAppearanceLarge">@style/TextAppearance.Large</item>
+ <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
+ <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
+ <item name="android:textAppearanceLargeInverse">@style/TextAppearance.Large.Inverse</item>
+ <item name="android:textAppearanceMediumInverse">@style/TextAppearance.Medium.Inverse</item>
+ <item name="android:textAppearanceSmallInverse">@style/TextAppearance.Small.Inverse</item>
+
+ <item name="colorAccent">@color/action_orange</item>
+
+ <item name="actionBarTheme">@style/GeckoActionBar</item>
+ </style>
+
+ <style name="Gecko.Dialog" parent="GeckoDialogBase"/>
+
+ <style name="Gecko.TitleDialog" parent="GeckoTitleDialogBase"/>
+
+ <!--
+ Activity based themes, dependent on API level. This theme is replaced
+ by GeckoAppBase from res/values-vXX/themes.xml on newer devices.
+ -->
+ <style name="GeckoAppBase" parent="Gecko">
+ <item name="android:buttonStyle">@style/Widget.Button</item>
+ <item name="android:dropDownItemStyle">@style/Widget.DropDownItem</item>
+ <item name="android:editTextStyle">@style/Widget.EditText</item>
+ <item name="android:textViewStyle">@style/Widget.TextView</item>
+ <item name="menuItemDefaultStyle">@style/Widget.MenuItemDefault</item>
+ </style>
+
+ <!-- All customizations that are NOT specific to a particular API-level can go here. -->
+ <style name="Gecko.App" parent="GeckoAppBase">
+ <item name="android:gridViewStyle">@style/Widget.GridView</item>
+ <item name="android:spinnerStyle">@style/Widget.Spinner</item>
+ <item name="android:windowBackground">@android:color/white</item>
+ <item name="bookmarksListViewStyle">@style/Widget.BookmarksListView</item>
+ <item name="tabGridLayoutViewStyle">@style/Widget.TabsGridLayout</item>
+ <item name="geckoMenuListViewStyle">@style/Widget.GeckoMenuListView</item>
+ <item name="homeListViewStyle">@style/Widget.HomeListView</item>
+ <item name="menuItemActionBarStyle">@style/Widget.MenuItemActionBar</item>
+ <item name="menuItemActionModeStyle">@style/GeckoActionBar.Button</item>
+ <item name="topSitesGridItemViewStyle">@style/Widget.TopSitesGridItemView</item>
+ <item name="topSitesGridViewStyle">@style/Widget.TopSitesGridView</item>
+ <item name="topSitesThumbnailViewStyle">@style/Widget.TopSitesThumbnailView</item>
+ </style>
+
+ <!-- Make an activity appear like an overlay. -->
+ <style name="OverlayActivity" parent="Gecko">
+ <item name="android:windowBackground">@android:color/transparent</item>
+ <item name="android:windowNoTitle">true</item>
+ <item name="android:windowIsTranslucent">true</item>
+ <item name="android:backgroundDimEnabled">true</item>
+
+ <!-- Set the app's title bar color in the recent app switcher.
+
+ Note: We'd prefer not to show up in the recent app switcher (bug 1137928). -->
+ <item name="android:colorPrimary">@color/text_and_tabs_tray_grey</item>
+ <!-- We display the overlay on top of other Activities so show their status bar. -->
+ <item name="android:statusBarColor">@android:color/transparent</item>
+ </style>
+
+</resources>
diff --git a/mobile/android/base/resources/values/vpi__attrs.xml b/mobile/android/base/resources/values/vpi__attrs.xml
new file mode 100644
index 000000000..ffe895f22
--- /dev/null
+++ b/mobile/android/base/resources/values/vpi__attrs.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 Jake Wharton
+ Copyright (C) 2011 Patrik Ã…kerfeldt
+
+ 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.
+-->
+
+<resources>
+ <declare-styleable name="ViewPagerIndicator">
+ <!-- Style of the circle indicator. -->
+ <attr name="vpiCirclePageIndicatorStyle" format="reference"/>
+ <!-- Style of the icon indicator's views. -->
+ <attr name="vpiIconPageIndicatorStyle" format="reference"/>
+ <!-- Style of the line indicator. -->
+ <attr name="vpiLinePageIndicatorStyle" format="reference"/>
+ <!-- Style of the title indicator. -->
+ <attr name="vpiTitlePageIndicatorStyle" format="reference"/>
+ <!-- Style of the tab indicator's tabs. -->
+ <attr name="vpiTabPageIndicatorStyle" format="reference"/>
+ <!-- Style of the underline indicator. -->
+ <attr name="vpiUnderlinePageIndicatorStyle" format="reference"/>
+ </declare-styleable>
+
+ <attr name="centered" format="boolean" />
+ <attr name="selectedColor" format="color" />
+ <attr name="strokeWidth" format="dimension" />
+ <attr name="unselectedColor" format="color" />
+
+ <declare-styleable name="CirclePageIndicator">
+ <!-- Whether or not the indicators should be centered. -->
+ <attr name="centered" />
+ <!-- Color of the filled circle that represents the current page. -->
+ <attr name="fillColor" format="color" />
+ <!-- Color of the filled circles that represents pages. -->
+ <attr name="pageColor" format="color" />
+ <!-- Orientation of the indicator. -->
+ <attr name="android:orientation"/>
+ <!-- Radius of the circles. This is also the spacing between circles. -->
+ <attr name="radius" format="dimension" />
+ <!-- Whether or not the selected indicator snaps to the circles. -->
+ <attr name="snap" format="boolean" />
+ <!-- Color of the open circles. -->
+ <attr name="strokeColor" format="color" />
+ <!-- Width of the stroke used to draw the circles. -->
+ <attr name="strokeWidth" />
+ <!-- View background -->
+ <attr name="android:background"/>
+ </declare-styleable>
+</resources>
diff --git a/mobile/android/base/resources/values/vpi__defaults.xml b/mobile/android/base/resources/values/vpi__defaults.xml
new file mode 100644
index 000000000..f902f48a8
--- /dev/null
+++ b/mobile/android/base/resources/values/vpi__defaults.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 Jake Wharton
+
+ 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.
+-->
+
+<resources>
+ <bool name="default_circle_indicator_centered">true</bool>
+ <color name="default_circle_indicator_fill_color">#FFFFFFFF</color>
+ <color name="default_circle_indicator_page_color">#00000000</color>
+ <integer name="default_circle_indicator_orientation">0</integer>
+ <dimen name="default_circle_indicator_radius">3dp</dimen>
+ <bool name="default_circle_indicator_snap">false</bool>
+ <color name="default_circle_indicator_stroke_color">#FFDDDDDD</color>
+ <dimen name="default_circle_indicator_stroke_width">1dp</dimen>
+</resources> \ No newline at end of file
diff --git a/mobile/android/base/resources/xml-v11/preference_headers.xml b/mobile/android/base/resources/xml-v11/preference_headers.xml
new file mode 100644
index 000000000..dedd90806
--- /dev/null
+++ b/mobile/android/base/resources/xml-v11/preference_headers.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- Tablet only: Sync is nested within the "General" header on tablets,
+ instead of being a top-level menu item.
+ See xml-v11/preferences.xml for single-pane v11+ phone layout. -->
+
+<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
+ android:title="@string/pref_header_general"
+ android:id="@+id/pref_header_general">
+ <extra android:name="resource"
+ android:value="preferences_general_tablet"/>
+ </header>
+
+ <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
+ android:title="@string/pref_header_search"
+ android:id="@+id/pref_header_search">
+ <extra android:name="resource"
+ android:value="preferences_search"/>
+ </header>
+
+ <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
+ android:title="@string/pref_header_privacy_short"
+ android:id="@+id/pref_header_privacy">
+ <extra android:name="resource"
+ android:value="preferences_privacy"/>
+ </header>
+
+ <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
+ android:title="@string/pref_header_accessibility"
+ android:id="@+id/pref_header_accessibility">
+ <extra android:name="resource"
+ android:value="preferences_accessibility"/>
+ </header>
+
+ <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
+ android:title="@string/pref_header_notifications"
+ android:id="@+id/pref_header_notifications">
+ <extra android:name="resource"
+ android:value="preferences_notifications"/>
+ </header>
+
+ <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
+ android:title="@string/pref_header_advanced"
+ android:id="@+id/pref_header_advanced">
+ <extra android:name="resource"
+ android:value="preferences_advanced"/>
+ </header>
+
+ <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
+ android:title="@string/pref_clear_private_data_now"
+ android:id="@+id/pref_header_clear_private_data">
+ <extra android:name="resource"
+ android:value="preferences_privacy_clear_tablet"/>
+ </header>
+
+ <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
+ android:title="@string/pref_default_browser"
+ android:id="@+id/pref_header_default_browser">
+ <extra android:name="resource"
+ android:value="preferences_default_browser_tablet"/>
+ </header>
+
+ <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
+ android:title="@string/pref_header_vendor">
+ <extra android:name="resource"
+ android:value="preferences_vendor"/>
+ </header>
+
+</preference-headers>
diff --git a/mobile/android/base/resources/xml-v11/preferences_default_browser_tablet.xml b/mobile/android/base/resources/xml-v11/preferences_default_browser_tablet.xml
new file mode 100644
index 000000000..53c2c2b56
--- /dev/null
+++ b/mobile/android/base/resources/xml-v11/preferences_default_browser_tablet.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+- License, v. 2.0. If a copy of the MPL was not distributed with this
+- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto">
+ <org.mozilla.gecko.preferences.LinkPreference android:key="android.not_a_preference.default_browser.link"
+ android:title="@string/pref_default_browser_mozilla_support_tablet"
+ android:persistent="false"
+ url="https://support.mozilla.org/kb/make-firefox-default-browser-android?utm_source=inproduct&amp;utm_medium=settings&amp;utm_campaign=mobileandroid"/>
+</PreferenceScreen> \ No newline at end of file
diff --git a/mobile/android/base/resources/xml-v11/preferences_privacy_clear_tablet.xml b/mobile/android/base/resources/xml-v11/preferences_privacy_clear_tablet.xml
new file mode 100644
index 000000000..49cc895c4
--- /dev/null
+++ b/mobile/android/base/resources/xml-v11/preferences_privacy_clear_tablet.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+- License, v. 2.0. If a copy of the MPL was not distributed with this
+- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto">
+ <org.mozilla.gecko.preferences.PrivateDataPreference
+ android:key="android.not_a_preference.privacy.clear"
+ android:title="@string/pref_clear_private_data_now_tablet"
+ android:persistent="true"
+ android:positiveButtonText="@string/button_clear_data"
+ gecko:entries="@array/pref_private_data_entries"
+ gecko:entryValues="@array/pref_private_data_values"
+ gecko:entryKeys="@array/pref_private_data_keys"
+ gecko:initialValues="@array/pref_private_data_defaults" />
+</PreferenceScreen>
diff --git a/mobile/android/base/resources/xml-v11/preferences_search.xml b/mobile/android/base/resources/xml-v11/preferences_search.xml
new file mode 100644
index 000000000..937b05b61
--- /dev/null
+++ b/mobile/android/base/resources/xml-v11/preferences_search.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto"
+ android:title="@string/pref_category_search"
+ android:enabled="false">
+
+ <PreferenceCategory android:title="@string/pref_category_add_search_providers">
+
+ <org.mozilla.gecko.preferences.ModifiableHintPreference
+ android:layout="@layout/preference_search_tip"
+ android:enabled="false"
+ android:selectable="false"/>
+
+ </PreferenceCategory>
+
+ <org.mozilla.gecko.preferences.SearchPreferenceCategory
+ android:title="@string/pref_category_installed_search_engines"/>
+
+ <CheckBoxPreference android:key="browser.search.suggest.enabled"
+ android:title="@string/pref_search_suggestions"
+ android:defaultValue="false"
+ android:persistent="false" />
+
+ <CheckBoxPreference android:key="android.not_a_preference.search.search_history.enabled"
+ android:title="@string/pref_history_search_suggestions"
+ android:defaultValue="true"
+ android:persistent="true" />
+
+</PreferenceScreen>
diff --git a/mobile/android/base/resources/xml/preference_headers.xml b/mobile/android/base/resources/xml/preference_headers.xml
new file mode 100644
index 000000000..e17c9bd77
--- /dev/null
+++ b/mobile/android/base/resources/xml/preference_headers.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- This file is a stub to allow IDs to be used in code
+ even for a version-limited build. -->
+
+<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
+ <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
+ android:id="@+id/pref_header_search">
+ </header>
+ <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
+ android:id="@+id/pref_header_notifications">
+ </header>
+ <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
+ android:id="@+id/pref_header_advanced">
+ </header>
+ <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
+ android:id="@+id/pref_header_accessibility">
+ </header>
+ <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
+ android:id="@+id/pref_header_clear_private_data">
+ </header>
+</preference-headers>
diff --git a/mobile/android/base/resources/xml/preferences.xml b/mobile/android/base/resources/xml/preferences.xml
new file mode 100644
index 000000000..06716cd9a
--- /dev/null
+++ b/mobile/android/base/resources/xml/preferences.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- See xml-v11/preference_headers.xml for tablet layout. -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto"
+ android:enabled="false">
+
+ <org.mozilla.gecko.preferences.SyncPreference android:key="android.not_a_preference.sync"
+ android:title="@string/pref_sync"
+ android:icon="@drawable/sync_avatar_default"
+ android:summary="@string/pref_sync_summary"
+ android:persistent="false" />
+
+ <PreferenceScreen android:title="@string/pref_category_general"
+ android:summary="@string/pref_category_general_summary"
+ android:key="android.not_a_preference.general_screen"
+ android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
+ <extra android:name="resource"
+ android:value="preferences_general"/>
+ </PreferenceScreen>
+
+ <PreferenceScreen android:title="@string/pref_category_search"
+ android:summary="@string/pref_category_search_summary"
+ android:key="android.not_a_preference.search_screen"
+ android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
+ <extra android:name="resource"
+ android:value="preferences_search"/>
+ </PreferenceScreen>
+
+ <PreferenceScreen android:title="@string/pref_category_privacy_short"
+ android:summary="@string/pref_category_privacy_summary"
+ android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
+ <extra android:name="resource"
+ android:value="preferences_privacy" />
+ </PreferenceScreen>
+
+ <PreferenceScreen android:title="@string/pref_category_accessibility"
+ android:summary="@string/pref_category_accessibility_summary"
+ android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
+ <extra android:name="resource"
+ android:value="preferences_accessibility" />
+ </PreferenceScreen>
+
+ <PreferenceScreen android:title="@string/pref_category_notifications"
+ android:summary="@string/pref_category_notifications_summary"
+ android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment">
+ <extra android:name="resource"
+ android:value="preferences_notifications"/>
+ </PreferenceScreen>
+
+ <PreferenceScreen android:title="@string/pref_category_advanced"
+ android:summary="@string/pref_category_advanced_summary"
+ android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
+ android:key="android.not_a_preference.advanced_screen" >
+ <extra android:name="resource"
+ android:value="preferences_advanced"/>
+ </PreferenceScreen>
+
+ <org.mozilla.gecko.preferences.PrivateDataPreference
+ android:key="android.not_a_preference.privacy.clear"
+ android:title="@string/pref_clear_private_data_now"
+ android:persistent="true"
+ android:positiveButtonText="@string/button_clear_data"
+ gecko:entries="@array/pref_private_data_entries"
+ gecko:entryValues="@array/pref_private_data_values"
+ gecko:entryKeys="@array/pref_private_data_keys"
+ gecko:initialValues="@array/pref_private_data_defaults" />
+
+ <org.mozilla.gecko.preferences.LinkPreference android:key="android.not_a_preference.default_browser.link"
+ android:title="@string/pref_default_browser"
+ android:persistent="false"
+ url="https://support.mozilla.org/kb/make-firefox-default-browser-android?utm_source=inproduct&amp;utm_medium=settings&amp;utm_campaign=mobileandroid"/>
+
+ <PreferenceScreen android:title="@string/pref_category_vendor"
+ android:summary="@string/pref_category_vendor_summary"
+ android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
+ <extra android:name="resource"
+ android:value="preferences_vendor"/>
+ </PreferenceScreen>
+
+</PreferenceScreen>
diff --git a/mobile/android/base/resources/xml/preferences_accessibility.xml b/mobile/android/base/resources/xml/preferences_accessibility.xml
new file mode 100644
index 000000000..8e352f1fd
--- /dev/null
+++ b/mobile/android/base/resources/xml/preferences_accessibility.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ android:title="@string/pref_category_accessibility"
+ android:enabled="false">
+
+ <org.mozilla.gecko.preferences.FontSizePreference
+ android:key="font.size.inflation.minTwips"
+ android:title="@string/pref_text_size"
+ android:positiveButtonText="@string/pref_font_size_set"
+ android:negativeButtonText="@string/button_cancel"
+ android:persistent="false" />
+
+ <SwitchPreference android:key="browser.ui.zoom.force-user-scalable"
+ android:title="@string/pref_zoom_force_enabled"
+ android:summary="@string/pref_zoom_force_enabled_summary" />
+
+ <SwitchPreference android:key="ui.zoomedview.enabled"
+ android:title="@string/pref_magnifying_glass_enabled"
+ android:summary="@string/pref_magnifying_glass_enabled_summary" />
+
+ <SwitchPreference android:key="android.not_a_preference.voice_input_enabled"
+ android:title="@string/pref_voice_input"
+ android:summary="@string/pref_voice_input_summary"
+ android:defaultValue="true"/>
+
+ <SwitchPreference android:key="android.not_a_preference.qrcode_enabled"
+ android:title="@string/pref_qrcode_enabled"
+ android:summary="@string/pref_qrcode_enabled_summary"
+ android:defaultValue="true"/>
+
+</PreferenceScreen>
diff --git a/mobile/android/base/resources/xml/preferences_advanced.xml b/mobile/android/base/resources/xml/preferences_advanced.xml
new file mode 100644
index 000000000..32cdf0b91
--- /dev/null
+++ b/mobile/android/base/resources/xml/preferences_advanced.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto"
+ android:title="@string/pref_category_advanced"
+ android:enabled="false">
+
+ <org.mozilla.gecko.preferences.AndroidImportPreference
+ android:key="android.not_a_preference.import_android"
+ gecko:entries="@array/pref_import_android_entries"
+ gecko:entryValues="@array/pref_import_android_values"
+ gecko:initialValues="@array/pref_import_android_defaults"
+ android:title="@string/pref_import_android"
+ android:summary="@string/pref_import_android_summary"
+ android:positiveButtonText="@string/bookmarkhistory_button_import"
+ android:negativeButtonText="@string/button_cancel"
+ android:persistent="false" />
+
+ <ListPreference android:key="app.update.autodownload"
+ android:title="@string/pref_update_autodownload"
+ android:entries="@array/pref_update_autodownload_entries"
+ android:entryValues="@array/pref_update_autodownload_values"
+ android:persistent="false" />
+
+ <ListPreference android:key="android.not_a_preference.restoreSession3"
+ android:title="@string/pref_restore"
+ android:defaultValue="always"
+ android:entries="@array/pref_restore_entries"
+ android:entryValues="@array/pref_restore_values"
+ android:persistent="true" />
+
+ <ListPreference android:key="browser.menu.showCharacterEncoding"
+ android:title="@string/pref_char_encoding"
+ android:entries="@array/pref_char_encoding_entries"
+ android:entryValues="@array/pref_char_encoding_values"
+ android:persistent="false" />
+
+ <PreferenceCategory android:title="@string/pref_category_data_saver">
+
+ <ListPreference android:key="browser.image_blocking"
+ android:title="@string/pref_tap_to_load_images_title2"
+ android:entries="@array/pref_browser_image_blocking_entries"
+ android:entryValues="@array/pref_browser_image_blocking_values"
+ android:persistent="false" />
+
+ <SwitchPreference android:key="browser.display.use_document_fonts"
+ android:title="@string/pref_show_web_fonts"
+ android:summary="@string/pref_show_web_fonts_summary"/>
+
+ </PreferenceCategory>
+
+ <PreferenceCategory android:title="@string/pref_category_media">
+
+ <ListPreference android:key="plugin.enable"
+ android:title="@string/pref_plugins"
+ android:entries="@array/pref_plugins_entries"
+ android:entryValues="@array/pref_plugins_values"
+ android:persistent="false" />
+
+ <SwitchPreference android:key="media.autoplay.enabled"
+ android:title="@string/pref_media_autoplay_enabled"
+ android:summary="@string/pref_media_autoplay_enabled_summary" />
+
+ </PreferenceCategory>
+
+ <PreferenceCategory android:title="@string/pref_category_developer_tools">
+
+ <SwitchPreference android:key="devtools.remote.usb.enabled"
+ android:title="@string/pref_developer_remotedebugging_usb" />
+
+ <SwitchPreference android:key="devtools.remote.wifi.enabled"
+ android:title="@string/pref_developer_remotedebugging_wifi" />
+
+ <org.mozilla.gecko.preferences.AlignRightLinkPreference android:key="android.not_a_preference.remote_debugging.link"
+ android:title="@string/pref_learn_more"
+ android:persistent="false"
+ url="https://developer.mozilla.org/docs/Tools/Remote_Debugging/Debugging_Firefox_for_Android_with_WebIDE" />
+ </PreferenceCategory>
+
+ <PreferenceCategory
+ android:key="android.not_a_preference.category_experimental"
+ android:title="@string/pref_category_experimental">
+
+ <SwitchPreference android:key="android.not_a_preference.activitystream"
+ android:title="@string/pref_activity_stream"
+ android:summary="@string/pref_activity_stream_summary"
+ android:defaultValue="false" />
+
+
+ <SwitchPreference android:key="android.not_a_preference.customtabs"
+ android:title="@string/pref_custom_tabs"
+ android:summary="@string/pref_custom_tabs_summary"
+ android:defaultValue="false" />
+
+ </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/mobile/android/base/resources/xml/preferences_general.xml b/mobile/android/base/resources/xml/preferences_general.xml
new file mode 100644
index 000000000..f50bceb55
--- /dev/null
+++ b/mobile/android/base/resources/xml/preferences_general.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- Changes should be mirrored to preferences_general_tablet.xml. -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto"
+ android:enabled="false">
+
+ <PreferenceScreen android:key="android.not_a_preference.general_home"
+ android:title="@string/pref_category_home"
+ android:summary="@string/pref_category_home_summary"
+ android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
+ <extra android:name="resource"
+ android:value="preferences_home" />
+ </PreferenceScreen>
+
+ <PreferenceScreen android:title="@string/pref_category_language"
+ android:summary="@string/pref_category_language_summary"
+ android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
+ <extra android:name="resource"
+ android:value="preferences_locale" />
+ </PreferenceScreen>
+
+ <SwitchPreference android:key="browser.chrome.dynamictoolbar"
+ android:title="@string/pref_scroll_title_bar2"
+ android:summary="@string/pref_scroll_title_bar_summary" />
+
+ <SwitchPreference android:key="android.not_a_preference.tab_queue"
+ android:title="@string/pref_tab_queue_title"
+ android:summary="@string/pref_tab_queue_summary"
+ android:defaultValue="false" />
+
+</PreferenceScreen>
+
diff --git a/mobile/android/base/resources/xml/preferences_general_tablet.xml b/mobile/android/base/resources/xml/preferences_general_tablet.xml
new file mode 100644
index 000000000..f05be9827
--- /dev/null
+++ b/mobile/android/base/resources/xml/preferences_general_tablet.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- Tablet only: The contents under the "General" header for tablets,
+ See xml-v11/preferences.xml for single-pane v11+ phone layout.
+ Changes to preferences should be mirrored to preferences_general.xml. -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ android:title="@string/pref_category_general"
+ android:enabled="false">
+
+ <org.mozilla.gecko.preferences.SyncPreference android:key="android.not_a_preference.sync"
+ android:title="@string/pref_sync"
+ android:persistent="false" />
+
+ <PreferenceScreen android:key="android.not_a_preference.general_home"
+ android:title="@string/pref_category_home"
+ android:summary="@string/pref_category_home_summary"
+ android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
+ <extra android:name="resource"
+ android:value="preferences_home" />
+ </PreferenceScreen>
+
+ <PreferenceScreen android:title="@string/pref_category_language"
+ android:summary="@string/pref_category_language_summary"
+ android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
+ <extra android:name="resource"
+ android:value="preferences_locale" />
+ </PreferenceScreen>
+
+ <SwitchPreference android:key="browser.chrome.dynamictoolbar"
+ android:title="@string/pref_scroll_title_bar2"
+ android:summary="@string/pref_scroll_title_bar_summary" />
+
+ <SwitchPreference android:key="android.not_a_preference.tab_queue"
+ android:title="@string/pref_tab_queue_title"
+ android:summary="@string/pref_tab_queue_summary"
+ android:defaultValue="false" />
+
+</PreferenceScreen>
+
diff --git a/mobile/android/base/resources/xml/preferences_home.xml b/mobile/android/base/resources/xml/preferences_home.xml
new file mode 100644
index 000000000..ecc90e093
--- /dev/null
+++ b/mobile/android/base/resources/xml/preferences_home.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ android:title="@string/pref_category_home"
+ android:enabled="false">
+
+ <PreferenceCategory android:title="@string/pref_category_home_homepage"
+ android:key="android.not_a_preference.category_homepage">
+
+ <org.mozilla.gecko.preferences.SetHomepagePreference
+ android:key="android.not_a_preference.homepage"
+ android:title="@string/home_homepage_title"
+ android:persistent="false"
+ android:dialogLayout="@layout/preference_set_homepage"/>
+
+ </PreferenceCategory>
+
+ <org.mozilla.gecko.preferences.PanelsPreferenceCategory
+ android:title="@string/pref_category_home_panels"/>
+
+ <PreferenceCategory android:title="@string/pref_category_home_add_ons">
+
+ <ListPreference android:key="home.sync.updateMode"
+ android:title="@string/pref_home_updates"
+ android:entries="@array/pref_home_updates_entries"
+ android:entryValues="@array/pref_home_updates_values"
+ android:persistent="false" />
+
+ </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/mobile/android/base/resources/xml/preferences_locale.xml b/mobile/android/base/resources/xml/preferences_locale.xml
new file mode 100644
index 000000000..80173c8e0
--- /dev/null
+++ b/mobile/android/base/resources/xml/preferences_locale.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto"
+ android:title="@string/pref_category_language"
+ android:enabled="false">
+ <PreferenceCategory android:title="@string/pref_browser_locale">
+ <!-- No title set here. We set the title to the current locale in
+ GeckoPreferences. -->
+ <org.mozilla.gecko.preferences.LocaleListPreference
+ android:key="locale"
+ android:persistent="true"
+ android:defaultValue=""
+ />
+ </PreferenceCategory>
+</PreferenceScreen>
diff --git a/mobile/android/base/resources/xml/preferences_notifications.xml b/mobile/android/base/resources/xml/preferences_notifications.xml
new file mode 100644
index 000000000..b9080d110
--- /dev/null
+++ b/mobile/android/base/resources/xml/preferences_notifications.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+ <SwitchPreference android:key="android.not_a_preference.notifications.content"
+ android:title="@string/pref_content_notifications"
+ android:summary="@string/pref_content_notifications_summary"
+ android:defaultValue="true" />
+ <org.mozilla.gecko.preferences.AlignRightLinkPreference
+ android:key="android.not_a_preference.notifications.content.learn_more"
+ android:title="@string/pref_learn_more"
+ android:persistent="false"
+ url="https://support.mozilla.org/kb/notifications-firefox-android?utm_source=inproduct&amp;utm_medium=notifications&amp;utm_campaign=mobileandroid" />
+ <SwitchPreference android:key="android.not_a_preference.notifications.whats_new"
+ android:title="@string/pref_whats_new_notification"
+ android:summary="@string/pref_whats_new_notification_summary"
+ android:defaultValue="true" />
+</PreferenceScreen> \ No newline at end of file
diff --git a/mobile/android/base/resources/xml/preferences_privacy.xml b/mobile/android/base/resources/xml/preferences_privacy.xml
new file mode 100644
index 000000000..7b3215cb2
--- /dev/null
+++ b/mobile/android/base/resources/xml/preferences_privacy.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto"
+ android:title="@string/pref_category_privacy_short"
+ android:enabled="false">
+
+ <SwitchPreference android:key="privacy.donottrackheader.enabled"
+ android:title="@string/pref_donottrack_title"
+ android:summary="@string/pref_donottrack_summary"
+ android:persistent="false" />
+
+ <org.mozilla.gecko.preferences.AlignRightLinkPreference
+ android:key="android.not_a_preference.donottrackheader.learn_more"
+ android:title="@string/pref_learn_more"
+ android:persistent="false"
+ url="https://www.mozilla.org/firefox/dnt/" />
+
+ <CheckBoxPreference android:key="privacy.trackingprotection.pbmode.enabled"
+ android:title="@string/pref_tracking_protection_title"
+ android:summary="@string/pref_tracking_protection_summary"
+ android:persistent="false" />
+
+ <ListPreference android:key="privacy.trackingprotection.state"
+ android:title="@string/pref_tracking_protection_title"
+ android:entries="@array/pref_tracking_protection_entries"
+ android:entryValues="@array/pref_tracking_protection_values"
+ android:persistent="false" />
+
+ <org.mozilla.gecko.preferences.AlignRightLinkPreference
+ android:key="android.not_a_preference.trackingprotection.learn_more"
+ android:title="@string/pref_learn_more"
+ android:persistent="false"
+ url="https://support.mozilla.org/kb/firefox-android-tracking-protection" />
+
+ <ListPreference android:key="network.cookie.cookieBehavior"
+ android:title="@string/pref_cookies_menu"
+ android:entries="@array/pref_cookies_entries"
+ android:entryValues="@array/pref_cookies_values"
+ android:persistent="false" />
+
+
+ <!-- This pref is persisted in both Gecko and Java -->
+ <org.mozilla.gecko.preferences.ListCheckboxPreference
+ android:key="android.not_a_preference.history.clear_on_exit"
+ gecko:entries="@array/pref_private_data_entries"
+ gecko:entryValues="@array/pref_private_data_values"
+ gecko:initialValues="@array/pref_clear_on_exit_defaults"
+
+ android:title="@string/pref_clear_on_exit_title"
+ android:summary="@string/pref_clear_on_exit_summary2"
+
+ android:dialogTitle="@string/pref_clear_on_exit_dialog_title"
+ android:positiveButtonText="@string/button_set"/>
+
+ <PreferenceCategory android:title="@string/pref_category_logins">
+
+ <org.mozilla.gecko.preferences.LinkPreference
+ android:key="android.not_a_preference.signon.manage"
+ android:title="@string/pref_manage_logins"
+ url="about:logins"/>
+
+ <CheckBoxPreference
+ android:key="signon.rememberSignons"
+ android:title="@string/pref_remember_signons"
+ android:persistent="false" />
+
+ <CheckBoxPreference
+ android:key="privacy.masterpassword.enabled"
+ android:title="@string/pref_use_master_password"
+ android:persistent="false" />
+
+ </PreferenceCategory>
+
+ <PreferenceCategory android:key="android.not_a_preference.datareporting.preferences"
+ android:title="@string/pref_category_datareporting">
+
+ <CheckBoxPreference android:key="toolkit.telemetry.enabled"
+ android:title="@string/datareporting_telemetry_title"
+ android:summary="@string/datareporting_telemetry_summary" />
+
+ <CheckBoxPreference android:key="datareporting.crashreporter.submitEnabled"
+ android:title="@string/datareporting_crashreporter_title_short"
+ android:summary="@string/datareporting_crashreporter_summary"
+ android:defaultValue="false" />
+
+ <CheckBoxPreference android:key="android.not_a_preference.app.geo.reportdata"
+ android:title="@string/datareporting_wifi_title"
+ android:summary="@string/datareporting_wifi_geolocation_summary" />
+
+ <org.mozilla.gecko.preferences.AlignRightLinkPreference android:key="android.not_a_preference.geo.learn_more"
+ android:title="@string/pref_learn_more"
+ android:persistent="false"
+ url="https://location.services.mozilla.com/" />
+
+ <CheckBoxPreference android:key="android.not_a_preference.healthreport.uploadEnabled"
+ android:title="@string/datareporting_fhr_title"
+ android:summary="@string/datareporting_fhr_summary2"
+ android:defaultValue="true" />
+
+ <org.mozilla.gecko.preferences.AlignRightLinkPreference android:key="android.not_a_preference.healthreport.link"
+ android:title="@string/datareporting_abouthr_title"
+ android:persistent="false"
+ url="about:healthreport" />
+
+ </PreferenceCategory>
+
+</PreferenceScreen>
+
+
diff --git a/mobile/android/base/resources/xml/preferences_search.xml b/mobile/android/base/resources/xml/preferences_search.xml
new file mode 100644
index 000000000..440167fe5
--- /dev/null
+++ b/mobile/android/base/resources/xml/preferences_search.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto"
+ android:title="@string/pref_category_search"
+ android:enabled="false">
+
+ <PreferenceCategory android:title="@string/pref_category_add_search_providers">
+
+ <org.mozilla.gecko.preferences.ModifiableHintPreference
+ android:layout="@layout/preference_search_tip"
+ android:enabled="false"
+ android:selectable="false"/>
+
+ </PreferenceCategory>
+
+ <org.mozilla.gecko.preferences.SearchPreferenceCategory
+ android:title="@string/pref_category_installed_search_engines"/>
+
+ <PreferenceCategory android:title="@string/pref_category_search_restore_defaults">
+
+ <Preference android:key="android.not_a_preference.search.restore_defaults"
+ android:title="@string/pref_search_restore_defaults_summary" />
+
+ </PreferenceCategory>
+
+ <CheckBoxPreference android:key="browser.search.suggest.enabled"
+ android:title="@string/pref_search_suggestions"
+ android:defaultValue="false"
+ android:persistent="false" />
+
+ <CheckBoxPreference android:key="android.not_a_preference.search.search_history.enabled"
+ android:title="@string/pref_history_search_suggestions"
+ android:defaultValue="true"
+ android:persistent="true" />
+
+</PreferenceScreen>
diff --git a/mobile/android/base/resources/xml/preferences_vendor.xml b/mobile/android/base/resources/xml/preferences_vendor.xml
new file mode 100644
index 000000000..38eba9d30
--- /dev/null
+++ b/mobile/android/base/resources/xml/preferences_vendor.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:gecko="http://schemas.android.com/apk/res-auto"
+ android:title="@string/pref_category_vendor"
+ android:enabled="false">
+
+ <org.mozilla.gecko.preferences.LinkPreference android:key="android.not_a_preference.about.link"
+ android:title="@string/pref_about_firefox"
+ android:persistent="false"
+ url="about:" />
+
+ <org.mozilla.gecko.preferences.LinkPreference android:key="android.not_a_preference.faq.link"
+ android:title="@string/pref_vendor_faqs"
+ android:persistent="false"/>
+
+ <org.mozilla.gecko.preferences.LinkPreference android:key="android.not_a_preference.feedback.link"
+ android:title="@string/pref_vendor_feedback"
+ android:persistent="false"/>
+
+</PreferenceScreen>
diff --git a/mobile/android/base/resources/xml/search_preferences.xml b/mobile/android/base/resources/xml/search_preferences.xml
new file mode 100644
index 000000000..510e3f425
--- /dev/null
+++ b/mobile/android/base/resources/xml/search_preferences.xml
@@ -0,0 +1,9 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+ <Preference
+ android:key="search.not_a_preference.clear_history"
+ android:title="@string/pref_clearHistory_title"/>
+</PreferenceScreen>
diff --git a/mobile/android/base/resources/xml/search_widget_info.xml b/mobile/android/base/resources/xml/search_widget_info.xml
new file mode 100644
index 000000000..7fd66f7ed
--- /dev/null
+++ b/mobile/android/base/resources/xml/search_widget_info.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+ android:minWidth="250dp"
+ android:minHeight="40dp"
+ android:label="@string/search_widget_name"
+ android:widgetCategory="home_screen"
+ android:previewImage="@drawable/launcher_widget"
+ android:initialLayout="@layout/search_widget"/>
diff --git a/mobile/android/base/resources/xml/searchable.xml b/mobile/android/base/resources/xml/searchable.xml
new file mode 100644
index 000000000..3cd7333bd
--- /dev/null
+++ b/mobile/android/base/resources/xml/searchable.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<searchable xmlns:android="http://schemas.android.com/apk/res/android"
+ android:label="@string/moz_app_displayname"
+ android:searchSuggestAuthority="@string/content_authority_db_browser"
+ android:searchSuggestIntentAction="android.intent.action.SEARCH"
+ android:searchSettingsDescription="@string/searchable_description"
+ android:includeInGlobalSearch="true"/>