diff options
author | Adam Cohen <adamcohen@google.com> | 2014-07-09 23:53:15 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2014-07-18 17:56:42 -0700 |
commit | 6c5891a9fce95eee3d87823d11d21889743e9c68 (patch) | |
tree | 3373b4ee43895f19ae90f472a3b42d12b1ab3634 /res/layout | |
parent | cc83d8dbfe2d99d95d9cf651c9559093d3c89c1e (diff) | |
download | android_packages_apps_Trebuchet-6c5891a9fce95eee3d87823d11d21889743e9c68.tar.gz android_packages_apps_Trebuchet-6c5891a9fce95eee3d87823d11d21889743e9c68.tar.bz2 android_packages_apps_Trebuchet-6c5891a9fce95eee3d87823d11d21889743e9c68.zip |
Preliminary work on Material Transitions
-> Early exploration of AllApps Hero transition with
circular reveal
-> Stripping a bunch of dead code from AppsCustomizeTabHost
-> Moved background scrim to DragLayer
-> Removed "SMALL" state from workspace: replaced with
NORMAL_HIDDEN and OVERVIEW_HIDDEN. This is mainly to
reduce the overall usage of the z-space model between
allapps/widgets and workspace. There are vestigial
remains of this model, mainly due to the overview
mode, and a bit for spring-loaded.
Change-Id: If2302a24394f0ec66621f01ffa2fc4934aa10c3f
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/apps_customize_pane.xml | 95 |
1 files changed, 30 insertions, 65 deletions
diff --git a/res/layout/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml index 19db373bc..007c5362e 100644 --- a/res/layout/apps_customize_pane.xml +++ b/res/layout/apps_customize_pane.xml @@ -15,75 +15,40 @@ --> <com.android.launcher3.AppsCustomizeTabHost xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" - android:background="#80FFFFFF"> + xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"> + <LinearLayout - android:id="@+id/apps_customize_content" - android:orientation="vertical" + android:id="@+id/content" android:layout_width="match_parent" android:layout_height="match_parent" - android:visibility="gone"> - <!-- The layout_width of the tab bar gets overriden to align the content - with the text in the tabs in AppsCustomizeTabHost. --> - <FrameLayout - android:id="@+id/tabs_container" - android:layout_width="wrap_content" - android:layout_height="@dimen/apps_customize_tab_bar_height" - android:layout_marginTop="@dimen/apps_customize_tab_bar_margin_top" - android:layout_gravity="center_horizontal" - android:visibility="gone"> - <com.android.launcher3.FocusOnlyTabWidget - android:id="@android:id/tabs" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center" - android:gravity="start" - android:background="@drawable/tab_unselected_holo" - android:tabStripEnabled="false" - android:divider="@null" /> - <include - android:id="@+id/market_button" - layout="@layout/market_button" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_gravity="end" /> - </FrameLayout> - <FrameLayout - android:id="@android:id/tabcontent" - android:layout_width="match_parent" - android:layout_height="match_parent"> + android:clipChildren="false" + android:orientation="vertical"> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - - <com.android.launcher3.AppsCustomizePagedView - android:id="@+id/apps_customize_pane_content" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" - launcher:widgetCountX="@integer/apps_customize_widget_cell_count_x" - launcher:widgetCountY="@integer/apps_customize_widget_cell_count_y" - launcher:clingFocusedX="@integer/apps_customize_cling_focused_x" - launcher:clingFocusedY="@integer/apps_customize_cling_focused_y" - launcher:maxGap="@dimen/workspace_max_gap" - launcher:pageIndicator="@+id/apps_customize_page_indicator" /> + <com.android.launcher3.AppsCustomizePagedView + android:id="@+id/apps_customize_pane_content" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" + launcher:widgetCountX="@integer/apps_customize_widget_cell_count_x" + launcher:widgetCountY="@integer/apps_customize_widget_cell_count_y" + launcher:clingFocusedX="@integer/apps_customize_cling_focused_x" + launcher:clingFocusedY="@integer/apps_customize_cling_focused_y" + launcher:maxGap="@dimen/workspace_max_gap" + launcher:pageIndicator="@+id/apps_customize_page_indicator" /> + <include + android:id="@+id/apps_customize_page_indicator" + layout="@layout/page_indicator" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" /> + </LinearLayout> - <include - android:id="@+id/apps_customize_page_indicator" - layout="@layout/page_indicator" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" /> - </LinearLayout> + <include + android:id="@+id/market_button" + layout="@layout/market_button" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_gravity="end" + android:visibility="gone"/> - <FrameLayout - android:id="@+id/animation_buffer" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="#FF000000" - android:visibility="gone" /> - </FrameLayout> - </LinearLayout> </com.android.launcher3.AppsCustomizeTabHost> |