diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2018-07-10 13:50:50 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2018-07-10 13:52:17 -0700 |
commit | 36b54228fcb9599be91119e671cb0a4c6064e033 (patch) | |
tree | f428c68e5f1c935c38dae3eab037175c13c8340a /res | |
parent | 17b7d3659451472302f200c5b27174e03c735520 (diff) | |
download | android_packages_apps_Trebuchet-36b54228fcb9599be91119e671cb0a4c6064e033.tar.gz android_packages_apps_Trebuchet-36b54228fcb9599be91119e671cb0a4c6064e033.tar.bz2 android_packages_apps_Trebuchet-36b54228fcb9599be91119e671cb0a4c6064e033.zip |
Retiring some feature flags
Change-Id: I80a00ecaec0785ce2ba6a5f14a54c8a76f555d43
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-hdpi/ic_allapps.png | bin | 2956 -> 0 bytes | |||
-rw-r--r-- | res/drawable-hdpi/ic_allapps_pressed.png | bin | 3231 -> 0 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_allapps.png | bin | 1488 -> 0 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_allapps_pressed.png | bin | 1997 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_allapps.png | bin | 3598 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_allapps_pressed.png | bin | 3961 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ic_allapps.png | bin | 6398 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ic_allapps_pressed.png | bin | 7039 -> 0 bytes | |||
-rw-r--r-- | res/drawable/all_apps_button_icon.xml | 21 | ||||
-rw-r--r-- | res/layout/all_apps_button.xml | 17 | ||||
-rw-r--r-- | res/values-sw720dp/dimens.xml | 1 | ||||
-rw-r--r-- | res/values/dimens.xml | 1 | ||||
-rw-r--r-- | res/xml/dw_phone_hotseat.xml | 11 | ||||
-rw-r--r-- | res/xml/dw_tablet_hotseat.xml | 10 |
14 files changed, 17 insertions, 44 deletions
diff --git a/res/drawable-hdpi/ic_allapps.png b/res/drawable-hdpi/ic_allapps.png Binary files differdeleted file mode 100644 index 253755ffe..000000000 --- a/res/drawable-hdpi/ic_allapps.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_allapps_pressed.png b/res/drawable-hdpi/ic_allapps_pressed.png Binary files differdeleted file mode 100644 index 1e644c5d0..000000000 --- a/res/drawable-hdpi/ic_allapps_pressed.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_allapps.png b/res/drawable-mdpi/ic_allapps.png Binary files differdeleted file mode 100644 index 6936b2079..000000000 --- a/res/drawable-mdpi/ic_allapps.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_allapps_pressed.png b/res/drawable-mdpi/ic_allapps_pressed.png Binary files differdeleted file mode 100644 index 850ded6fe..000000000 --- a/res/drawable-mdpi/ic_allapps_pressed.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_allapps.png b/res/drawable-xhdpi/ic_allapps.png Binary files differdeleted file mode 100644 index c11c1038b..000000000 --- a/res/drawable-xhdpi/ic_allapps.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_allapps_pressed.png b/res/drawable-xhdpi/ic_allapps_pressed.png Binary files differdeleted file mode 100644 index f319bf1e6..000000000 --- a/res/drawable-xhdpi/ic_allapps_pressed.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_allapps.png b/res/drawable-xxhdpi/ic_allapps.png Binary files differdeleted file mode 100644 index cf6a2cbc0..000000000 --- a/res/drawable-xxhdpi/ic_allapps.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_allapps_pressed.png b/res/drawable-xxhdpi/ic_allapps_pressed.png Binary files differdeleted file mode 100644 index 379389ac7..000000000 --- a/res/drawable-xxhdpi/ic_allapps_pressed.png +++ /dev/null diff --git a/res/drawable/all_apps_button_icon.xml b/res/drawable/all_apps_button_icon.xml deleted file mode 100644 index 7c69cad3a..000000000 --- a/res/drawable/all_apps_button_icon.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_focused="true" android:drawable="@drawable/ic_allapps_pressed" /> - <item android:state_pressed="true" android:drawable="@drawable/ic_allapps_pressed" /> - <item android:drawable="@drawable/ic_allapps" /> -</selector> diff --git a/res/layout/all_apps_button.xml b/res/layout/all_apps_button.xml deleted file mode 100644 index 4bc780a70..000000000 --- a/res/layout/all_apps_button.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2008 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. ---> - -<TextView style="@style/BaseIcon" /> diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml index b21120758..691219af6 100644 --- a/res/values-sw720dp/dimens.xml +++ b/res/values-sw720dp/dimens.xml @@ -16,7 +16,6 @@ <resources> <!-- All Apps --> - <dimen name="all_apps_button_scale_down">8dp</dimen> <dimen name="all_apps_empty_search_message_top_offset">64dp</dimen> <dimen name="all_apps_empty_search_bg_top_offset">180dp</dimen> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 3bb7a797a..58fce3482 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -76,7 +76,6 @@ <dimen name="fastscroll_end_margin">-26dp</dimen> <!-- All Apps --> - <dimen name="all_apps_button_scale_down">0dp</dimen> <dimen name="all_apps_search_bar_field_height">48dp</dimen> <dimen name="all_apps_search_bar_bottom_padding">30dp</dimen> <dimen name="all_apps_empty_search_message_top_offset">40dp</dimen> diff --git a/res/xml/dw_phone_hotseat.xml b/res/xml/dw_phone_hotseat.xml index b58994d1d..c691ebc3d 100644 --- a/res/xml/dw_phone_hotseat.xml +++ b/res/xml/dw_phone_hotseat.xml @@ -16,7 +16,7 @@ <favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"> <!-- Hotseat (We use the screen as the position of the item in the hotseat) --> - <!-- Dialer, Messaging, [All Apps], Browser, Camera --> + <!-- Dialer, Messaging, [Maps/Music], Browser, Camera --> <resolve launcher:container="-101" launcher:screen="0" @@ -39,7 +39,14 @@ <favorite launcher:uri="mmsto:" /> </resolve> - <!-- All Apps --> + <resolve + launcher:container="-101" + launcher:screen="2" + launcher:x="2" + launcher:y="0" > + <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MAPS;end" /> + <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MUSIC;end" /> + </resolve> <resolve launcher:container="-101" diff --git a/res/xml/dw_tablet_hotseat.xml b/res/xml/dw_tablet_hotseat.xml index 671ccba3c..6fe7f93d8 100644 --- a/res/xml/dw_tablet_hotseat.xml +++ b/res/xml/dw_tablet_hotseat.xml @@ -16,7 +16,7 @@ <favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"> <!-- Hotseat (We use the screen as the position of the item in the hotseat) --> - <!-- Messaging, Email, Browser, [All Apps], Music, Gallery, Camera --> + <!-- Messaging, Email, Browser, Maps, Music, Gallery, Camera --> <resolve launcher:container="-101" launcher:screen="0" @@ -48,7 +48,13 @@ <favorite launcher:uri="http://www.example.com/" /> </resolve> - <!-- All Apps --> + <resolve + launcher:container="-101" + launcher:screen="3" + launcher:x="3" + launcher:y="0" > + <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MAPS;end" /> + </resolve> <favorite launcher:container="-101" |