diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2018-05-08 18:10:12 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-08 18:10:12 +0000 |
commit | fe392da300831865dcc358b4dc832a87cda55d54 (patch) | |
tree | 0d5f72a3b1b0e02672bd633021ac064ee4bb8a88 /res | |
parent | a7158083dde64a87bf1f1dc690cb7a03e0287852 (diff) | |
parent | 927447e71d5daef2bbd4ed313a41d3ef9759cb18 (diff) | |
download | android_packages_apps_Trebuchet-fe392da300831865dcc358b4dc832a87cda55d54.tar.gz android_packages_apps_Trebuchet-fe392da300831865dcc358b4dc832a87cda55d54.tar.bz2 android_packages_apps_Trebuchet-fe392da300831865dcc358b4dc832a87cda55d54.zip |
Merge "Chaniging all-apps scrim" into ub-launcher3-edmonton
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/launcher.xml | 3 | ||||
-rw-r--r-- | res/layout/scrim_view.xml | 20 | ||||
-rw-r--r-- | res/values/config.xml | 3 |
3 files changed, 23 insertions, 3 deletions
diff --git a/res/layout/launcher.xml b/res/layout/launcher.xml index 6556adffc..cd8a4253b 100644 --- a/res/layout/launcher.xml +++ b/res/layout/launcher.xml @@ -57,6 +57,9 @@ android:id="@+id/drop_target_bar" layout="@layout/drop_target_bar" /> + <include android:id="@+id/scrim_view" + layout="@layout/scrim_view" /> + <include android:id="@+id/apps_view" layout="@layout/all_apps" diff --git a/res/layout/scrim_view.xml b/res/layout/scrim_view.xml new file mode 100644 index 000000000..a604d569d --- /dev/null +++ b/res/layout/scrim_view.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2018 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.views.ScrimView + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:id="@+id/scrim_view" />
\ No newline at end of file diff --git a/res/values/config.xml b/res/values/config.xml index 6158f29b3..d5bb131ef 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -41,9 +41,6 @@ <item type="id" name="drag_event_parity" /> <!-- AllApps & Launcher transitions --> - <!-- The alpha of the AppsCustomize bg in spring loaded mode --> - <integer name="config_workspaceScrimAlpha">76</integer> - <!-- Out of 100, the percent to shrink the workspace during spring loaded mode. --> <integer name="config_workspaceSpringLoadShrinkPercentage">90</integer> |