diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-04-02 18:22:18 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-02 18:22:37 +0000 |
commit | 8d600321ffc0a92a188583137b9ea832f7ac0e84 (patch) | |
tree | 95a311802de745c52c88fbc1108e9d19619ca569 | |
parent | 1d4a2df091e2b5928406ea503321563a0ec8a01e (diff) | |
parent | d3d37090c485359e2cf62eb6aa8e70350d161689 (diff) | |
download | android_packages_apps_Trebuchet-8d600321ffc0a92a188583137b9ea832f7ac0e84.tar.gz android_packages_apps_Trebuchet-8d600321ffc0a92a188583137b9ea832f7ac0e84.tar.bz2 android_packages_apps_Trebuchet-8d600321ffc0a92a188583137b9ea832f7ac0e84.zip |
Merge "Updating pageindicator assets" into ub-launcher3-burnaby
23 files changed, 2 insertions, 1 deletions
diff --git a/res/drawable-hdpi/ic_pageindicator_add.png b/res/drawable-hdpi/ic_pageindicator_add.png Binary files differindex ab0e5dbd5..971361d56 100644 --- a/res/drawable-hdpi/ic_pageindicator_add.png +++ b/res/drawable-hdpi/ic_pageindicator_add.png diff --git a/res/drawable-hdpi/ic_pageindicator_current.png b/res/drawable-hdpi/ic_pageindicator_current.png Binary files differindex 283f44d37..09405d83a 100644 --- a/res/drawable-hdpi/ic_pageindicator_current.png +++ b/res/drawable-hdpi/ic_pageindicator_current.png diff --git a/res/drawable-hdpi/ic_pageindicator_current_folder.png b/res/drawable-hdpi/ic_pageindicator_current_folder.png Binary files differnew file mode 100644 index 000000000..c3a6f699d --- /dev/null +++ b/res/drawable-hdpi/ic_pageindicator_current_folder.png diff --git a/res/drawable-hdpi/ic_pageindicator_default.png b/res/drawable-hdpi/ic_pageindicator_default.png Binary files differindex 47b998967..251de44c9 100644 --- a/res/drawable-hdpi/ic_pageindicator_default.png +++ b/res/drawable-hdpi/ic_pageindicator_default.png diff --git a/res/drawable-hdpi/ic_pageindicator_default_folder.png b/res/drawable-hdpi/ic_pageindicator_default_folder.png Binary files differnew file mode 100644 index 000000000..48a321898 --- /dev/null +++ b/res/drawable-hdpi/ic_pageindicator_default_folder.png diff --git a/res/drawable-mdpi/ic_pageindicator_add.png b/res/drawable-mdpi/ic_pageindicator_add.png Binary files differindex 11659a3b2..50e1ba524 100644 --- a/res/drawable-mdpi/ic_pageindicator_add.png +++ b/res/drawable-mdpi/ic_pageindicator_add.png diff --git a/res/drawable-mdpi/ic_pageindicator_current.png b/res/drawable-mdpi/ic_pageindicator_current.png Binary files differindex b41e1bb67..19a89727c 100644 --- a/res/drawable-mdpi/ic_pageindicator_current.png +++ b/res/drawable-mdpi/ic_pageindicator_current.png diff --git a/res/drawable-mdpi/ic_pageindicator_current_folder.png b/res/drawable-mdpi/ic_pageindicator_current_folder.png Binary files differnew file mode 100644 index 000000000..8d6c0b1ff --- /dev/null +++ b/res/drawable-mdpi/ic_pageindicator_current_folder.png diff --git a/res/drawable-mdpi/ic_pageindicator_default.png b/res/drawable-mdpi/ic_pageindicator_default.png Binary files differindex e36c25cf1..6b0a9c9e3 100644 --- a/res/drawable-mdpi/ic_pageindicator_default.png +++ b/res/drawable-mdpi/ic_pageindicator_default.png diff --git a/res/drawable-mdpi/ic_pageindicator_default_folder.png b/res/drawable-mdpi/ic_pageindicator_default_folder.png Binary files differnew file mode 100644 index 000000000..c9edf8d88 --- /dev/null +++ b/res/drawable-mdpi/ic_pageindicator_default_folder.png diff --git a/res/drawable-xhdpi/ic_pageindicator_add.png b/res/drawable-xhdpi/ic_pageindicator_add.png Binary files differindex af1da2d42..9fb5359fe 100644 --- a/res/drawable-xhdpi/ic_pageindicator_add.png +++ b/res/drawable-xhdpi/ic_pageindicator_add.png diff --git a/res/drawable-xhdpi/ic_pageindicator_current.png b/res/drawable-xhdpi/ic_pageindicator_current.png Binary files differindex 8fa774dee..c44b88fe9 100644 --- a/res/drawable-xhdpi/ic_pageindicator_current.png +++ b/res/drawable-xhdpi/ic_pageindicator_current.png diff --git a/res/drawable-xhdpi/ic_pageindicator_current_folder.png b/res/drawable-xhdpi/ic_pageindicator_current_folder.png Binary files differnew file mode 100644 index 000000000..fa2168f0c --- /dev/null +++ b/res/drawable-xhdpi/ic_pageindicator_current_folder.png diff --git a/res/drawable-xhdpi/ic_pageindicator_default.png b/res/drawable-xhdpi/ic_pageindicator_default.png Binary files differindex 8eb5eb08d..6d1b5be6b 100644 --- a/res/drawable-xhdpi/ic_pageindicator_default.png +++ b/res/drawable-xhdpi/ic_pageindicator_default.png diff --git a/res/drawable-xhdpi/ic_pageindicator_default_folder.png b/res/drawable-xhdpi/ic_pageindicator_default_folder.png Binary files differnew file mode 100644 index 000000000..ff0ed3991 --- /dev/null +++ b/res/drawable-xhdpi/ic_pageindicator_default_folder.png diff --git a/res/drawable-xxhdpi/ic_pageindicator_add.png b/res/drawable-xxhdpi/ic_pageindicator_add.png Binary files differindex c28895229..f3f6fbede 100644 --- a/res/drawable-xxhdpi/ic_pageindicator_add.png +++ b/res/drawable-xxhdpi/ic_pageindicator_add.png diff --git a/res/drawable-xxhdpi/ic_pageindicator_current.png b/res/drawable-xxhdpi/ic_pageindicator_current.png Binary files differindex 22b290e69..3a3a3ae29 100644 --- a/res/drawable-xxhdpi/ic_pageindicator_current.png +++ b/res/drawable-xxhdpi/ic_pageindicator_current.png diff --git a/res/drawable-xxhdpi/ic_pageindicator_current_dark.png b/res/drawable-xxhdpi/ic_pageindicator_current_dark.png Binary files differdeleted file mode 100644 index d5c4c8d4e..000000000 --- a/res/drawable-xxhdpi/ic_pageindicator_current_dark.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 differnew file mode 100644 index 000000000..4ff8ec6bc --- /dev/null +++ b/res/drawable-xxhdpi/ic_pageindicator_current_folder.png diff --git a/res/drawable-xxhdpi/ic_pageindicator_default.png b/res/drawable-xxhdpi/ic_pageindicator_default.png Binary files differindex e608cae30..b057c6313 100644 --- a/res/drawable-xxhdpi/ic_pageindicator_default.png +++ b/res/drawable-xxhdpi/ic_pageindicator_default.png diff --git a/res/drawable-xxhdpi/ic_pageindicator_default_dark.png b/res/drawable-xxhdpi/ic_pageindicator_default_dark.png Binary files differdeleted file mode 100644 index 79d307b07..000000000 --- a/res/drawable-xxhdpi/ic_pageindicator_default_dark.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_pageindicator_default_folder.png b/res/drawable-xxhdpi/ic_pageindicator_default_folder.png Binary files differnew file mode 100644 index 000000000..756ad090d --- /dev/null +++ b/res/drawable-xxhdpi/ic_pageindicator_default_folder.png diff --git a/src/com/android/launcher3/FolderPagedView.java b/src/com/android/launcher3/FolderPagedView.java index 216e68dcc..61ad10db4 100644 --- a/src/com/android/launcher3/FolderPagedView.java +++ b/src/com/android/launcher3/FolderPagedView.java @@ -536,7 +536,8 @@ public class FolderPagedView extends PagedView implements Folder.FolderContent { @Override protected PageMarkerResources getPageIndicatorMarker(int pageIndex) { - return new PageMarkerResources(R.drawable.ic_pageindicator_current_dark, R.drawable.ic_pageindicator_default_dark); + return new PageMarkerResources(R.drawable.ic_pageindicator_current_folder, + R.drawable.ic_pageindicator_default_folder); } @Override |