diff options
author | Jorim Jaggi <jjaggi@google.com> | 2014-08-04 22:49:41 +0200 |
---|---|---|
committer | Jorim Jaggi <jjaggi@google.com> | 2014-08-05 15:24:26 +0200 |
commit | f479792e05485a536c3fa68db9d8a71f34591b78 (patch) | |
tree | fa7b98bf149c8f75d2ceb599e98f52d8a0bbc4e6 /packages/SystemUI/res/values-land | |
parent | 05204dc2275e0292d902884c6ec298d2e6afdd98 (diff) | |
download | frameworks_base-f479792e05485a536c3fa68db9d8a71f34591b78.zip frameworks_base-f479792e05485a536c3fa68db9d8a71f34591b78.tar.gz frameworks_base-f479792e05485a536c3fa68db9d8a71f34591b78.tar.bz2 |
New swipe-up assist animation for L.
Bug: 16307470
Bug: 14623152
Change-Id: Ib7e0381d118bda177981cc56ec9a8fb418dfb0e3
Diffstat (limited to 'packages/SystemUI/res/values-land')
-rw-r--r-- | packages/SystemUI/res/values-land/arrays.xml | 43 | ||||
-rw-r--r-- | packages/SystemUI/res/values-land/styles.xml | 18 |
2 files changed, 18 insertions, 43 deletions
diff --git a/packages/SystemUI/res/values-land/arrays.xml b/packages/SystemUI/res/values-land/arrays.xml deleted file mode 100644 index c32ce12..0000000 --- a/packages/SystemUI/res/values-land/arrays.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/common/assets/res/any/colors.xml -** -** Copyright 2012, 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. -*/ ---> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - - <array name="navbar_search_targets"> - <item>@null</item> - <item>@null</item> - <item>@drawable/ic_action_assist_generic</item> - <item>@null</item> - </array> - - <array name="navbar_search_target_descriptions"> - <item>@null</item> - <item>@null</item> - <item>@string/description_target_search</item> - <item>@null</item> - </array> - - <array name="navbar_search_direction_descriptions"> - <item>@null</item> - <item>@null</item> - <item>@string/description_direction_left</item> - <item>@null</item> - </array> - -</resources> diff --git a/packages/SystemUI/res/values-land/styles.xml b/packages/SystemUI/res/values-land/styles.xml index 8919198..682998d 100644 --- a/packages/SystemUI/res/values-land/styles.xml +++ b/packages/SystemUI/res/values-land/styles.xml @@ -18,4 +18,22 @@ <style name="BrightnessDialogContainer" parent="@style/BaseBrightnessDialogContainer"> <item name="android:layout_width">360dp</item> </style> + + <style name="SearchPanelCard"> + <item name="android:layout_width">@dimen/search_panel_card_height</item> + <item name="android:layout_height">match_parent</item> + <item name="android:layout_marginTop">16dp</item> + <item name="android:layout_marginBottom">16dp</item> + <item name="android:layout_gravity">right</item> + </style> + + <style name="SearchPanelLogo"> + <item name="android:layout_gravity">top|left</item> + </style> + + <style name="SearchPanelScrim"> + <item name="android:layout_width">@dimen/search_panel_scrim_height</item> + <item name="android:layout_height">match_parent</item> + <item name="android:layout_gravity">right</item> + </style> </resources> |