diff --git a/android/res/anim-xlarge-v11/home_enter.xml b/android/res/anim-large-v11/home_enter.xml similarity index 100% rename from android/res/anim-xlarge-v11/home_enter.xml rename to android/res/anim-large-v11/home_enter.xml diff --git a/android/res/anim-xlarge-v11/home_exit.xml b/android/res/anim-large-v11/home_exit.xml similarity index 100% rename from android/res/anim-xlarge-v11/home_exit.xml rename to android/res/anim-large-v11/home_exit.xml diff --git a/android/res/drawable-xlarge-mdpi-v11/btn_block_border_default.9.png b/android/res/drawable-hdpi-v11/btn_block_border_default.9.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/btn_block_border_default.9.png rename to android/res/drawable-hdpi-v11/btn_block_border_default.9.png diff --git a/android/res/drawable-xlarge-mdpi-v11/btn_block_border_pressed.9.png b/android/res/drawable-hdpi-v11/btn_block_border_pressed.9.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/btn_block_border_pressed.9.png rename to android/res/drawable-hdpi-v11/btn_block_border_pressed.9.png diff --git a/android/res/drawable-xlarge-mdpi-v11/btn_block_border_selected.9.png b/android/res/drawable-hdpi-v11/btn_block_border_selected.9.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/btn_block_border_selected.9.png rename to android/res/drawable-hdpi-v11/btn_block_border_selected.9.png diff --git a/android/res/drawable-xlarge-mdpi-v11/btn_block_mask.9.png b/android/res/drawable-hdpi-v11/btn_block_mask.9.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/btn_block_mask.9.png rename to android/res/drawable-hdpi-v11/btn_block_mask.9.png diff --git a/android/res/drawable-xlarge-mdpi-v11/btn_default.9.png b/android/res/drawable-hdpi-v11/btn_default.9.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/btn_default.9.png rename to android/res/drawable-hdpi-v11/btn_default.9.png diff --git a/android/res/drawable-xlarge-mdpi-v11/btn_focused.9.png b/android/res/drawable-hdpi-v11/btn_focused.9.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/btn_focused.9.png rename to android/res/drawable-hdpi-v11/btn_focused.9.png diff --git a/android/res/drawable-xlarge-mdpi-v11/btn_pressed.9.png b/android/res/drawable-hdpi-v11/btn_pressed.9.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/btn_pressed.9.png rename to android/res/drawable-hdpi-v11/btn_pressed.9.png diff --git a/android/res/drawable-hdpi-v11/ic_title_export.png b/android/res/drawable-hdpi-v11/ic_title_export.png new file mode 100644 index 0000000..44bac38 Binary files /dev/null and b/android/res/drawable-hdpi-v11/ic_title_export.png differ diff --git a/android/res/drawable-hdpi-v11/ic_title_map.png b/android/res/drawable-hdpi-v11/ic_title_map.png new file mode 100644 index 0000000..5753fd8 Binary files /dev/null and b/android/res/drawable-hdpi-v11/ic_title_map.png differ diff --git a/android/res/drawable-hdpi-v11/ic_title_refresh.png b/android/res/drawable-hdpi-v11/ic_title_refresh.png new file mode 100644 index 0000000..5aa8ad6 Binary files /dev/null and b/android/res/drawable-hdpi-v11/ic_title_refresh.png differ diff --git a/android/res/drawable-hdpi-v11/ic_title_search.png b/android/res/drawable-hdpi-v11/ic_title_search.png new file mode 100644 index 0000000..a1c80bb Binary files /dev/null and b/android/res/drawable-hdpi-v11/ic_title_search.png differ diff --git a/android/res/drawable-hdpi-v11/ic_title_share.png b/android/res/drawable-hdpi-v11/ic_title_share.png new file mode 100644 index 0000000..a77be08 Binary files /dev/null and b/android/res/drawable-hdpi-v11/ic_title_share.png differ diff --git a/android/res/drawable-hdpi-v11/ic_title_today.png b/android/res/drawable-hdpi-v11/ic_title_today.png new file mode 100644 index 0000000..23f224c Binary files /dev/null and b/android/res/drawable-hdpi-v11/ic_title_today.png differ diff --git a/android/res/drawable-xlarge-mdpi-v11/tab_background.9.png b/android/res/drawable-hdpi-v11/tab_background.9.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/tab_background.9.png rename to android/res/drawable-hdpi-v11/tab_background.9.png diff --git a/android/res/drawable-xlarge-mdpi-v11/tab_off_background.9.png b/android/res/drawable-hdpi-v11/tab_off_background.9.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/tab_off_background.9.png rename to android/res/drawable-hdpi-v11/tab_off_background.9.png diff --git a/android/res/drawable-xlarge-mdpi-v11/tab_selected.9.png b/android/res/drawable-hdpi-v11/tab_selected.9.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/tab_selected.9.png rename to android/res/drawable-hdpi-v11/tab_selected.9.png diff --git a/android/res/drawable-xlarge-mdpi-v11/tab_selected_focused.9.png b/android/res/drawable-hdpi-v11/tab_selected_focused.9.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/tab_selected_focused.9.png rename to android/res/drawable-hdpi-v11/tab_selected_focused.9.png diff --git a/android/res/drawable-xlarge-mdpi-v11/tab_selected_pressed.9.png b/android/res/drawable-hdpi-v11/tab_selected_pressed.9.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/tab_selected_pressed.9.png rename to android/res/drawable-hdpi-v11/tab_selected_pressed.9.png diff --git a/android/res/drawable-xlarge-mdpi-v11/tab_unselected.9.png b/android/res/drawable-hdpi-v11/tab_unselected.9.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/tab_unselected.9.png rename to android/res/drawable-hdpi-v11/tab_unselected.9.png diff --git a/android/res/drawable-xlarge-mdpi-v11/tab_unselected_focused.9.png b/android/res/drawable-hdpi-v11/tab_unselected_focused.9.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/tab_unselected_focused.9.png rename to android/res/drawable-hdpi-v11/tab_unselected_focused.9.png diff --git a/android/res/drawable-xlarge-mdpi-v11/tab_unselected_pressed.9.png b/android/res/drawable-hdpi-v11/tab_unselected_pressed.9.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/tab_unselected_pressed.9.png rename to android/res/drawable-hdpi-v11/tab_unselected_pressed.9.png diff --git a/android/res/drawable-xlarge-land-mdpi-v11/home_topleft_strip_raw.png b/android/res/drawable-large-land-mdpi-v11/home_topleft_strip_raw.png similarity index 100% rename from android/res/drawable-xlarge-land-mdpi-v11/home_topleft_strip_raw.png rename to android/res/drawable-large-land-mdpi-v11/home_topleft_strip_raw.png diff --git a/android/res/drawable-xlarge-land-mdpi-v11/thickbar_left_background_default.9.png b/android/res/drawable-large-land-mdpi-v11/thickbar_left_background_default.9.png similarity index 100% rename from android/res/drawable-xlarge-land-mdpi-v11/thickbar_left_background_default.9.png rename to android/res/drawable-large-land-mdpi-v11/thickbar_left_background_default.9.png diff --git a/android/res/drawable-xlarge-land-mdpi-v11/thickbar_left_background_pressed.9.png b/android/res/drawable-large-land-mdpi-v11/thickbar_left_background_pressed.9.png similarity index 100% rename from android/res/drawable-xlarge-land-mdpi-v11/thickbar_left_background_pressed.9.png rename to android/res/drawable-large-land-mdpi-v11/thickbar_left_background_pressed.9.png diff --git a/android/res/drawable-xlarge-land-v11/home_topleft_strip.xml b/android/res/drawable-large-land-v11/home_topleft_strip.xml similarity index 100% rename from android/res/drawable-xlarge-land-v11/home_topleft_strip.xml rename to android/res/drawable-large-land-v11/home_topleft_strip.xml diff --git a/android/res/drawable-xlarge-mdpi-v11/empty_sandbox_background.9.png b/android/res/drawable-large-mdpi-v11/empty_sandbox_background.9.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/empty_sandbox_background.9.png rename to android/res/drawable-large-mdpi-v11/empty_sandbox_background.9.png diff --git a/android/res/drawable-xlarge-mdpi-v11/empty_sessions_background.9.png b/android/res/drawable-large-mdpi-v11/empty_sessions_background.9.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/empty_sessions_background.9.png rename to android/res/drawable-large-mdpi-v11/empty_sessions_background.9.png diff --git a/android/res/drawable-xlarge-mdpi-v11/home_streambox.9.png b/android/res/drawable-large-mdpi-v11/home_streambox.9.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/home_streambox.9.png rename to android/res/drawable-large-mdpi-v11/home_streambox.9.png diff --git a/android/res/drawable-xlarge-mdpi-v11/home_topleft_strip_raw.png b/android/res/drawable-large-mdpi-v11/home_topleft_strip_raw.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/home_topleft_strip_raw.png rename to android/res/drawable-large-mdpi-v11/home_topleft_strip_raw.png diff --git a/android/res/drawable-xlarge-mdpi-v11/ic_close_holo_light.png b/android/res/drawable-large-mdpi-v11/ic_close_holo_light.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/ic_close_holo_light.png rename to android/res/drawable-large-mdpi-v11/ic_close_holo_light.png diff --git a/android/res/drawable-xlarge-mdpi-v11/logo_home.png b/android/res/drawable-large-mdpi-v11/logo_home.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/logo_home.png rename to android/res/drawable-large-mdpi-v11/logo_home.png diff --git a/android/res/drawable-xlarge-mdpi-v11/pane_under_thickbar_background.9.png b/android/res/drawable-large-mdpi-v11/pane_under_thickbar_background.9.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/pane_under_thickbar_background.9.png rename to android/res/drawable-large-mdpi-v11/pane_under_thickbar_background.9.png diff --git a/android/res/drawable-xlarge-mdpi-v11/panel_button_focused_holo.9.png b/android/res/drawable-large-mdpi-v11/panel_button_focused_holo.9.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/panel_button_focused_holo.9.png rename to android/res/drawable-large-mdpi-v11/panel_button_focused_holo.9.png diff --git a/android/res/drawable-xlarge-mdpi-v11/panel_button_pressed_holo.9.png b/android/res/drawable-large-mdpi-v11/panel_button_pressed_holo.9.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/panel_button_pressed_holo.9.png rename to android/res/drawable-large-mdpi-v11/panel_button_pressed_holo.9.png diff --git a/android/res/drawable-xlarge-mdpi-v11/thickbar_left_background_default.9.png b/android/res/drawable-large-mdpi-v11/thickbar_left_background_default.9.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/thickbar_left_background_default.9.png rename to android/res/drawable-large-mdpi-v11/thickbar_left_background_default.9.png diff --git a/android/res/drawable-xlarge-mdpi-v11/thickbar_left_background_pressed.9.png b/android/res/drawable-large-mdpi-v11/thickbar_left_background_pressed.9.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/thickbar_left_background_pressed.9.png rename to android/res/drawable-large-mdpi-v11/thickbar_left_background_pressed.9.png diff --git a/android/res/drawable-xlarge-mdpi-v11/thickbar_right_background.9.png b/android/res/drawable-large-mdpi-v11/thickbar_right_background.9.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/thickbar_right_background.9.png rename to android/res/drawable-large-mdpi-v11/thickbar_right_background.9.png diff --git a/android/res/drawable-xlarge-mdpi-v11/thickbar_shadow.9.png b/android/res/drawable-large-mdpi-v11/thickbar_shadow.9.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/thickbar_shadow.9.png rename to android/res/drawable-large-mdpi-v11/thickbar_shadow.9.png diff --git a/android/res/drawable-xlarge-mdpi-v11/track_dropdown_arrow_dark.png b/android/res/drawable-large-mdpi-v11/track_dropdown_arrow_dark.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/track_dropdown_arrow_dark.png rename to android/res/drawable-large-mdpi-v11/track_dropdown_arrow_dark.png diff --git a/android/res/drawable-xlarge-mdpi-v11/track_dropdown_arrow_light.png b/android/res/drawable-large-mdpi-v11/track_dropdown_arrow_light.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/track_dropdown_arrow_light.png rename to android/res/drawable-large-mdpi-v11/track_dropdown_arrow_light.png diff --git a/android/res/drawable-xlarge-mdpi-v11/whats_on_background.9.png b/android/res/drawable-large-mdpi-v11/whats_on_background.9.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/whats_on_background.9.png rename to android/res/drawable-large-mdpi-v11/whats_on_background.9.png diff --git a/android/res/drawable-xlarge-mdpi-v11/whats_on_button_default.9.png b/android/res/drawable-large-mdpi-v11/whats_on_button_default.9.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/whats_on_button_default.9.png rename to android/res/drawable-large-mdpi-v11/whats_on_button_default.9.png diff --git a/android/res/drawable-xlarge-mdpi-v11/whats_on_button_pressed.9.png b/android/res/drawable-large-mdpi-v11/whats_on_button_pressed.9.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/whats_on_button_pressed.9.png rename to android/res/drawable-large-mdpi-v11/whats_on_button_pressed.9.png diff --git a/android/res/drawable-xlarge-mdpi-v11/whats_on_separator.9.png b/android/res/drawable-large-mdpi-v11/whats_on_separator.9.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/whats_on_separator.9.png rename to android/res/drawable-large-mdpi-v11/whats_on_separator.9.png diff --git a/android/res/drawable-xlarge-nodpi-v11/background_effects.png b/android/res/drawable-large-nodpi-v11/background_effects.png similarity index 100% rename from android/res/drawable-xlarge-nodpi-v11/background_effects.png rename to android/res/drawable-large-nodpi-v11/background_effects.png diff --git a/android/res/drawable-xlarge-v11/home_topleft_strip.xml b/android/res/drawable-large-v11/home_topleft_strip.xml similarity index 100% rename from android/res/drawable-xlarge-v11/home_topleft_strip.xml rename to android/res/drawable-large-v11/home_topleft_strip.xml diff --git a/android/res/drawable-xlarge-v11/panel_button_background.xml b/android/res/drawable-large-v11/panel_button_background.xml similarity index 100% rename from android/res/drawable-xlarge-v11/panel_button_background.xml rename to android/res/drawable-large-v11/panel_button_background.xml diff --git a/android/res/drawable-xlarge-v11/thickbar_left_background_interactive.xml b/android/res/drawable-large-v11/thickbar_left_background_interactive.xml similarity index 100% rename from android/res/drawable-xlarge-v11/thickbar_left_background_interactive.xml rename to android/res/drawable-large-v11/thickbar_left_background_interactive.xml diff --git a/android/res/drawable-xlarge-v11/window_background.xml b/android/res/drawable-large-v11/window_background.xml similarity index 100% rename from android/res/drawable-xlarge-v11/window_background.xml rename to android/res/drawable-large-v11/window_background.xml diff --git a/android/res/drawable-xlarge-v11/window_background_home.xml b/android/res/drawable-large-v11/window_background_home.xml similarity index 100% rename from android/res/drawable-xlarge-v11/window_background_home.xml rename to android/res/drawable-large-v11/window_background_home.xml diff --git a/android/res/drawable-xlarge-mdpi-v11/bezel_border.9.png b/android/res/drawable-mdpi-v11/bezel_border.9.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/bezel_border.9.png rename to android/res/drawable-mdpi-v11/bezel_border.9.png diff --git a/android/res/drawable-xlarge-mdpi-v11/bezel_mask.9.png b/android/res/drawable-mdpi-v11/bezel_mask.9.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/bezel_mask.9.png rename to android/res/drawable-mdpi-v11/bezel_mask.9.png diff --git a/android/res/drawable-mdpi-v11/btn_block_border_default.9.png b/android/res/drawable-mdpi-v11/btn_block_border_default.9.png new file mode 100644 index 0000000..6df084d Binary files /dev/null and b/android/res/drawable-mdpi-v11/btn_block_border_default.9.png differ diff --git a/android/res/drawable-mdpi-v11/btn_block_border_pressed.9.png b/android/res/drawable-mdpi-v11/btn_block_border_pressed.9.png new file mode 100644 index 0000000..a669382 Binary files /dev/null and b/android/res/drawable-mdpi-v11/btn_block_border_pressed.9.png differ diff --git a/android/res/drawable-mdpi-v11/btn_block_border_selected.9.png b/android/res/drawable-mdpi-v11/btn_block_border_selected.9.png new file mode 100644 index 0000000..a669382 Binary files /dev/null and b/android/res/drawable-mdpi-v11/btn_block_border_selected.9.png differ diff --git a/android/res/drawable-mdpi-v11/btn_block_mask.9.png b/android/res/drawable-mdpi-v11/btn_block_mask.9.png new file mode 100644 index 0000000..58c53c0 Binary files /dev/null and b/android/res/drawable-mdpi-v11/btn_block_mask.9.png differ diff --git a/android/res/drawable-xlarge-mdpi-v11/btn_block_star.9.png b/android/res/drawable-mdpi-v11/btn_block_star.9.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/btn_block_star.9.png rename to android/res/drawable-mdpi-v11/btn_block_star.9.png diff --git a/android/res/drawable-mdpi-v11/btn_default.9.png b/android/res/drawable-mdpi-v11/btn_default.9.png new file mode 100644 index 0000000..334caa7 Binary files /dev/null and b/android/res/drawable-mdpi-v11/btn_default.9.png differ diff --git a/android/res/drawable-mdpi-v11/btn_focused.9.png b/android/res/drawable-mdpi-v11/btn_focused.9.png new file mode 100644 index 0000000..3cdfb24 Binary files /dev/null and b/android/res/drawable-mdpi-v11/btn_focused.9.png differ diff --git a/android/res/drawable-mdpi-v11/btn_pressed.9.png b/android/res/drawable-mdpi-v11/btn_pressed.9.png new file mode 100644 index 0000000..46bc8fe Binary files /dev/null and b/android/res/drawable-mdpi-v11/btn_pressed.9.png differ diff --git a/android/res/drawable-xlarge-mdpi-v11/btn_star_off_focused.png b/android/res/drawable-mdpi-v11/btn_star_off_focused.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/btn_star_off_focused.png rename to android/res/drawable-mdpi-v11/btn_star_off_focused.png diff --git a/android/res/drawable-xlarge-mdpi-v11/btn_star_off_normal.png b/android/res/drawable-mdpi-v11/btn_star_off_normal.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/btn_star_off_normal.png rename to android/res/drawable-mdpi-v11/btn_star_off_normal.png diff --git a/android/res/drawable-xlarge-mdpi-v11/btn_star_off_pressed.png b/android/res/drawable-mdpi-v11/btn_star_off_pressed.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/btn_star_off_pressed.png rename to android/res/drawable-mdpi-v11/btn_star_off_pressed.png diff --git a/android/res/drawable-xlarge-mdpi-v11/btn_star_on_focused.png b/android/res/drawable-mdpi-v11/btn_star_on_focused.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/btn_star_on_focused.png rename to android/res/drawable-mdpi-v11/btn_star_on_focused.png diff --git a/android/res/drawable-xlarge-mdpi-v11/btn_star_on_normal.png b/android/res/drawable-mdpi-v11/btn_star_on_normal.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/btn_star_on_normal.png rename to android/res/drawable-mdpi-v11/btn_star_on_normal.png diff --git a/android/res/drawable-xlarge-mdpi-v11/btn_star_on_pressed.png b/android/res/drawable-mdpi-v11/btn_star_on_pressed.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/btn_star_on_pressed.png rename to android/res/drawable-mdpi-v11/btn_star_on_pressed.png diff --git a/android/res/drawable-xlarge-mdpi-v11/colorstrip.png b/android/res/drawable-mdpi-v11/colorstrip.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/colorstrip.png rename to android/res/drawable-mdpi-v11/colorstrip.png diff --git a/android/res/drawable-xlarge-mdpi-v11/ic_title_export.png b/android/res/drawable-mdpi-v11/ic_title_export.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/ic_title_export.png rename to android/res/drawable-mdpi-v11/ic_title_export.png diff --git a/android/res/drawable-xlarge-mdpi-v11/ic_title_map.png b/android/res/drawable-mdpi-v11/ic_title_map.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/ic_title_map.png rename to android/res/drawable-mdpi-v11/ic_title_map.png diff --git a/android/res/drawable-xlarge-mdpi-v11/ic_title_refresh.png b/android/res/drawable-mdpi-v11/ic_title_refresh.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/ic_title_refresh.png rename to android/res/drawable-mdpi-v11/ic_title_refresh.png diff --git a/android/res/drawable-xlarge-mdpi-v11/ic_title_search.png b/android/res/drawable-mdpi-v11/ic_title_search.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/ic_title_search.png rename to android/res/drawable-mdpi-v11/ic_title_search.png diff --git a/android/res/drawable-xlarge-mdpi-v11/ic_title_share.png b/android/res/drawable-mdpi-v11/ic_title_share.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/ic_title_share.png rename to android/res/drawable-mdpi-v11/ic_title_share.png diff --git a/android/res/drawable-xlarge-mdpi-v11/ic_title_today.png b/android/res/drawable-mdpi-v11/ic_title_today.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/ic_title_today.png rename to android/res/drawable-mdpi-v11/ic_title_today.png diff --git a/android/res/drawable-xlarge-mdpi-v11/indicator_starred.png b/android/res/drawable-mdpi-v11/indicator_starred.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/indicator_starred.png rename to android/res/drawable-mdpi-v11/indicator_starred.png diff --git a/android/res/drawable-xlarge-mdpi-v11/schedule_indicator_left.png b/android/res/drawable-mdpi-v11/schedule_indicator_left.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/schedule_indicator_left.png rename to android/res/drawable-mdpi-v11/schedule_indicator_left.png diff --git a/android/res/drawable-xlarge-mdpi-v11/schedule_indicator_right.png b/android/res/drawable-mdpi-v11/schedule_indicator_right.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/schedule_indicator_right.png rename to android/res/drawable-mdpi-v11/schedule_indicator_right.png diff --git a/android/res/drawable-mdpi-v11/tab_background.9.png b/android/res/drawable-mdpi-v11/tab_background.9.png new file mode 100644 index 0000000..52fb435 Binary files /dev/null and b/android/res/drawable-mdpi-v11/tab_background.9.png differ diff --git a/android/res/drawable-mdpi-v11/tab_off_background.9.png b/android/res/drawable-mdpi-v11/tab_off_background.9.png new file mode 100644 index 0000000..6eeafce Binary files /dev/null and b/android/res/drawable-mdpi-v11/tab_off_background.9.png differ diff --git a/android/res/drawable-mdpi-v11/tab_selected.9.png b/android/res/drawable-mdpi-v11/tab_selected.9.png new file mode 100644 index 0000000..8a4cfe3 Binary files /dev/null and b/android/res/drawable-mdpi-v11/tab_selected.9.png differ diff --git a/android/res/drawable-mdpi-v11/tab_selected_focused.9.png b/android/res/drawable-mdpi-v11/tab_selected_focused.9.png new file mode 100644 index 0000000..95f66e8 Binary files /dev/null and b/android/res/drawable-mdpi-v11/tab_selected_focused.9.png differ diff --git a/android/res/drawable-mdpi-v11/tab_selected_pressed.9.png b/android/res/drawable-mdpi-v11/tab_selected_pressed.9.png new file mode 100644 index 0000000..9d9d4f0 Binary files /dev/null and b/android/res/drawable-mdpi-v11/tab_selected_pressed.9.png differ diff --git a/android/res/drawable-mdpi-v11/tab_unselected.9.png b/android/res/drawable-mdpi-v11/tab_unselected.9.png new file mode 100644 index 0000000..9dea300 Binary files /dev/null and b/android/res/drawable-mdpi-v11/tab_unselected.9.png differ diff --git a/android/res/drawable-mdpi-v11/tab_unselected_focused.9.png b/android/res/drawable-mdpi-v11/tab_unselected_focused.9.png new file mode 100644 index 0000000..450d214 Binary files /dev/null and b/android/res/drawable-mdpi-v11/tab_unselected_focused.9.png differ diff --git a/android/res/drawable-mdpi-v11/tab_unselected_pressed.9.png b/android/res/drawable-mdpi-v11/tab_unselected_pressed.9.png new file mode 100644 index 0000000..450d214 Binary files /dev/null and b/android/res/drawable-mdpi-v11/tab_unselected_pressed.9.png differ diff --git a/android/res/drawable-xlarge-mdpi-v11/title_logo.png b/android/res/drawable-mdpi-v11/title_logo.png similarity index 100% rename from android/res/drawable-xlarge-mdpi-v11/title_logo.png rename to android/res/drawable-mdpi-v11/title_logo.png diff --git a/android/res/drawable/window_background.xml b/android/res/drawable/window_background.xml new file mode 100644 index 0000000..b588983 --- /dev/null +++ b/android/res/drawable/window_background.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/android/res/drawable/window_background_home.xml b/android/res/drawable/window_background_home.xml new file mode 100644 index 0000000..f0acc5d --- /dev/null +++ b/android/res/drawable/window_background_home.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/android/res/layout-xlarge-land-v11/activity_home.xml b/android/res/layout-large-land-v11/activity_home.xml similarity index 100% rename from android/res/layout-xlarge-land-v11/activity_home.xml rename to android/res/layout-large-land-v11/activity_home.xml diff --git a/android/res/layout-xlarge-v11/activity_home.xml b/android/res/layout-large-v11/activity_home.xml similarity index 100% rename from android/res/layout-xlarge-v11/activity_home.xml rename to android/res/layout-large-v11/activity_home.xml diff --git a/android/res/layout-xlarge-v11/activity_map.xml b/android/res/layout-large-v11/activity_map.xml similarity index 100% rename from android/res/layout-xlarge-v11/activity_map.xml rename to android/res/layout-large-v11/activity_map.xml diff --git a/android/res/layout-xlarge-v11/activity_now_playing.xml b/android/res/layout-large-v11/activity_now_playing.xml similarity index 100% rename from android/res/layout-xlarge-v11/activity_now_playing.xml rename to android/res/layout-large-v11/activity_now_playing.xml diff --git a/android/res/layout-xlarge-v11/activity_schedule.xml b/android/res/layout-large-v11/activity_schedule.xml similarity index 100% rename from android/res/layout-xlarge-v11/activity_schedule.xml rename to android/res/layout-large-v11/activity_schedule.xml diff --git a/android/res/layout-xlarge-v11/activity_search.xml b/android/res/layout-large-v11/activity_search.xml similarity index 100% rename from android/res/layout-xlarge-v11/activity_search.xml rename to android/res/layout-large-v11/activity_search.xml diff --git a/android/res/layout-xlarge-v11/activity_sessions.xml b/android/res/layout-large-v11/activity_sessions.xml similarity index 100% rename from android/res/layout-xlarge-v11/activity_sessions.xml rename to android/res/layout-large-v11/activity_sessions.xml diff --git a/android/res/layout-xlarge-v11/activity_starred.xml b/android/res/layout-large-v11/activity_starred.xml similarity index 100% rename from android/res/layout-xlarge-v11/activity_starred.xml rename to android/res/layout-large-v11/activity_starred.xml diff --git a/android/res/layout-xlarge-v11/activity_vendors.xml b/android/res/layout-large-v11/activity_vendors.xml similarity index 100% rename from android/res/layout-xlarge-v11/activity_vendors.xml rename to android/res/layout-large-v11/activity_vendors.xml diff --git a/android/res/layout-xlarge-v11/colorstrip.xml b/android/res/layout-large-v11/colorstrip.xml similarity index 100% rename from android/res/layout-xlarge-v11/colorstrip.xml rename to android/res/layout-large-v11/colorstrip.xml diff --git a/android/res/layout-xlarge-v11/fragment_session_detail.xml b/android/res/layout-large-v11/fragment_session_detail.xml similarity index 100% rename from android/res/layout-xlarge-v11/fragment_session_detail.xml rename to android/res/layout-large-v11/fragment_session_detail.xml diff --git a/android/res/layout-xlarge-v11/fragment_tracks_dropdown.xml b/android/res/layout-large-v11/fragment_tracks_dropdown.xml similarity index 100% rename from android/res/layout-xlarge-v11/fragment_tracks_dropdown.xml rename to android/res/layout-large-v11/fragment_tracks_dropdown.xml diff --git a/android/res/layout-xlarge-v11/tab_indicator.xml b/android/res/layout-large-v11/tab_indicator.xml similarity index 100% rename from android/res/layout-xlarge-v11/tab_indicator.xml rename to android/res/layout-large-v11/tab_indicator.xml diff --git a/android/res/layout-xlarge-v11/actionbar.xml b/android/res/layout-v11/actionbar.xml similarity index 100% rename from android/res/layout-xlarge-v11/actionbar.xml rename to android/res/layout-v11/actionbar.xml diff --git a/android/res/layout-xlarge-v11/actionbar_indeterminate_progress.xml b/android/res/layout-v11/actionbar_indeterminate_progress.xml similarity index 100% rename from android/res/layout-xlarge-v11/actionbar_indeterminate_progress.xml rename to android/res/layout-v11/actionbar_indeterminate_progress.xml diff --git a/android/res/layout-v11/tab_indicator.xml b/android/res/layout-v11/tab_indicator.xml new file mode 100644 index 0000000..b249174 --- /dev/null +++ b/android/res/layout-v11/tab_indicator.xml @@ -0,0 +1,27 @@ + + diff --git a/android/res/menu-xlarge-v11/default_menu_items.xml b/android/res/menu-v11/default_menu_items.xml similarity index 100% rename from android/res/menu-xlarge-v11/default_menu_items.xml rename to android/res/menu-v11/default_menu_items.xml diff --git a/android/res/values-xlarge-land-v11/dimens.xml b/android/res/values-large-land-v11/dimens.xml similarity index 100% rename from android/res/values-xlarge-land-v11/dimens.xml rename to android/res/values-large-land-v11/dimens.xml diff --git a/android/res/values-xlarge-land-v11/styles.xml b/android/res/values-large-land-v11/integers.xml similarity index 64% rename from android/res/values-xlarge-land-v11/styles.xml rename to android/res/values-large-land-v11/integers.xml index 68a0b9e..88066fe 100644 --- a/android/res/values-xlarge-land-v11/styles.xml +++ b/android/res/values-large-land-v11/integers.xml @@ -15,10 +15,5 @@ --> - + 2 diff --git a/android/res/values-xlarge-v11/dimens.xml b/android/res/values-large-v11/dimens.xml similarity index 100% rename from android/res/values-xlarge-v11/dimens.xml rename to android/res/values-large-v11/dimens.xml diff --git a/android/res/values-large-v11/integers.xml b/android/res/values-large-v11/integers.xml new file mode 100644 index 0000000..6e4cecf --- /dev/null +++ b/android/res/values-large-v11/integers.xml @@ -0,0 +1,19 @@ + + + + 6 + diff --git a/android/res/values-xlarge-v11/strings.xml b/android/res/values-large-v11/strings.xml similarity index 100% rename from android/res/values-xlarge-v11/strings.xml rename to android/res/values-large-v11/strings.xml diff --git a/android/res/values-xlarge-v11/styles.xml b/android/res/values-large-v11/styles.xml similarity index 74% rename from android/res/values-xlarge-v11/styles.xml rename to android/res/values-large-v11/styles.xml index 2631781..5f3136b 100644 --- a/android/res/values-xlarge-v11/styles.xml +++ b/android/res/values-large-v11/styles.xml @@ -15,30 +15,11 @@ --> - - - - - - - + + + + + + + diff --git a/android/res/values/integers.xml b/android/res/values/integers.xml new file mode 100644 index 0000000..d7adfac --- /dev/null +++ b/android/res/values/integers.xml @@ -0,0 +1,20 @@ + + + + 3 + 2 + diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml index 3c0ab5c..2a379c3 100644 --- a/android/res/values/styles.xml +++ b/android/res/values/styles.xml @@ -24,8 +24,8 @@ @null - 3 - 2 + @integer/text_header_max_lines + @integer/track_abstract_max_lines @style/ActionBarCompatButton diff --git a/android/src/com/google/android/apps/iosched/util/ActivityHelper.java b/android/src/com/google/android/apps/iosched/util/ActivityHelper.java index f4c5a41..58275e5 100644 --- a/android/src/com/google/android/apps/iosched/util/ActivityHelper.java +++ b/android/src/com/google/android/apps/iosched/util/ActivityHelper.java @@ -122,7 +122,10 @@ public void goHome() { final Intent intent = new Intent(mActivity, HomeActivity.class); intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); mActivity.startActivity(intent); - mActivity.overridePendingTransition(R.anim.home_enter, R.anim.home_exit); + + if (!UIUtils.isHoneycomb()) { + mActivity.overridePendingTransition(R.anim.home_enter, R.anim.home_exit); + } } /** diff --git a/android/src/com/google/android/apps/iosched/util/ActivityHelperHoneycomb.java b/android/src/com/google/android/apps/iosched/util/ActivityHelperHoneycomb.java index b330999..7c989f5 100644 --- a/android/src/com/google/android/apps/iosched/util/ActivityHelperHoneycomb.java +++ b/android/src/com/google/android/apps/iosched/util/ActivityHelperHoneycomb.java @@ -65,9 +65,15 @@ public void setupHomeActivity() { super.setupHomeActivity(); // NOTE: there needs to be a content view set before this is called, so this method // should be called in onPostCreate. - mActivity.getActionBar().setDisplayOptions( - 0, - ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_SHOW_TITLE); + if (UIUtils.isTablet(mActivity)) { + mActivity.getActionBar().setDisplayOptions( + 0, + ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_SHOW_TITLE); + } else { + mActivity.getActionBar().setDisplayOptions( + ActionBar.DISPLAY_USE_LOGO, + ActionBar.DISPLAY_USE_LOGO | ActionBar.DISPLAY_SHOW_TITLE); + } } /** {@inheritDoc} */ @@ -76,9 +82,15 @@ public void setupSubActivity() { super.setupSubActivity(); // NOTE: there needs to be a content view set before this is called, so this method // should be called in onPostCreate. - mActivity.getActionBar().setDisplayOptions( - ActionBar.DISPLAY_HOME_AS_UP | ActionBar.DISPLAY_USE_LOGO, - ActionBar.DISPLAY_HOME_AS_UP | ActionBar.DISPLAY_USE_LOGO); + if (UIUtils.isTablet(mActivity)) { + mActivity.getActionBar().setDisplayOptions( + ActionBar.DISPLAY_HOME_AS_UP | ActionBar.DISPLAY_USE_LOGO, + ActionBar.DISPLAY_HOME_AS_UP | ActionBar.DISPLAY_USE_LOGO); + } else { + mActivity.getActionBar().setDisplayOptions( + 0, + ActionBar.DISPLAY_HOME_AS_UP | ActionBar.DISPLAY_USE_LOGO); + } } /** @@ -93,6 +105,9 @@ public void setActionBarTitle(CharSequence title) { */ @Override public void setActionBarColor(int color) { + if (!UIUtils.isTablet(mActivity)) { + super.setActionBarColor(color); + } } /** {@inheritDoc} */ diff --git a/android/src/com/google/android/apps/iosched/util/UIUtils.java b/android/src/com/google/android/apps/iosched/util/UIUtils.java index 6e2e404..6073ba5 100644 --- a/android/src/com/google/android/apps/iosched/util/UIUtils.java +++ b/android/src/com/google/android/apps/iosched/util/UIUtils.java @@ -183,12 +183,14 @@ public static boolean isHoneycomb() { return Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB; } - public static boolean isHoneycombTablet(Context context) { - // Can use static final constants like HONEYCOMB, declared in later versions - // of the OS since they are inlined at compile time. This is guaranteed behavior. - return isHoneycomb() && (context.getResources().getConfiguration().screenLayout + public static boolean isTablet(Context context) { + return (context.getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) - == Configuration.SCREENLAYOUT_SIZE_XLARGE; + >= Configuration.SCREENLAYOUT_SIZE_LARGE; + } + + public static boolean isHoneycombTablet(Context context) { + return isHoneycomb() && isTablet(context); } public static long getCurrentTime(final Context context) {