diff options
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable/ic_instant_app_badge.xml | 43 | ||||
-rw-r--r-- | res/layout/all_apps.xml | 5 | ||||
-rw-r--r-- | res/values-v26/styles.xml | 6 | ||||
-rw-r--r-- | res/values/attrs.xml | 1 | ||||
-rw-r--r-- | res/values/config.xml | 5 | ||||
-rw-r--r-- | res/values/styles.xml | 8 |
6 files changed, 52 insertions, 16 deletions
diff --git a/res/drawable/ic_instant_app_badge.xml b/res/drawable/ic_instant_app_badge.xml new file mode 100644 index 000000000..cc532309c --- /dev/null +++ b/res/drawable/ic_instant_app_badge.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2017 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="@dimen/profile_badge_size" + android:height="@dimen/profile_badge_size" + android:viewportWidth="18" + android:viewportHeight="18"> + + <path + android:fillColor="@android:color/black" + android:fillType="evenOdd" + android:strokeWidth="1" + android:pathData="M 9 0 C 13.9705627485 0 18 4.02943725152 18 9 C 18 13.9705627485 13.9705627485 18 9 18 C 4.02943725152 18 0 13.9705627485 0 9 C 0 4.02943725152 4.02943725152 0 9 0 Z" /> + <path + android:fillColor="@android:color/white" + android:fillType="evenOdd" + android:strokeWidth="1" + android:pathData="M 9 0 C 13.9705627485 0 18 4.02943725152 18 9 C 18 13.9705627485 13.9705627485 18 9 18 C 4.02943725152 18 0 13.9705627485 0 9 C 0 4.02943725152 4.02943725152 0 9 0 Z" /> + <path + android:fillColor="@android:color/white" + android:fillType="evenOdd" + android:strokeWidth="1" + android:pathData="M 9 0 C 13.9705627485 0 18 4.02943725152 18 9 C 18 13.9705627485 13.9705627485 18 9 18 C 4.02943725152 18 0 13.9705627485 0 9 C 0 4.02943725152 4.02943725152 0 9 0 Z" /> + <path + android:fillColor="@android:color/black" + android:fillAlpha="0.87" + android:fillType="evenOdd" + android:strokeWidth="1" + android:pathData="M 6 10.4123279 L 8.63934949 10.4123279 L 8.63934949 15.6 L 12.5577168 7.84517705 L 9.94547194 7.84517705 L 9.94547194 2 Z" /> +</vector>
\ No newline at end of file diff --git a/res/layout/all_apps.xml b/res/layout/all_apps.xml index 6340619ab..39df2b193 100644 --- a/res/layout/all_apps.xml +++ b/res/layout/all_apps.xml @@ -68,11 +68,10 @@ </com.android.launcher3.allapps.AllAppsRecyclerViewContainerView> <View - style="@style/AllAppsNavBarProtection" android:id="@+id/nav_bar_bg" + android:background="?attr/allAppsNavBarScrimColor" android:layout_width="match_parent" android:layout_height="0dp" android:layout_gravity="bottom" - android:focusable="false" - android:visibility="invisible" /> + android:focusable="false" /> </com.android.launcher3.allapps.AllAppsContainerView>
\ No newline at end of file diff --git a/res/values-v26/styles.xml b/res/values-v26/styles.xml index fd6fc4d50..b25f46a0c 100644 --- a/res/values-v26/styles.xml +++ b/res/values-v26/styles.xml @@ -26,10 +26,4 @@ <item name="android:colorPrimaryDark">#616161</item> <!-- Gray 700 --> </style> - <!-- From O and above, we show a dark nav bar in all-apps --> - <style name="AllAppsNavBarProtection"> - <item name="android:alpha">0.6</item> - <item name="android:background">?android:attr/colorPrimary</item> - </style> - </resources> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 7b52dae5d..68b628fb7 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -20,6 +20,7 @@ <!-- Attributes used for launcher theme --> <attr name="allAppsScrimColor" format="color" /> + <attr name="allAppsNavBarScrimColor" format="color" /> <attr name="popupColorPrimary" format="color" /> <attr name="popupColorSecondary" format="color" /> <attr name="popupColorTertiary" format="color" /> diff --git a/res/values/config.xml b/res/values/config.xml index b41172bb1..10b612ba2 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -1,7 +1,7 @@ <resources> <!-- Dynamic Grid --> <!-- Out of 100, the percent of space the overview bar should try and take vertically. --> - <integer name="config_dynamic_grid_overview_icon_zone_percentage">20</integer> + <integer name="config_dynamic_grid_overview_icon_zone_percentage">22</integer> <!-- Miscellaneous --> <bool name="config_largeHeap">false</bool> @@ -116,6 +116,9 @@ <!-- Name of a color extraction implementation class. --> <string name="color_extraction_impl_class" translatable="false"></string> + <!-- Name of a subclass of com.android.launcher3.util.InstantAppResolver. Can be empty. --> + <string name="instant_app_resolver_class" translatable="false"></string> + <!-- Package name of the default wallpaper picker. --> <string name="wallpaper_picker_package" translatable="false"></string> diff --git a/res/values/styles.xml b/res/values/styles.xml index 17bc7f9de..5d06705f8 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -30,6 +30,7 @@ <style name="BaseLauncherThemeWithCustomAttrs" parent="@style/BaseLauncherTheme"> <item name="allAppsScrimColor">#CCFFFFFF</item> + <item name="allAppsNavBarScrimColor">#66FFFFFF</item> <item name="popupColorPrimary">#FFF</item> <item name="popupColorSecondary">#F5F5F5</item> <!-- Gray 100 --> <item name="popupColorTertiary">#E0E0E0</item> <!-- Gray 300 --> @@ -62,6 +63,7 @@ <item name="android:colorControlHighlight">#A0FFFFFF</item> <item name="android:colorPrimary">#FF333333</item> <item name="allAppsScrimColor">#7A000000</item> + <item name="allAppsNavBarScrimColor">#80000000</item> <item name="popupColorPrimary">?android:attr/colorPrimary</item> <item name="popupColorSecondary">#424242</item> <!-- Gray 800 --> <item name="popupColorTertiary">#757575</item> <!-- Gray 600 --> @@ -103,12 +105,6 @@ <item name="android:includeFontPadding">false</item> </style> - <!-- Style for nav bar background in all-apps screen --> - <style name="AllAppsNavBarProtection"> - <item name="android:alpha">?android:attr/spotShadowAlpha</item> - <item name="android:background">@color/default_shadow_color_no_alpha</item> - </style> - <!-- Base theme for BubbleTextView and sub classes --> <style name="BaseIcon"> <item name="android:layout_width">match_parent</item> |