diff options
author | John Spurlock <jspurlock@google.com> | 2013-08-29 20:47:03 -0400 |
---|---|---|
committer | John Spurlock <jspurlock@google.com> | 2013-08-29 21:02:15 -0400 |
commit | 8f1f0109d3c124bfcb09c99e69e6ad51b8208c24 (patch) | |
tree | 172e10ce05ee4fb701eefd1a4be333f1fef5719d | |
parent | fda4698c255075d7f0209834b364dfe344e3ee75 (diff) | |
download | frameworks_base-8f1f0109d3c124bfcb09c99e69e6ad51b8208c24.zip frameworks_base-8f1f0109d3c124bfcb09c99e69e6ad51b8208c24.tar.gz frameworks_base-8f1f0109d3c124bfcb09c99e69e6ad51b8208c24.tar.bz2 |
Remove unused status bar help and obsolete resources.
Bug:10502089
Change-Id: I813244c4d5535256a56b242b92e6373edbbaba93
58 files changed, 0 insertions, 374 deletions
diff --git a/packages/SystemUI/res/drawable-hdpi/arrow_dashed.png b/packages/SystemUI/res/drawable-hdpi/arrow_dashed.png Binary files differdeleted file mode 100644 index a8075d5..0000000 --- a/packages/SystemUI/res/drawable-hdpi/arrow_dashed.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-hdpi/btn_cling_normal.9.png b/packages/SystemUI/res/drawable-hdpi/btn_cling_normal.9.png Binary files differdeleted file mode 100644 index aea8beb..0000000 --- a/packages/SystemUI/res/drawable-hdpi/btn_cling_normal.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-hdpi/btn_cling_pressed.9.png b/packages/SystemUI/res/drawable-hdpi/btn_cling_pressed.9.png Binary files differdeleted file mode 100644 index ebefd20..0000000 --- a/packages/SystemUI/res/drawable-hdpi/btn_cling_pressed.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-hdpi/btn_default_small_normal.9.png b/packages/SystemUI/res/drawable-hdpi/btn_default_small_normal.9.png Binary files differdeleted file mode 100644 index 6f456f3..0000000 --- a/packages/SystemUI/res/drawable-hdpi/btn_default_small_normal.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-hdpi/btn_default_small_normal_disable.9.png b/packages/SystemUI/res/drawable-hdpi/btn_default_small_normal_disable.9.png Binary files differdeleted file mode 100644 index e592ae6..0000000 --- a/packages/SystemUI/res/drawable-hdpi/btn_default_small_normal_disable.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-hdpi/btn_default_small_normal_disable_focused.9.png b/packages/SystemUI/res/drawable-hdpi/btn_default_small_normal_disable_focused.9.png Binary files differdeleted file mode 100644 index c1f87a7..0000000 --- a/packages/SystemUI/res/drawable-hdpi/btn_default_small_normal_disable_focused.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-hdpi/btn_default_small_pressed.9.png b/packages/SystemUI/res/drawable-hdpi/btn_default_small_pressed.9.png Binary files differdeleted file mode 100644 index 2d16eda..0000000 --- a/packages/SystemUI/res/drawable-hdpi/btn_default_small_pressed.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-hdpi/btn_default_small_selected.9.png b/packages/SystemUI/res/drawable-hdpi/btn_default_small_selected.9.png Binary files differdeleted file mode 100644 index 0749413..0000000 --- a/packages/SystemUI/res/drawable-hdpi/btn_default_small_selected.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-hdpi/recents_blue_glow.9.png b/packages/SystemUI/res/drawable-hdpi/recents_blue_glow.9.png Binary files differdeleted file mode 100644 index 95775ef..0000000 --- a/packages/SystemUI/res/drawable-hdpi/recents_blue_glow.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-hdpi/status_bar_bg_tile.png b/packages/SystemUI/res/drawable-hdpi/status_bar_bg_tile.png Binary files differdeleted file mode 100644 index aee197c..0000000 --- a/packages/SystemUI/res/drawable-hdpi/status_bar_bg_tile.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-hdpi/title_bar_shadow.9.png b/packages/SystemUI/res/drawable-hdpi/title_bar_shadow.9.png Binary files differdeleted file mode 100644 index 4650417..0000000 --- a/packages/SystemUI/res/drawable-hdpi/title_bar_shadow.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/arrow_dashed.png b/packages/SystemUI/res/drawable-mdpi/arrow_dashed.png Binary files differdeleted file mode 100644 index c17c668..0000000 --- a/packages/SystemUI/res/drawable-mdpi/arrow_dashed.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/btn_cling_normal.9.png b/packages/SystemUI/res/drawable-mdpi/btn_cling_normal.9.png Binary files differdeleted file mode 100644 index 43a407e..0000000 --- a/packages/SystemUI/res/drawable-mdpi/btn_cling_normal.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/btn_cling_pressed.9.png b/packages/SystemUI/res/drawable-mdpi/btn_cling_pressed.9.png Binary files differdeleted file mode 100644 index bf0c8cb..0000000 --- a/packages/SystemUI/res/drawable-mdpi/btn_cling_pressed.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/btn_default_small_normal.9.png b/packages/SystemUI/res/drawable-mdpi/btn_default_small_normal.9.png Binary files differdeleted file mode 100644 index 9b59b05..0000000 --- a/packages/SystemUI/res/drawable-mdpi/btn_default_small_normal.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/btn_default_small_normal_disable.9.png b/packages/SystemUI/res/drawable-mdpi/btn_default_small_normal_disable.9.png Binary files differdeleted file mode 100644 index b517af6..0000000 --- a/packages/SystemUI/res/drawable-mdpi/btn_default_small_normal_disable.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/btn_default_small_normal_disable_focused.9.png b/packages/SystemUI/res/drawable-mdpi/btn_default_small_normal_disable_focused.9.png Binary files differdeleted file mode 100644 index 019f33a..0000000 --- a/packages/SystemUI/res/drawable-mdpi/btn_default_small_normal_disable_focused.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/btn_default_small_pressed.9.png b/packages/SystemUI/res/drawable-mdpi/btn_default_small_pressed.9.png Binary files differdeleted file mode 100644 index 6ce1bd3..0000000 --- a/packages/SystemUI/res/drawable-mdpi/btn_default_small_pressed.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/btn_default_small_selected.9.png b/packages/SystemUI/res/drawable-mdpi/btn_default_small_selected.9.png Binary files differdeleted file mode 100644 index 0633543..0000000 --- a/packages/SystemUI/res/drawable-mdpi/btn_default_small_selected.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/recents_blue_glow.9.png b/packages/SystemUI/res/drawable-mdpi/recents_blue_glow.9.png Binary files differdeleted file mode 100644 index 7f44eae7..0000000 --- a/packages/SystemUI/res/drawable-mdpi/recents_blue_glow.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/status_bar_bg_tile.png b/packages/SystemUI/res/drawable-mdpi/status_bar_bg_tile.png Binary files differdeleted file mode 100644 index 6579ff9..0000000 --- a/packages/SystemUI/res/drawable-mdpi/status_bar_bg_tile.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/title_bar_shadow.9.png b/packages/SystemUI/res/drawable-mdpi/title_bar_shadow.9.png Binary files differdeleted file mode 100644 index f334023..0000000 --- a/packages/SystemUI/res/drawable-mdpi/title_bar_shadow.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw720dp-hdpi/notify_panel_clock_bg_normal.9.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/notify_panel_clock_bg_normal.9.png Binary files differdeleted file mode 100644 index 88137e8..0000000 --- a/packages/SystemUI/res/drawable-sw720dp-hdpi/notify_panel_clock_bg_normal.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw720dp-hdpi/notify_panel_clock_bg_pressed.9.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/notify_panel_clock_bg_pressed.9.png Binary files differdeleted file mode 100644 index 6507a51..0000000 --- a/packages/SystemUI/res/drawable-sw720dp-hdpi/notify_panel_clock_bg_pressed.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw720dp-hdpi/recents_blue_glow.9.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/recents_blue_glow.9.png Binary files differdeleted file mode 100644 index 4ac131a..0000000 --- a/packages/SystemUI/res/drawable-sw720dp-hdpi/recents_blue_glow.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw720dp-hdpi/sysbar_notification_panel_bg.9.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/sysbar_notification_panel_bg.9.png Binary files differdeleted file mode 100644 index 0c20ba2..0000000 --- a/packages/SystemUI/res/drawable-sw720dp-hdpi/sysbar_notification_panel_bg.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw720dp-mdpi/notify_panel_clock_bg_normal.9.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/notify_panel_clock_bg_normal.9.png Binary files differdeleted file mode 100644 index 798f589..0000000 --- a/packages/SystemUI/res/drawable-sw720dp-mdpi/notify_panel_clock_bg_normal.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw720dp-mdpi/notify_panel_clock_bg_pressed.9.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/notify_panel_clock_bg_pressed.9.png Binary files differdeleted file mode 100644 index 73247e5..0000000 --- a/packages/SystemUI/res/drawable-sw720dp-mdpi/notify_panel_clock_bg_pressed.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw720dp-mdpi/recents_blue_glow.9.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/recents_blue_glow.9.png Binary files differdeleted file mode 100644 index 4362836..0000000 --- a/packages/SystemUI/res/drawable-sw720dp-mdpi/recents_blue_glow.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw720dp-mdpi/sysbar_notification_panel_bg.9.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/sysbar_notification_panel_bg.9.png Binary files differdeleted file mode 100644 index 56cd238..0000000 --- a/packages/SystemUI/res/drawable-sw720dp-mdpi/sysbar_notification_panel_bg.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw720dp-tvdpi/sysbar_notification_panel_bg.9.png b/packages/SystemUI/res/drawable-sw720dp-tvdpi/sysbar_notification_panel_bg.9.png Binary files differdeleted file mode 100644 index 571a7a5..0000000 --- a/packages/SystemUI/res/drawable-sw720dp-tvdpi/sysbar_notification_panel_bg.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw720dp-xhdpi/notify_panel_clock_bg_normal.9.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/notify_panel_clock_bg_normal.9.png Binary files differdeleted file mode 100644 index 2b46c89..0000000 --- a/packages/SystemUI/res/drawable-sw720dp-xhdpi/notify_panel_clock_bg_normal.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw720dp-xhdpi/notify_panel_clock_bg_pressed.9.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/notify_panel_clock_bg_pressed.9.png Binary files differdeleted file mode 100644 index dd476b7..0000000 --- a/packages/SystemUI/res/drawable-sw720dp-xhdpi/notify_panel_clock_bg_pressed.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw720dp-xhdpi/recents_blue_glow.9.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/recents_blue_glow.9.png Binary files differdeleted file mode 100644 index 3938502..0000000 --- a/packages/SystemUI/res/drawable-sw720dp-xhdpi/recents_blue_glow.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw720dp-xhdpi/sysbar_notification_panel_bg.9.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/sysbar_notification_panel_bg.9.png Binary files differdeleted file mode 100644 index 3f05767..0000000 --- a/packages/SystemUI/res/drawable-sw720dp-xhdpi/sysbar_notification_panel_bg.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-xhdpi/arrow_dashed.png b/packages/SystemUI/res/drawable-xhdpi/arrow_dashed.png Binary files differdeleted file mode 100644 index c26ed9c..0000000 --- a/packages/SystemUI/res/drawable-xhdpi/arrow_dashed.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-xhdpi/btn_cling_normal.9.png b/packages/SystemUI/res/drawable-xhdpi/btn_cling_normal.9.png Binary files differdeleted file mode 100644 index 35511d6..0000000 --- a/packages/SystemUI/res/drawable-xhdpi/btn_cling_normal.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-xhdpi/btn_cling_pressed.9.png b/packages/SystemUI/res/drawable-xhdpi/btn_cling_pressed.9.png Binary files differdeleted file mode 100644 index a38b40f..0000000 --- a/packages/SystemUI/res/drawable-xhdpi/btn_cling_pressed.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-xhdpi/btn_default_small_normal.9.png b/packages/SystemUI/res/drawable-xhdpi/btn_default_small_normal.9.png Binary files differdeleted file mode 100644 index 5e601d2..0000000 --- a/packages/SystemUI/res/drawable-xhdpi/btn_default_small_normal.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-xhdpi/btn_default_small_normal_disable.9.png b/packages/SystemUI/res/drawable-xhdpi/btn_default_small_normal_disable.9.png Binary files differdeleted file mode 100644 index ed92cd0..0000000 --- a/packages/SystemUI/res/drawable-xhdpi/btn_default_small_normal_disable.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-xhdpi/btn_default_small_normal_disable_focused.9.png b/packages/SystemUI/res/drawable-xhdpi/btn_default_small_normal_disable_focused.9.png Binary files differdeleted file mode 100644 index f77dbfb..0000000 --- a/packages/SystemUI/res/drawable-xhdpi/btn_default_small_normal_disable_focused.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-xhdpi/btn_default_small_pressed.9.png b/packages/SystemUI/res/drawable-xhdpi/btn_default_small_pressed.9.png Binary files differdeleted file mode 100644 index e34107b..0000000 --- a/packages/SystemUI/res/drawable-xhdpi/btn_default_small_pressed.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-xhdpi/btn_default_small_selected.9.png b/packages/SystemUI/res/drawable-xhdpi/btn_default_small_selected.9.png Binary files differdeleted file mode 100644 index 8f70177..0000000 --- a/packages/SystemUI/res/drawable-xhdpi/btn_default_small_selected.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-xhdpi/recents_blue_glow.9.png b/packages/SystemUI/res/drawable-xhdpi/recents_blue_glow.9.png Binary files differdeleted file mode 100644 index 78978c8..0000000 --- a/packages/SystemUI/res/drawable-xhdpi/recents_blue_glow.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-xhdpi/status_bar_bg_tile.png b/packages/SystemUI/res/drawable-xhdpi/status_bar_bg_tile.png Binary files differdeleted file mode 100644 index d01b117..0000000 --- a/packages/SystemUI/res/drawable-xhdpi/status_bar_bg_tile.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-xhdpi/title_bar_shadow.9.png b/packages/SystemUI/res/drawable-xhdpi/title_bar_shadow.9.png Binary files differdeleted file mode 100644 index 89f14db..0000000 --- a/packages/SystemUI/res/drawable-xhdpi/title_bar_shadow.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-xxhdpi/recents_blue_glow.9.png b/packages/SystemUI/res/drawable-xxhdpi/recents_blue_glow.9.png Binary files differdeleted file mode 100644 index dca0cf5..0000000 --- a/packages/SystemUI/res/drawable-xxhdpi/recents_blue_glow.9.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable/btn_default_small.xml b/packages/SystemUI/res/drawable/btn_default_small.xml deleted file mode 100644 index 5485ea0..0000000 --- a/packages/SystemUI/res/drawable/btn_default_small.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2008 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"> - <item android:state_window_focused="false" android:state_enabled="true" - android:drawable="@drawable/btn_default_small_normal" /> - <item android:state_window_focused="false" android:state_enabled="false" - android:drawable="@drawable/btn_default_small_normal_disable" /> - <item android:state_pressed="true" - android:drawable="@drawable/btn_default_small_pressed" /> - <item android:state_focused="true" android:state_enabled="true" - android:drawable="@drawable/btn_default_small_selected" /> - <item android:state_enabled="true" - android:drawable="@drawable/btn_default_small_normal" /> - <item android:state_focused="true" - android:drawable="@drawable/btn_default_small_normal_disable_focused" /> - <item - android:drawable="@drawable/btn_default_small_normal_disable" /> -</selector> - diff --git a/packages/SystemUI/res/drawable/cling_button_bg.xml b/packages/SystemUI/res/drawable/cling_button_bg.xml deleted file mode 100644 index d175f53..0000000 --- a/packages/SystemUI/res/drawable/cling_button_bg.xml +++ /dev/null @@ -1,20 +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"> - <item android:state_pressed="true" android:drawable="@drawable/btn_cling_pressed" /> - <item android:drawable="@drawable/btn_cling_normal" /> -</selector>
\ No newline at end of file diff --git a/packages/SystemUI/res/drawable/notify_panel_clock_bg.xml b/packages/SystemUI/res/drawable/notify_panel_clock_bg.xml deleted file mode 100644 index c83d878..0000000 --- a/packages/SystemUI/res/drawable/notify_panel_clock_bg.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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"> - <item android:state_pressed="true" - android:drawable="@drawable/notify_panel_clock_bg_pressed" /> - <item android:drawable="@drawable/notify_panel_clock_bg_normal" /> -</selector> - diff --git a/packages/SystemUI/res/drawable/status_bar_bg.xml b/packages/SystemUI/res/drawable/status_bar_bg.xml deleted file mode 100644 index 403493b..0000000 --- a/packages/SystemUI/res/drawable/status_bar_bg.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> - -<bitmap - xmlns:android="http://schemas.android.com/apk/res/android" - android:tileMode="repeat" - android:src="@drawable/status_bar_bg_tile" - /> diff --git a/packages/SystemUI/res/layout-land/status_bar_help.xml b/packages/SystemUI/res/layout-land/status_bar_help.xml deleted file mode 100644 index a885b86..0000000 --- a/packages/SystemUI/res/layout-land/status_bar_help.xml +++ /dev/null @@ -1,71 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -** -** 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. -*/ ---> - -<!-- This is the combined status bar / notification panel window. --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui" - xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/status_bar_cling" - android:paddingStart="40dp" - android:paddingEnd="40dp" - android:background="#DD000000" - android:focusable="true" - android:orientation="horizontal" - android:gravity="top|start" - > - - <ImageView - android:layout_width="wrap_content" - android:layout_weight="0" - android:layout_height="wrap_content" - android:layout_marginEnd="50dp" - android:gravity="center" - android:src="@drawable/arrow_dashed" - tools:ignore="ContentDescription" /> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="1" - android:orientation="vertical" - android:layout_marginTop="40dp" - > - <TextView - style="@style/ClingTitleText" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/status_bar_help_title" /> - - <TextView - style="@style/ClingText" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="30dp" - android:text="@string/status_bar_help_text" /> - - <Button - android:id="@+id/ok" - style="@style/ClingButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingStart="50dp" - android:paddingEnd="50dp" - android:text="@android:string/ok" /> - </LinearLayout> -</LinearLayout> diff --git a/packages/SystemUI/res/layout/status_bar_help.xml b/packages/SystemUI/res/layout/status_bar_help.xml deleted file mode 100644 index f638767..0000000 --- a/packages/SystemUI/res/layout/status_bar_help.xml +++ /dev/null @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -** -** 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. -*/ ---> - -<!-- This is the combined status bar / notification panel window. --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui" - xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/status_bar_cling" - android:paddingStart="40dp" - android:paddingEnd="40dp" - android:background="#DD000000" - android:focusable="true" - android:orientation="vertical" - android:gravity="top|start" - > - - <ImageView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="50dp" - android:gravity="center" - android:src="@drawable/arrow_dashed" - tools:ignore="ContentDescription" /> - - <TextView - style="@style/ClingTitleText" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/status_bar_help_title" /> - - <TextView - style="@style/ClingText" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="30dp" - android:text="@string/status_bar_help_text" /> - - <Button - android:id="@+id/ok" - style="@style/ClingButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingStart="50dp" - android:paddingEnd="50dp" - android:text="@android:string/ok" /> - -</LinearLayout>
\ No newline at end of file diff --git a/packages/SystemUI/res/values/ids.xml b/packages/SystemUI/res/values/ids.xml deleted file mode 100644 index d876a95..0000000 --- a/packages/SystemUI/res/values/ids.xml +++ /dev/null @@ -1,20 +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. ---> - -<resources> - <item type="id" name="status_bar_cling_stub" /> -</resources> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 8e88610..3ffa6f4 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -493,10 +493,6 @@ <!-- QuickSettings: Brightness dialog auto brightness button [CHAR LIMIT=NONE] --> <string name="quick_settings_brightness_dialog_auto_brightness_label">AUTO</string> - <!-- Title of help text shown when the notification panel is pulled down for the very first time. [CHAR LIMIT=NONE] --> - <string name="status_bar_help_title">Notifications appear here</string> - <!-- Body of help text shown when the notification panel is pulled down for the very first time. [CHAR LIMIT=NONE] --> - <string name="status_bar_help_text">Access them anytime by swiping down.\nSwipe down again for system controls.</string> <!-- Glyph to be overlaid atop the battery when the level is extremely low. Do not translate. --> <string name="battery_meter_very_low_overlay_symbol">!</string> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index cd78041..134f228 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -159,33 +159,4 @@ <item name="android:textSize">14dp</item> </style> - <style name="ClingButton"> - <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:paddingTop">10dp</item> - <item name="android:paddingBottom">15dp</item> - <item name="android:paddingLeft">35dp</item> - <item name="android:paddingRight">35dp</item> - <item name="android:textStyle">bold</item> - <item name="android:background">@drawable/cling_button_bg</item> - </style> - <style name="ClingTitleText"> - <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:layout_marginBottom">5dp</item> - <item name="android:textSize">23sp</item> - <item name="android:textColor">#49C0EC</item> - <item name="android:shadowColor">#000000</item> - <item name="android:shadowDy">2</item> - <item name="android:shadowRadius">2.0</item> - </style> - <style name="ClingText"> - <item name="android:textSize">15sp</item> - <item name="android:textColor">#FFFFFF</item> - <item name="android:shadowColor">#000000</item> - <item name="android:shadowDy">2</item> - <item name="android:shadowRadius">2.0</item> - <item name="android:lineSpacingMultiplier">1.1</item> - </style> - </resources> diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index 4b0a2b7..870202a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -37,7 +37,6 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.content.SharedPreferences; import android.content.res.Resources; import android.database.ContentObserver; import android.graphics.Canvas; @@ -97,7 +96,6 @@ import com.android.systemui.statusbar.policy.LocationController; import com.android.systemui.statusbar.policy.NetworkController; import com.android.systemui.statusbar.policy.NotificationRowLayout; import com.android.systemui.statusbar.policy.OnSizeChangedListener; -import com.android.systemui.statusbar.policy.Prefs; import com.android.systemui.statusbar.policy.RotationLockController; import java.io.FileDescriptor; @@ -111,11 +109,8 @@ public class PhoneStatusBar extends BaseStatusBar { public static final boolean DUMPTRUCK = true; // extra dumpsys info public static final boolean DEBUG_GESTURES = false; - public static final boolean DEBUG_CLINGS = false; public static final boolean DEBUG_WINDOW_STATE = true; - public static final boolean ENABLE_NOTIFICATION_PANEL_CLING = false; - public static final boolean SETTINGS_DRAG_SHORTCUT = true; // additional instrumentation for testing purposes; intended to be left on during development @@ -251,11 +246,6 @@ public class PhoneStatusBar extends BaseStatusBar { boolean mTracking; VelocityTracker mVelocityTracker; - // help screen - private boolean mClingShown; - private ViewGroup mCling; - private boolean mSuppressStatusBarDrags; // while a cling is up, briefly deaden the bar to give things time to settle - int[] mAbsPos = new int[2]; Runnable mPostCollapseCleanup = null; @@ -615,13 +605,6 @@ public class PhoneStatusBar extends BaseStatusBar { } } - mClingShown = ! (DEBUG_CLINGS - || !Prefs.read(mContext).getBoolean(Prefs.SHOWN_QUICK_SETTINGS_HELP, false)); - - if (!ENABLE_NOTIFICATION_PANEL_CLING || ActivityManager.isRunningInTestHarness()) { - mClingShown = true; - } - // final ImageView wimaxRSSI = // (ImageView)sb.findViewById(R.id.wimax_signal); // if (wimaxRSSI != null) { @@ -1733,63 +1716,6 @@ public class PhoneStatusBar extends BaseStatusBar { } } - public boolean isClinging() { - return mCling != null && mCling.getVisibility() == View.VISIBLE; - } - - public void hideCling() { - if (isClinging()) { - mCling.animate().alpha(0f).setDuration(250).start(); - mCling.setVisibility(View.GONE); - mSuppressStatusBarDrags = false; - } - } - - public void showCling() { - // lazily inflate this to accommodate orientation change - final ViewStub stub = (ViewStub) mStatusBarWindow.findViewById(R.id.status_bar_cling_stub); - if (stub == null) { - mClingShown = true; - return; // no clings on this device - } - - mSuppressStatusBarDrags = true; - - mHandler.postDelayed(new Runnable() { - @Override - public void run() { - mCling = (ViewGroup) stub.inflate(); - - mCling.setOnTouchListener(new View.OnTouchListener() { - @Override - public boolean onTouch(View v, MotionEvent event) { - return true; // e eats everything - }}); - mCling.findViewById(R.id.ok).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - hideCling(); - }}); - - mCling.setAlpha(0f); - mCling.setVisibility(View.VISIBLE); - mCling.animate().alpha(1f); - - mClingShown = true; - SharedPreferences.Editor editor = Prefs.edit(mContext); - editor.putBoolean(Prefs.SHOWN_QUICK_SETTINGS_HELP, true); - editor.apply(); - - makeExpandedVisible(); // enforce visibility in case the shade is still animating closed - animateExpandNotificationsPanel(); - - mSuppressStatusBarDrags = false; - } - }, 500); - - animateExpandNotificationsPanel(); - } - public boolean interceptTouchEvent(MotionEvent event) { if (DEBUG_GESTURES) { if (event.getActionMasked() != MotionEvent.ACTION_MOVE) { @@ -1815,21 +1741,6 @@ public class PhoneStatusBar extends BaseStatusBar { mGestureRec.add(event); } - // Cling (first-run help) handling. - // The cling is supposed to show the first time you drag, or even tap, the status bar. - // It should show the notification panel, then fade in after half a second, giving you - // an explanation of what just happened, as well as teach you how to access quick - // settings (another drag). The user can dismiss the cling by clicking OK or by - // dragging quick settings into view. - final int act = event.getActionMasked(); - if (mSuppressStatusBarDrags) { - return true; - } else if (act == MotionEvent.ACTION_UP && !mClingShown) { - showCling(); - } else { - hideCling(); - } - setInteracting(true); return false; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/Prefs.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/Prefs.java index 73979a6..f339401 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/Prefs.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/Prefs.java @@ -22,8 +22,6 @@ import android.content.SharedPreferences; public class Prefs { private static final String SHARED_PREFS_NAME = "status_bar"; - public static final String SHOWN_QUICK_SETTINGS_HELP = "shown_quick_settings_help"; - public static SharedPreferences read(Context context) { return context.getSharedPreferences(Prefs.SHARED_PREFS_NAME, Context.MODE_PRIVATE); } |