diff options
author | Winson Chung <winsonc@google.com> | 2015-03-11 01:36:55 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-11 01:36:55 +0000 |
commit | 03f03bee25648f78cbf0d4aee1f548e46f2bb3b8 (patch) | |
tree | f071f3cd665b06b868ef70fce74abdd69bdf8e1d /res | |
parent | e43083b9c6af02a29a834842c3fe681cb3f34104 (diff) | |
parent | fc52a8fb0312393e0a729764fbe57c43839e4c0f (diff) | |
download | android_packages_apps_Trebuchet-03f03bee25648f78cbf0d4aee1f548e46f2bb3b8.tar.gz android_packages_apps_Trebuchet-03f03bee25648f78cbf0d4aee1f548e46f2bb3b8.tar.bz2 android_packages_apps_Trebuchet-03f03bee25648f78cbf0d4aee1f548e46f2bb3b8.zip |
am fc52a8fb: Merge "Initial changes to break out AllApps into its own view." into ub-launcher3-burnaby
* commit 'fc52a8fb0312393e0a729764fbe57c43839e4c0f':
Initial changes to break out AllApps into its own view.
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable/apps_list_bg.xml | 21 | ||||
-rw-r--r-- | res/layout-land/launcher.xml | 6 | ||||
-rw-r--r-- | res/layout-port/launcher.xml | 6 | ||||
-rw-r--r-- | res/layout-sw600dp/apps_view.xml | 34 | ||||
-rw-r--r-- | res/layout-sw720dp/launcher.xml | 6 | ||||
-rw-r--r-- | res/layout/apps_grid_row_icon_view.xml | 22 | ||||
-rw-r--r-- | res/layout/apps_grid_row_view.xml | 38 | ||||
-rw-r--r-- | res/layout/apps_list_reveal_view.xml | 25 | ||||
-rw-r--r-- | res/layout/apps_list_row_icon_view.xml | 28 | ||||
-rw-r--r-- | res/layout/apps_list_row_view.xml | 34 | ||||
-rw-r--r-- | res/layout/apps_list_view.xml | 30 | ||||
-rw-r--r-- | res/layout/apps_view.xml | 28 | ||||
-rw-r--r-- | res/values-sw600dp/dimens.xml | 3 | ||||
-rw-r--r-- | res/values/attrs.xml | 8 | ||||
-rw-r--r-- | res/values/dimens.xml | 3 |
15 files changed, 292 insertions, 0 deletions
diff --git a/res/drawable/apps_list_bg.xml b/res/drawable/apps_list_bg.xml new file mode 100644 index 000000000..61f1c083a --- /dev/null +++ b/res/drawable/apps_list_bg.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 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. +--> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <solid android:color="#ffffff" /> + <corners android:radius="3dp" /> +</shape>
\ No newline at end of file diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 6f95bd506..b13984a26 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -62,6 +62,12 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="invisible" /> + + <include layout="@layout/apps_view" + android:id="@+id/apps_view" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="invisible" /> </com.android.launcher3.DragLayer> <ViewStub diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index af30a32e5..3cb338efe 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -71,6 +71,12 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="invisible" /> + + <include layout="@layout/apps_view" + android:id="@+id/apps_view" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="invisible" /> </com.android.launcher3.DragLayer> <ViewStub diff --git a/res/layout-sw600dp/apps_view.xml b/res/layout-sw600dp/apps_view.xml new file mode 100644 index 000000000..1f773b307 --- /dev/null +++ b/res/layout-sw600dp/apps_view.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2015 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. +--> +<com.android.launcher3.AppsContainerView + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/apps_view" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="8dp" + android:background="#22000000" + android:descendantFocusability="afterDescendants"> + <include + layout="@layout/apps_list_reveal_view" + android:layout_width="420dp" + android:layout_height="match_parent" + android:layout_gravity="center" /> + <include + layout="@layout/apps_list_view" + android:layout_width="420dp" + android:layout_height="match_parent" + android:layout_gravity="center" /> +</com.android.launcher3.AppsContainerView>
\ No newline at end of file diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml index 960ccf330..a3d502cf4 100644 --- a/res/layout-sw720dp/launcher.xml +++ b/res/layout-sw720dp/launcher.xml @@ -71,6 +71,12 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="invisible" /> + + <include layout="@layout/apps_view" + android:id="@+id/apps_view" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="invisible" /> </com.android.launcher3.DragLayer> <ViewStub diff --git a/res/layout/apps_grid_row_icon_view.xml b/res/layout/apps_grid_row_icon_view.xml new file mode 100644 index 000000000..11c8eeb4d --- /dev/null +++ b/res/layout/apps_grid_row_icon_view.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2015 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. +--> + +<com.android.launcher3.BubbleTextView + xmlns:android="http://schemas.android.com/apk/res/android" + style="@style/WorkspaceIcon.AppsCustomize" + android:id="@+id/application_icon" + android:focusable="true" + android:background="@drawable/focusable_view_bg" /> diff --git a/res/layout/apps_grid_row_view.xml b/res/layout/apps_grid_row_view.xml new file mode 100644 index 000000000..bce43bc1b --- /dev/null +++ b/res/layout/apps_grid_row_view.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2015 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:layout_width="match_parent" + android:layout_height="@dimen/apps_view_row_height" + android:paddingTop="12dp" + android:paddingBottom="12dp" + android:orientation="horizontal" + android:focusable="true" + android:background="@drawable/focusable_view_bg" + android:descendantFocusability="afterDescendants"> + <TextView + android:id="@+id/section" + android:layout_width="48dp" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingRight="8dp" + android:paddingBottom="12dp" + android:gravity="right" + android:textColor="#1ca195" + android:textSize="16sp" + android:textAllCaps="true" + android:focusable="false" /> +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/apps_list_reveal_view.xml b/res/layout/apps_list_reveal_view.xml new file mode 100644 index 000000000..4a26787c8 --- /dev/null +++ b/res/layout/apps_list_reveal_view.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2015 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. +--> +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/all_apps_transition_overlay" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center" + android:elevation="15dp" + android:visibility="invisible" + android:background="@drawable/apps_list_bg" + android:focusable="false" />
\ No newline at end of file diff --git a/res/layout/apps_list_row_icon_view.xml b/res/layout/apps_list_row_icon_view.xml new file mode 100644 index 000000000..607af9b0b --- /dev/null +++ b/res/layout/apps_list_row_icon_view.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2015 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. +--> + +<com.android.launcher3.BubbleTextView + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res-auto" + style="@style/WorkspaceIcon.AppsCustomize" + android:id="@+id/application_icon" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:focusable="true" + android:background="@drawable/focusable_view_bg" + launcher:iconPaddingOverride="24dp" + launcher:textSizeOverride="16dp" + launcher:layoutHorizontal="true" /> diff --git a/res/layout/apps_list_row_view.xml b/res/layout/apps_list_row_view.xml new file mode 100644 index 000000000..c4dcd0018 --- /dev/null +++ b/res/layout/apps_list_row_view.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2015 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:layout_width="match_parent" + android:layout_height="@dimen/apps_view_row_height" + android:orientation="horizontal" + android:focusable="true" + android:background="@drawable/focusable_view_bg" + android:descendantFocusability="afterDescendants"> + <TextView + android:id="@+id/section" + android:layout_width="64dp" + android:layout_height="match_parent" + android:paddingLeft="16dp" + android:gravity="left|center_vertical" + android:textColor="#009688" + android:textSize="24sp" + android:textAllCaps="true" + android:focusable="false" /> +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/apps_list_view.xml b/res/layout/apps_list_view.xml new file mode 100644 index 000000000..b1b0f310b --- /dev/null +++ b/res/layout/apps_list_view.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2015 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. +--> +<ListView + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/apps_list" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center" + android:paddingTop="12dp" + android:paddingBottom="12dp" + android:clipToPadding="false" + android:scrollbars="vertical" + android:elevation="15dp" + android:background="@drawable/apps_list_bg" + android:visibility="gone" + android:focusable="true" + android:descendantFocusability="afterDescendants" />
\ No newline at end of file diff --git a/res/layout/apps_view.xml b/res/layout/apps_view.xml new file mode 100644 index 000000000..19ad3d2c9 --- /dev/null +++ b/res/layout/apps_view.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2015 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. +--> +<com.android.launcher3.AppsContainerView + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/apps_view" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="8dp" + android:background="#22000000" + android:descendantFocusability="afterDescendants"> + <include + layout="@layout/apps_list_reveal_view" /> + <include + layout="@layout/apps_list_view" /> +</com.android.launcher3.AppsContainerView>
\ No newline at end of file diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml index 28679be2e..f7ad0c4cd 100644 --- a/res/values-sw600dp/dimens.xml +++ b/res/values-sw600dp/dimens.xml @@ -17,6 +17,9 @@ <resources> <dimen name="app_icon_size">64dp</dimen> +<!-- Apps view --> + <dimen name="apps_view_row_height">76dp</dimen> + <!-- AppsCustomize --> <dimen name="apps_customize_tab_bar_height">60dp</dimen> <dimen name="apps_customize_tab_bar_margin_top">8dp</dimen> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 3331cdec4..4e7c59280 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -18,6 +18,14 @@ <resources> + <!-- BubbleTextView specific attributes. --> + <declare-styleable name="BubbleTextView"> + <attr name="layoutHorizontal" format="boolean" /> + <attr name="iconSizeOverride" format="dimension" /> + <attr name="iconPaddingOverride" format="dimension" /> + <attr name="textSizeOverride" format="dimension" /> + </declare-styleable> + <!-- Page Indicator specific attributes. --> <declare-styleable name="PageIndicator"> <attr name="windowSize" format="integer" /> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index d6fc508d1..013bd925b 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -46,6 +46,9 @@ <dimen name="toolbar_button_vertical_padding">4dip</dimen> <dimen name="toolbar_button_horizontal_padding">12dip</dimen> +<!-- Apps view --> + <dimen name="apps_view_row_height">64dp</dimen> + <!-- AllApps/Customize/AppsCustomize --> <!-- The height of the tab bar - if this changes, we should update the external icon width/height above to compensate --> |