diff options
author | Adam Cohen <adamcohen@google.com> | 2014-07-21 17:25:58 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-19 22:40:06 +0000 |
commit | 82cc3fe6c77322d93ff74b25354e4bca77ab4a83 (patch) | |
tree | 4fd03eb914c8c5d5c872b09b170382e9765a8a01 /res | |
parent | ebf50c93b0d1a4f12329c92a3873a8409c566c7e (diff) | |
parent | 6c5891a9fce95eee3d87823d11d21889743e9c68 (diff) | |
download | android_packages_apps_Trebuchet-82cc3fe6c77322d93ff74b25354e4bca77ab4a83.tar.gz android_packages_apps_Trebuchet-82cc3fe6c77322d93ff74b25354e4bca77ab4a83.tar.bz2 android_packages_apps_Trebuchet-82cc3fe6c77322d93ff74b25354e4bca77ab4a83.zip |
Merge "Preliminary work on Material Transitions" into ub-now-master
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-xxhdpi/apps_customize_bg.png | bin | 0 -> 244 bytes | |||
-rw-r--r-- | res/drawable-xxxhdpi/quantum_panel.9.png | bin | 1861 -> 0 bytes | |||
-rw-r--r-- | res/layout/apps_customize_pane.xml | 95 | ||||
-rw-r--r-- | res/values/config.xml | 3 |
4 files changed, 32 insertions, 66 deletions
diff --git a/res/drawable-xxhdpi/apps_customize_bg.png b/res/drawable-xxhdpi/apps_customize_bg.png Binary files differnew file mode 100644 index 000000000..a51cc112b --- /dev/null +++ b/res/drawable-xxhdpi/apps_customize_bg.png diff --git a/res/drawable-xxxhdpi/quantum_panel.9.png b/res/drawable-xxxhdpi/quantum_panel.9.png Binary files differdeleted file mode 100644 index a15aab45d..000000000 --- a/res/drawable-xxxhdpi/quantum_panel.9.png +++ /dev/null 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> diff --git a/res/values/config.xml b/res/values/config.xml index b512ffe67..3a862c504 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -22,7 +22,7 @@ <!-- AllApps/Customize/AppsCustomize --> <!-- The alpha of the AppsCustomize bg in spring loaded mode --> - <integer name="config_appsCustomizeSpringLoadedBgAlpha">65</integer> + <integer name="config_workspaceScrimAlpha">55</integer> <integer name="config_workspaceUnshrinkTime">300</integer> <integer name="config_overviewTransitionTime">250</integer> @@ -31,6 +31,7 @@ <!-- Fade/zoom in/out duration & scale in the AllApps transition. Note: This should be less than the workspaceShrinkTime as they happen together. --> + <integer name="config_appsCustomizeRevealTime">350</integer> <integer name="config_appsCustomizeZoomInTime">350</integer> <integer name="config_appsCustomizeZoomOutTime">600</integer> <integer name="config_appsCustomizeZoomScaleFactor">7</integer> |