diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2019-01-03 16:47:18 -0800 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2019-01-07 12:35:35 -0800 |
| commit | 9fc5ae7fa7e40f626e62a980ebdde9103d2c62b2 (patch) | |
| tree | 9ad0fd4669ff187bf0408f5911140840f1b0bf20 /res | |
| parent | e0c927a50b7dc5c15dfc740ec43d5161fa6fbc92 (diff) | |
| download | android_packages_apps_Trebuchet-9fc5ae7fa7e40f626e62a980ebdde9103d2c62b2.tar.gz android_packages_apps_Trebuchet-9fc5ae7fa7e40f626e62a980ebdde9103d2c62b2.tar.bz2 android_packages_apps_Trebuchet-9fc5ae7fa7e40f626e62a980ebdde9103d2c62b2.zip | |
Moving folder shape logic definition to xml
Adding support for storing custom parameters in shape definition
Change-Id: I06f04f1836b337f8cc0ab2ad8c893bb03ae9c794
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/attrs.xml | 4 | ||||
| -rw-r--r-- | res/xml/folder_shapes.xml | 33 |
2 files changed, 36 insertions, 1 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 8c4dd1efd..53877ffa2 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -33,9 +33,11 @@ <attr name="workspaceKeyShadowColor" format="color" /> <attr name="workspaceStatusBarScrim" format="reference" /> <attr name="widgetsTheme" format="reference" /> - <attr name="folderDotColor" format="color" /> <attr name="loadingIconColor" format="color" /> + <attr name="folderDotColor" format="color" /> + <attr name="folderIconRadius" format="float" /> + <!-- BubbleTextView specific attributes. --> <declare-styleable name="BubbleTextView"> <attr name="layoutHorizontal" format="boolean" /> diff --git a/res/xml/folder_shapes.xml b/res/xml/folder_shapes.xml new file mode 100644 index 000000000..e60d333ba --- /dev/null +++ b/res/xml/folder_shapes.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2019 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. +--> +<shapes xmlns:launcher="http://schemas.android.com/apk/res-auto" > + + <Circle launcher:folderIconRadius="1" /> + + <!-- Default icon for AOSP --> + <RoundedSquare launcher:folderIconRadius="0.16" /> + + <!-- Rounded icon from RRO --> + <RoundedSquare launcher:folderIconRadius="0.6" /> + + <!-- Square icon --> + <RoundedSquare launcher:folderIconRadius="0" /> + + <TearDrop launcher:folderIconRadius="0.3" /> + <Squircle launcher:folderIconRadius="0.2" /> + +</shapes>
\ No newline at end of file |