diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-05-18 14:12:02 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2016-05-18 17:50:34 -0700 |
commit | c64cfdd8fa18de45fc1646c8ef2449f39ef83022 (patch) | |
tree | 391350ff19d812cc0f52c9d5324ec90c530352ea /res | |
parent | 770217c697a92b441b66fac6d3441db1c0a84a3a (diff) | |
download | android_packages_apps_Trebuchet-c64cfdd8fa18de45fc1646c8ef2449f39ef83022.tar.gz android_packages_apps_Trebuchet-c64cfdd8fa18de45fc1646c8ef2449f39ef83022.tar.bz2 android_packages_apps_Trebuchet-c64cfdd8fa18de45fc1646c8ef2449f39ef83022.zip |
Updating the folder page indicator to be more like the
framework page indicator (used in quick settings)
The active page is indicated with the accent color. During scroll
the active indicator expands to 2 dots corresponding to the visible pages.
Change-Id: Iaf57836b642cf87e5eed98048ecca7dd8e7643a4
Diffstat (limited to 'res')
19 files changed, 12 insertions, 73 deletions
diff --git a/res/drawable-hdpi/ic_pageindicator_add.png b/res/drawable-hdpi/ic_pageindicator_add.png Binary files differdeleted file mode 100644 index 6e3f5aff6..000000000 --- a/res/drawable-hdpi/ic_pageindicator_add.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_pageindicator_current.png b/res/drawable-hdpi/ic_pageindicator_current.png Binary files differdeleted file mode 100644 index 6dbc4f964..000000000 --- a/res/drawable-hdpi/ic_pageindicator_current.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_pageindicator_current_folder.png b/res/drawable-hdpi/ic_pageindicator_current_folder.png Binary files differdeleted file mode 100644 index c6c4228c0..000000000 --- a/res/drawable-hdpi/ic_pageindicator_current_folder.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_pageindicator_add.png b/res/drawable-mdpi/ic_pageindicator_add.png Binary files differdeleted file mode 100644 index d9939b46a..000000000 --- a/res/drawable-mdpi/ic_pageindicator_add.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_pageindicator_current.png b/res/drawable-mdpi/ic_pageindicator_current.png Binary files differdeleted file mode 100644 index 832f8ef63..000000000 --- a/res/drawable-mdpi/ic_pageindicator_current.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_pageindicator_current_folder.png b/res/drawable-mdpi/ic_pageindicator_current_folder.png Binary files differdeleted file mode 100644 index b6c4d7f56..000000000 --- a/res/drawable-mdpi/ic_pageindicator_current_folder.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_pageindicator_add.png b/res/drawable-xhdpi/ic_pageindicator_add.png Binary files differdeleted file mode 100644 index 7e18c053b..000000000 --- a/res/drawable-xhdpi/ic_pageindicator_add.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_pageindicator_current.png b/res/drawable-xhdpi/ic_pageindicator_current.png Binary files differdeleted file mode 100644 index 866725fbb..000000000 --- a/res/drawable-xhdpi/ic_pageindicator_current.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_pageindicator_current_folder.png b/res/drawable-xhdpi/ic_pageindicator_current_folder.png Binary files differdeleted file mode 100644 index ec19b7c34..000000000 --- a/res/drawable-xhdpi/ic_pageindicator_current_folder.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_pageindicator_add.png b/res/drawable-xxhdpi/ic_pageindicator_add.png Binary files differdeleted file mode 100644 index d790e86b2..000000000 --- a/res/drawable-xxhdpi/ic_pageindicator_add.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_pageindicator_current.png b/res/drawable-xxhdpi/ic_pageindicator_current.png Binary files differdeleted file mode 100644 index 9550c61ac..000000000 --- a/res/drawable-xxhdpi/ic_pageindicator_current.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_pageindicator_current_folder.png b/res/drawable-xxhdpi/ic_pageindicator_current_folder.png Binary files differdeleted file mode 100644 index 987c882ae..000000000 --- a/res/drawable-xxhdpi/ic_pageindicator_current_folder.png +++ /dev/null diff --git a/res/layout/page_indicator.xml b/res/layout/page_indicator.xml deleted file mode 100644 index 5655159e3..000000000 --- a/res/layout/page_indicator.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 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.pageindicators.PageIndicatorDots - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto" - android:animateLayoutChanges="true" - launcher:windowSize="@integer/config_maxNumberOfPageIndicatorsToShow"> -</com.android.launcher3.pageindicators.PageIndicatorDots> diff --git a/res/layout/page_indicator_marker.xml b/res/layout/page_indicator_marker.xml deleted file mode 100644 index 357a76186..000000000 --- a/res/layout/page_indicator_marker.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 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.pageindicators.PageIndicatorDot - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto" - android:layout_width="12dp" - android:layout_height="12dp" - android:layout_gravity="center_vertical"> - <ImageView - android:id="@+id/inactive" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:scaleType="centerInside" - android:src="@drawable/ic_pageindicator_default" - /> - <ImageView - android:id="@+id/active" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:scaleType="centerInside" - android:src="@drawable/ic_pageindicator_current" - android:alpha="0" - android:scaleX="0.5" - android:scaleY="0.5" - /> -</com.android.launcher3.pageindicators.PageIndicatorDot> diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml index 87a42145d..8a1b7d0f3 100644 --- a/res/layout/user_folder.xml +++ b/res/layout/user_folder.xml @@ -72,12 +72,13 @@ android:textColorHint="#ff808080" android:textSize="14sp" /> - <include + <com.android.launcher3.pageindicators.PageIndicatorDots android:id="@+id/folder_page_indicator" - android:layout_width="wrap_content" - android:layout_height="12dp" android:layout_gravity="center_vertical" - layout="@layout/page_indicator" /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:elevation="1dp" + /> </LinearLayout> diff --git a/res/layout/user_folder_icon_normalized.xml b/res/layout/user_folder_icon_normalized.xml index d445a7ae3..de1316ebb 100644 --- a/res/layout/user_folder_icon_normalized.xml +++ b/res/layout/user_folder_icon_normalized.xml @@ -73,12 +73,13 @@ android:textColorHint="#ff808080" android:textSize="14sp" /> - <include + <com.android.launcher3.pageindicators.PageIndicatorDots android:id="@+id/folder_page_indicator" - android:layout_width="wrap_content" - android:layout_height="12dp" android:layout_gravity="center_vertical" - layout="@layout/page_indicator" /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:elevation="1dp" + /> </LinearLayout> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 2eb9b910f..ca28ad35f 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -31,11 +31,6 @@ <attr name="customShadows" format="boolean" /> </declare-styleable> - <!-- Page Indicator specific attributes. --> - <declare-styleable name="PageIndicatorDots"> - <attr name="windowSize" format="integer" /> - </declare-styleable> - <!-- PagedView specific attributes. These attributes are used to customize a PagedView view in XML files. --> <declare-styleable name="PagedView"> diff --git a/res/values/colors.xml b/res/values/colors.xml index dc3d4fa84..754dc0c57 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -31,6 +31,7 @@ <color name="workspace_edge_effect_color">#FFFFFFFF</color> <color name="folder_edge_effect_color">#FF757575</color> + <color name="page_indicator_dot_color">#FFDDDDDD</color> <color name="quantum_panel_text_color">#FF666666</color> <color name="quantum_panel_bg_color">#FFF5F5F5</color> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 281de08ae..6fac31e1c 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -149,6 +149,7 @@ <!-- Folders --> <!-- The size of the padding on the preview background drawable --> <dimen name="folder_preview_padding">6dp</dimen> + <dimen name="page_indicator_dot_size">8dp</dimen> <!-- Sizes for managed profile badges --> <dimen name="profile_badge_size">24dp</dimen> |