diff options
author | Daniel Sandler <dsandler@google.com> | 2010-08-31 14:16:13 -0400 |
---|---|---|
committer | Daniel Sandler <dsandler@google.com> | 2010-09-02 11:34:20 -0400 |
commit | d39e388e6d7f19d6e8d620e449af4124efab1d0d (patch) | |
tree | b259178ffad67caec0129509445b39354e2c1d98 /packages/SystemUI/res/drawable | |
parent | 1770b872897d208a6f1fd4c7c9c4203cd3b6af4d (diff) | |
download | frameworks_base-d39e388e6d7f19d6e8d620e449af4124efab1d0d.zip frameworks_base-d39e388e6d7f19d6e8d620e449af4124efab1d0d.tar.gz frameworks_base-d39e388e6d7f19d6e8d620e449af4124efab1d0d.tar.bz2 |
Redesigned system bar and quick settings panel.
Change-Id: Ie26767a8c25af64809cf2fd1d8364791cb7e55ed
Diffstat (limited to 'packages/SystemUI/res/drawable')
-rw-r--r-- | packages/SystemUI/res/drawable/battery.xml | 30 | ||||
-rw-r--r-- | packages/SystemUI/res/drawable/battery_charging.xml | 48 | ||||
-rw-r--r-- | packages/SystemUI/res/drawable/ic_sysbar_icon_bg.xml | 21 | ||||
-rw-r--r-- | packages/SystemUI/res/drawable/signal_scan.xml | 29 | ||||
-rw-r--r-- | packages/SystemUI/res/drawable/sysbar_battery.xml | 33 | ||||
-rw-r--r-- | packages/SystemUI/res/drawable/sysbar_batterymini.xml (renamed from packages/SystemUI/res/drawable/wifi.xml) | 18 | ||||
-rw-r--r-- | packages/SystemUI/res/drawable/sysbar_signal.xml | 33 | ||||
-rw-r--r-- | packages/SystemUI/res/drawable/sysbar_signalmini.xml (renamed from packages/SystemUI/res/drawable/signal.xml) | 13 | ||||
-rw-r--r-- | packages/SystemUI/res/drawable/sysbar_wifi.xml | 33 | ||||
-rw-r--r-- | packages/SystemUI/res/drawable/sysbar_wifimini.xml (renamed from packages/SystemUI/res/drawable/wifi_scan.xml) | 14 |
10 files changed, 139 insertions, 133 deletions
diff --git a/packages/SystemUI/res/drawable/battery.xml b/packages/SystemUI/res/drawable/battery.xml deleted file mode 100644 index 3bc0c74..0000000 --- a/packages/SystemUI/res/drawable/battery.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/common/res/drawable/stat_sys_battery.xml -** -** Copyright 2007, 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. -*/ ---> - -<level-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:maxLevel="1" android:drawable="@drawable/battery_0" /> - <item android:maxLevel="5" android:drawable="@drawable/battery_5" /> - <item android:maxLevel="10" android:drawable="@drawable/battery_10" /> - <item android:maxLevel="25" android:drawable="@drawable/battery_25" /> - <item android:maxLevel="50" android:drawable="@drawable/battery_50" /> - <item android:maxLevel="75" android:drawable="@drawable/battery_75" /> - <item android:maxLevel="101" android:drawable="@drawable/battery_100" /> -</level-list> - diff --git a/packages/SystemUI/res/drawable/battery_charging.xml b/packages/SystemUI/res/drawable/battery_charging.xml deleted file mode 100644 index c9b77dd..0000000 --- a/packages/SystemUI/res/drawable/battery_charging.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/common/res/drawable/stat_sys_battery.xml -** -** Copyright 2007, 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. -*/ ---> - -<level-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:maxLevel="25"> - <animation-list android:oneshot="false"> - <item android:drawable="@drawable/battery_0" android:duration="1000" /> - <item android:drawable="@drawable/battery_25" android:duration="1000" /> - </animation-list> - </item> - <item android:maxLevel="50"> - <animation-list android:oneshot="false"> - <item android:drawable="@drawable/battery_25" android:duration="1000" /> - <item android:drawable="@drawable/battery_50" android:duration="1000" /> - </animation-list> - </item> - <item android:maxLevel="75"> - <animation-list android:oneshot="false"> - <item android:drawable="@drawable/battery_50" android:duration="1000" /> - <item android:drawable="@drawable/battery_75" android:duration="1000" /> - </animation-list> - </item> - <item android:maxLevel="92"> - <animation-list android:oneshot="false"> - <item android:drawable="@drawable/battery_75" android:duration="1000" /> - <item android:drawable="@drawable/battery_100" android:duration="1000" /> - </animation-list> - </item> - <item android:maxLevel="101" android:drawable="@drawable/battery_100" /> -</level-list> - diff --git a/packages/SystemUI/res/drawable/ic_sysbar_icon_bg.xml b/packages/SystemUI/res/drawable/ic_sysbar_icon_bg.xml new file mode 100644 index 0000000..d8ba2a8 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_sysbar_icon_bg.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 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/ic_sysbar_press_bg" /> + <item android:drawable="@drawable/ic_sysbar_default_bg" /> +</selector> + diff --git a/packages/SystemUI/res/drawable/signal_scan.xml b/packages/SystemUI/res/drawable/signal_scan.xml deleted file mode 100644 index fe21992..0000000 --- a/packages/SystemUI/res/drawable/signal_scan.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/common/res/drawable/stat_sys_battery.xml -** -** Copyright 2007, 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. -*/ ---> - -<animation-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@drawable/signal_scan1" android:duration="500" /> - <item android:drawable="@drawable/signal_scan2" android:duration="500" /> - <item android:drawable="@drawable/signal_scan3" android:duration="500" /> - <item android:drawable="@drawable/signal_scan4" android:duration="500" /> - <item android:drawable="@drawable/signal_scan3" android:duration="500" /> - <item android:drawable="@drawable/signal_scan2" android:duration="500" /> -</animation-list> - diff --git a/packages/SystemUI/res/drawable/sysbar_battery.xml b/packages/SystemUI/res/drawable/sysbar_battery.xml new file mode 100644 index 0000000..9551bf0 --- /dev/null +++ b/packages/SystemUI/res/drawable/sysbar_battery.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* //device/apps/common/res/drawable/stat_sys_battery.xml +** +** Copyright 2007, 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. +*/ +--> + +<level-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:maxLevel="01" android:drawable="@drawable/sysbar_battery_0" /> + <item android:maxLevel="10" android:drawable="@drawable/sysbar_battery_10" /> + <item android:maxLevel="20" android:drawable="@drawable/sysbar_battery_20" /> + <item android:maxLevel="30" android:drawable="@drawable/sysbar_battery_30" /> + <item android:maxLevel="40" android:drawable="@drawable/sysbar_battery_40" /> + <item android:maxLevel="50" android:drawable="@drawable/sysbar_battery_50" /> + <item android:maxLevel="60" android:drawable="@drawable/sysbar_battery_60" /> + <item android:maxLevel="70" android:drawable="@drawable/sysbar_battery_70" /> + <item android:maxLevel="80" android:drawable="@drawable/sysbar_battery_80" /> + <item android:maxLevel="90" android:drawable="@drawable/sysbar_battery_90" /> + <item android:maxLevel="101" android:drawable="@drawable/sysbar_battery_100" /> +</level-list> diff --git a/packages/SystemUI/res/drawable/wifi.xml b/packages/SystemUI/res/drawable/sysbar_batterymini.xml index 6e63af6..f7ba6b1 100644 --- a/packages/SystemUI/res/drawable/wifi.xml +++ b/packages/SystemUI/res/drawable/sysbar_batterymini.xml @@ -18,12 +18,12 @@ */ --> -<level-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:maxLevel="01" android:drawable="@drawable/wifi_0" /> - <item android:maxLevel="25" android:drawable="@drawable/wifi_25" /> - <item android:maxLevel="50" android:drawable="@drawable/wifi_50" /> - <item android:maxLevel="75" android:drawable="@drawable/wifi_75" /> - <item android:maxLevel="101" android:drawable="@drawable/wifi_100" /> - -</level-list> - +<clip xmlns:android="http://schemas.android.com/apk/res/android" + android:clipOrientation="horizontal" + android:maxLevel="100" + android:gravity="left"> + <level-list> + <item android:maxLevel="15" android:drawable="@drawable/sysbar_batterymini_red" /> + <item android:maxLevel="101" android:drawable="@drawable/sysbar_batterymini_100" /> + </level-list> +</clip> diff --git a/packages/SystemUI/res/drawable/sysbar_signal.xml b/packages/SystemUI/res/drawable/sysbar_signal.xml new file mode 100644 index 0000000..9561c37 --- /dev/null +++ b/packages/SystemUI/res/drawable/sysbar_signal.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* //device/apps/common/res/drawable/stat_sys_battery.xml +** +** Copyright 2007, 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. +*/ +--> + +<level-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:maxLevel="01" android:drawable="@drawable/sysbar_signal_0" /> + <item android:maxLevel="10" android:drawable="@drawable/sysbar_signal_10" /> + <item android:maxLevel="20" android:drawable="@drawable/sysbar_signal_20" /> + <item android:maxLevel="30" android:drawable="@drawable/sysbar_signal_30" /> + <item android:maxLevel="40" android:drawable="@drawable/sysbar_signal_40" /> + <item android:maxLevel="50" android:drawable="@drawable/sysbar_signal_50" /> + <item android:maxLevel="60" android:drawable="@drawable/sysbar_signal_60" /> + <item android:maxLevel="70" android:drawable="@drawable/sysbar_signal_70" /> + <item android:maxLevel="80" android:drawable="@drawable/sysbar_signal_80" /> + <item android:maxLevel="90" android:drawable="@drawable/sysbar_signal_90" /> + <item android:maxLevel="101" android:drawable="@drawable/sysbar_signal_100" /> +</level-list> diff --git a/packages/SystemUI/res/drawable/signal.xml b/packages/SystemUI/res/drawable/sysbar_signalmini.xml index 7367418..ca6c9ed 100644 --- a/packages/SystemUI/res/drawable/signal.xml +++ b/packages/SystemUI/res/drawable/sysbar_signalmini.xml @@ -18,11 +18,8 @@ */ --> -<level-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:maxLevel="01" android:drawable="@drawable/signal_0" /> - <item android:maxLevel="25" android:drawable="@drawable/signal_25" /> - <item android:maxLevel="50" android:drawable="@drawable/signal_50" /> - <item android:maxLevel="75" android:drawable="@drawable/signal_75" /> - <item android:maxLevel="101" android:drawable="@drawable/signal_100" /> -</level-list> - +<clip xmlns:android="http://schemas.android.com/apk/res/android" + android:clipOrientation="horizontal" + android:gravity="right" + android:maxLevel="100" + android:drawable="@drawable/sysbar_signalmini_100" /> diff --git a/packages/SystemUI/res/drawable/sysbar_wifi.xml b/packages/SystemUI/res/drawable/sysbar_wifi.xml new file mode 100644 index 0000000..9561c37 --- /dev/null +++ b/packages/SystemUI/res/drawable/sysbar_wifi.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* //device/apps/common/res/drawable/stat_sys_battery.xml +** +** Copyright 2007, 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. +*/ +--> + +<level-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:maxLevel="01" android:drawable="@drawable/sysbar_signal_0" /> + <item android:maxLevel="10" android:drawable="@drawable/sysbar_signal_10" /> + <item android:maxLevel="20" android:drawable="@drawable/sysbar_signal_20" /> + <item android:maxLevel="30" android:drawable="@drawable/sysbar_signal_30" /> + <item android:maxLevel="40" android:drawable="@drawable/sysbar_signal_40" /> + <item android:maxLevel="50" android:drawable="@drawable/sysbar_signal_50" /> + <item android:maxLevel="60" android:drawable="@drawable/sysbar_signal_60" /> + <item android:maxLevel="70" android:drawable="@drawable/sysbar_signal_70" /> + <item android:maxLevel="80" android:drawable="@drawable/sysbar_signal_80" /> + <item android:maxLevel="90" android:drawable="@drawable/sysbar_signal_90" /> + <item android:maxLevel="101" android:drawable="@drawable/sysbar_signal_100" /> +</level-list> diff --git a/packages/SystemUI/res/drawable/wifi_scan.xml b/packages/SystemUI/res/drawable/sysbar_wifimini.xml index 5888d0e..ca6c9ed 100644 --- a/packages/SystemUI/res/drawable/wifi_scan.xml +++ b/packages/SystemUI/res/drawable/sysbar_wifimini.xml @@ -18,12 +18,8 @@ */ --> -<animation-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@drawable/wifi_scan1" android:duration="500" /> - <item android:drawable="@drawable/wifi_scan2" android:duration="500" /> - <item android:drawable="@drawable/wifi_scan3" android:duration="500" /> - <item android:drawable="@drawable/wifi_scan4" android:duration="500" /> - <item android:drawable="@drawable/wifi_scan3" android:duration="500" /> - <item android:drawable="@drawable/wifi_scan2" android:duration="500" /> -</animation-list> - +<clip xmlns:android="http://schemas.android.com/apk/res/android" + android:clipOrientation="horizontal" + android:gravity="right" + android:maxLevel="100" + android:drawable="@drawable/sysbar_signalmini_100" /> |