diff options
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/page_indicator.xml | 21 | ||||
| -rw-r--r-- | res/layout/page_indicator_marker.xml | 39 | ||||
| -rw-r--r-- | res/layout/user_folder.xml | 9 | ||||
| -rw-r--r-- | res/layout/user_folder_icon_normalized.xml | 9 |
4 files changed, 10 insertions, 68 deletions
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> |