diff options
author | Chris Wren <cwren@android.com> | 2014-02-25 18:02:13 -0500 |
---|---|---|
committer | Chris Wren <cwren@android.com> | 2014-02-27 11:38:21 -0500 |
commit | 9924e130373455899ecb4f0d78d6b607fb40e866 (patch) | |
tree | 11543e1d6e82faefe7b0a588503c53da854f7ab9 /packages/SystemUI/res | |
parent | e5f98941bad09f797329aeec090177e1da17220e (diff) | |
download | frameworks_base-9924e130373455899ecb4f0d78d6b607fb40e866.zip frameworks_base-9924e130373455899ecb4f0d78d6b607fb40e866.tar.gz frameworks_base-9924e130373455899ecb4f0d78d6b607fb40e866.tar.bz2 |
improvements to heads up interface
remove shadow
quick hack to open shade from HUN
over status bar instead of under and below it
dismiss by pushing up
tablets: shadow remains on left, right, and bottom
Bug: 13208692
Change-Id: Ie3abb762fb1388be68353c7e3111fe4708ab8110
Diffstat (limited to 'packages/SystemUI/res')
-rw-r--r-- | packages/SystemUI/res/anim/heads_up_exit.xml | 12 | ||||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/heads_up_window_bg.9.png | bin | 779 -> 0 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/heads_up_window_bg.9.png | bin | 500 -> 0 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-sw600dp-xhdpi/heads_up_window_bg.9.png | bin | 2226 -> 1391 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-sw600dp-xxhdpi/heads_up_window_bg.9.png | bin | 2028 -> 1207 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-xhdpi/heads_up_window_bg.9.png | bin | 965 -> 0 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-xxhdpi/heads_up_window_bg.9.png | bin | 2028 -> 0 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable/heads_up_notification_row_bg.xml | 21 | ||||
-rw-r--r-- | packages/SystemUI/res/layout-sw600dp/heads_up.xml | 31 | ||||
-rw-r--r-- | packages/SystemUI/res/layout/heads_up.xml | 28 |
10 files changed, 43 insertions, 49 deletions
diff --git a/packages/SystemUI/res/anim/heads_up_exit.xml b/packages/SystemUI/res/anim/heads_up_exit.xml index 05c144a..2cad8f6 100644 --- a/packages/SystemUI/res/anim/heads_up_exit.xml +++ b/packages/SystemUI/res/anim/heads_up_exit.xml @@ -1,13 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <set xmlns:android="http://schemas.android.com/apk/res/android" > - <scale - android:interpolator="@android:interpolator/accelerate_quad" - android:fromXScale="1.0" android:toXScale="0.7" - android:fromYScale="1.0" android:toYScale="0.7" - android:pivotX="50%" android:pivotY="50%" - android:duration="@android:integer/config_shortAnimTime" /> - <alpha + <translate + android:interpolator="@android:interpolator/overshoot" + android:fromYDelta="0" android:toYDelta="-50%" + android:duration="@android:integer/config_shortAnimTime" /> + <alpha android:interpolator="@android:interpolator/accelerate_quad" android:fromAlpha="1.0" android:toAlpha="0.0" android:duration="@android:integer/config_shortAnimTime" /> diff --git a/packages/SystemUI/res/drawable-hdpi/heads_up_window_bg.9.png b/packages/SystemUI/res/drawable-hdpi/heads_up_window_bg.9.png Binary files differdeleted file mode 100644 index 3b952d0..0000000 --- a/packages/SystemUI/res/drawable-hdpi/heads_up_window_bg.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/heads_up_window_bg.9.png b/packages/SystemUI/res/drawable-mdpi/heads_up_window_bg.9.png Binary files differdeleted file mode 100644 index a0ab991..0000000 --- a/packages/SystemUI/res/drawable-mdpi/heads_up_window_bg.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/heads_up_window_bg.9.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/heads_up_window_bg.9.png Binary files differindex 6002cfb..31eb8f7 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/heads_up_window_bg.9.png +++ b/packages/SystemUI/res/drawable-sw600dp-xhdpi/heads_up_window_bg.9.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/heads_up_window_bg.9.png b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/heads_up_window_bg.9.png Binary files differindex 586a738..c76d0e1 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/heads_up_window_bg.9.png +++ b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/heads_up_window_bg.9.png diff --git a/packages/SystemUI/res/drawable-xhdpi/heads_up_window_bg.9.png b/packages/SystemUI/res/drawable-xhdpi/heads_up_window_bg.9.png Binary files differdeleted file mode 100644 index 42e5593..0000000 --- a/packages/SystemUI/res/drawable-xhdpi/heads_up_window_bg.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-xxhdpi/heads_up_window_bg.9.png b/packages/SystemUI/res/drawable-xxhdpi/heads_up_window_bg.9.png Binary files differdeleted file mode 100644 index 586a738..0000000 --- a/packages/SystemUI/res/drawable-xxhdpi/heads_up_window_bg.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable/heads_up_notification_row_bg.xml b/packages/SystemUI/res/drawable/heads_up_notification_row_bg.xml deleted file mode 100644 index 59d9fcf..0000000 --- a/packages/SystemUI/res/drawable/heads_up_notification_row_bg.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 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. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android" - android:exitFadeDuration="@android:integer/config_mediumAnimTime"> - <item android:state_pressed="true" - android:drawable="@drawable/heads_up_notification_bg_pressed" /> -</selector> diff --git a/packages/SystemUI/res/layout-sw600dp/heads_up.xml b/packages/SystemUI/res/layout-sw600dp/heads_up.xml new file mode 100644 index 0000000..71f7c21 --- /dev/null +++ b/packages/SystemUI/res/layout-sw600dp/heads_up.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2014, 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.systemui.statusbar.policy.HeadsUpNotificationView + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_height="wrap_content" + android:layout_width="match_parent" + > + <FrameLayout + android:id="@+id/content_holder" + android:layout_height="wrap_content" + android:layout_width="@dimen/notification_panel_width" + android:layout_marginStart="@dimen/notification_panel_margin_left" + android:background="@drawable/heads_up_window_bg" + /> +</com.android.systemui.statusbar.policy.HeadsUpNotificationView> diff --git a/packages/SystemUI/res/layout/heads_up.xml b/packages/SystemUI/res/layout/heads_up.xml index 564dc51..3a58b84 100644 --- a/packages/SystemUI/res/layout/heads_up.xml +++ b/packages/SystemUI/res/layout/heads_up.xml @@ -17,25 +17,11 @@ ** limitations under the License. */ --> - -<!-- android:background="@drawable/status_bar_closed_default_background" --> <com.android.systemui.statusbar.policy.HeadsUpNotificationView - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:orientation="vertical" - > - <FrameLayout - android:layout_height="wrap_content" - android:layout_width="@dimen/notification_panel_width" - android:id="@+id/content_slider" - android:layout_marginStart="@dimen/notification_panel_margin_left" - > - <FrameLayout - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:id="@+id/content_holder" - android:background="@drawable/heads_up_window_bg" - /> - </FrameLayout> -</com.android.systemui.statusbar.policy.HeadsUpNotificationView> + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_height="wrap_content" + android:layout_width="@dimen/notification_panel_width" + android:id="@+id/content_holder" + android:layout_marginStart="@dimen/notification_panel_margin_left" + android:background="@drawable/notification_panel_bg" + />
\ No newline at end of file |