diff options
author | fuzz <fuzzzzzzzzzzzzzzzzzz@gmail.com> | 2012-01-24 20:08:33 +0900 |
---|---|---|
committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2012-02-01 10:32:50 +0000 |
commit | 51937ceef88da9c949a6d5e2b597b15e29e2a8df (patch) | |
tree | f57f03bcf9168d90d02ee6322b4f54392164b304 | |
parent | 46c5c8e1849e0b7aa455530608485b0bbf2d8d43 (diff) | |
download | frameworks_base-51937ceef88da9c949a6d5e2b597b15e29e2a8df.zip frameworks_base-51937ceef88da9c949a6d5e2b597b15e29e2a8df.tar.gz frameworks_base-51937ceef88da9c949a6d5e2b597b15e29e2a8df.tar.bz2 |
Add 'Blade' lockscreen style (1/3)
It's been running very well for few weeks on our kangs
and really looks good,so I decided to rename it and upload.
drawables created by @Rick C ( resized by me )
Change-Id: I674a05b5f1eadb23028724fa3cfa9101c3b150c6
24 files changed, 130 insertions, 1 deletions
diff --git a/core/java/android/provider/CmSystem.java b/core/java/android/provider/CmSystem.java index 2ae56ff..5644a8b 100644 --- a/core/java/android/provider/CmSystem.java +++ b/core/java/android/provider/CmSystem.java @@ -185,7 +185,8 @@ public final class CmSystem { public enum RinglockStyle { Bubble, Revamped, - Holo; + Holo, + Blade; static public RinglockStyle getStyleById(int id) { switch (id) { @@ -195,6 +196,8 @@ public final class CmSystem { return Revamped; case 3: return Holo; + case 4: + return Blade; default: return Bubble; } @@ -212,6 +215,8 @@ public final class CmSystem { return 2; case Holo: return 3; + case Blade: + return 4; default: return 1; } diff --git a/core/res/res/drawable-hdpi/jog_ring_blade_ring_normal.png b/core/res/res/drawable-hdpi/jog_ring_blade_ring_normal.png Binary files differnew file mode 100644 index 0000000..5b71e14 --- /dev/null +++ b/core/res/res/drawable-hdpi/jog_ring_blade_ring_normal.png diff --git a/core/res/res/drawable-hdpi/jog_ring_blade_ring_pressed_gray.png b/core/res/res/drawable-hdpi/jog_ring_blade_ring_pressed_gray.png Binary files differnew file mode 100644 index 0000000..827a7fc --- /dev/null +++ b/core/res/res/drawable-hdpi/jog_ring_blade_ring_pressed_gray.png diff --git a/core/res/res/drawable-hdpi/jog_ring_blade_ring_pressed_green.png b/core/res/res/drawable-hdpi/jog_ring_blade_ring_pressed_green.png Binary files differnew file mode 100644 index 0000000..2c3e665 --- /dev/null +++ b/core/res/res/drawable-hdpi/jog_ring_blade_ring_pressed_green.png diff --git a/core/res/res/drawable-hdpi/jog_ring_blade_ring_pressed_red.png b/core/res/res/drawable-hdpi/jog_ring_blade_ring_pressed_red.png Binary files differnew file mode 100644 index 0000000..42dde94 --- /dev/null +++ b/core/res/res/drawable-hdpi/jog_ring_blade_ring_pressed_red.png diff --git a/core/res/res/drawable-hdpi/jog_ring_blade_ring_pressed_yellow.png b/core/res/res/drawable-hdpi/jog_ring_blade_ring_pressed_yellow.png Binary files differnew file mode 100644 index 0000000..3b25057 --- /dev/null +++ b/core/res/res/drawable-hdpi/jog_ring_blade_ring_pressed_yellow.png diff --git a/core/res/res/drawable-hdpi/jog_ring_blade_secback_normal.png b/core/res/res/drawable-hdpi/jog_ring_blade_secback_normal.png Binary files differnew file mode 100644 index 0000000..cfb1608 --- /dev/null +++ b/core/res/res/drawable-hdpi/jog_ring_blade_secback_normal.png diff --git a/core/res/res/drawable-ldpi/jog_ring_blade_ring_normal.png b/core/res/res/drawable-ldpi/jog_ring_blade_ring_normal.png Binary files differnew file mode 100644 index 0000000..1f53a60 --- /dev/null +++ b/core/res/res/drawable-ldpi/jog_ring_blade_ring_normal.png diff --git a/core/res/res/drawable-ldpi/jog_ring_blade_ring_pressed_gray.png b/core/res/res/drawable-ldpi/jog_ring_blade_ring_pressed_gray.png Binary files differnew file mode 100644 index 0000000..0d50739 --- /dev/null +++ b/core/res/res/drawable-ldpi/jog_ring_blade_ring_pressed_gray.png diff --git a/core/res/res/drawable-ldpi/jog_ring_blade_ring_pressed_green.png b/core/res/res/drawable-ldpi/jog_ring_blade_ring_pressed_green.png Binary files differnew file mode 100644 index 0000000..6a7481c --- /dev/null +++ b/core/res/res/drawable-ldpi/jog_ring_blade_ring_pressed_green.png diff --git a/core/res/res/drawable-ldpi/jog_ring_blade_ring_pressed_red.png b/core/res/res/drawable-ldpi/jog_ring_blade_ring_pressed_red.png Binary files differnew file mode 100644 index 0000000..26d4f4e --- /dev/null +++ b/core/res/res/drawable-ldpi/jog_ring_blade_ring_pressed_red.png diff --git a/core/res/res/drawable-ldpi/jog_ring_blade_ring_pressed_yellow.png b/core/res/res/drawable-ldpi/jog_ring_blade_ring_pressed_yellow.png Binary files differnew file mode 100644 index 0000000..58ef702 --- /dev/null +++ b/core/res/res/drawable-ldpi/jog_ring_blade_ring_pressed_yellow.png diff --git a/core/res/res/drawable-ldpi/jog_ring_blade_secback_normal.png b/core/res/res/drawable-ldpi/jog_ring_blade_secback_normal.png Binary files differnew file mode 100644 index 0000000..0c3f7e7 --- /dev/null +++ b/core/res/res/drawable-ldpi/jog_ring_blade_secback_normal.png diff --git a/core/res/res/drawable-mdpi/jog_ring_blade_ring_normal.png b/core/res/res/drawable-mdpi/jog_ring_blade_ring_normal.png Binary files differnew file mode 100644 index 0000000..2027bb2 --- /dev/null +++ b/core/res/res/drawable-mdpi/jog_ring_blade_ring_normal.png diff --git a/core/res/res/drawable-mdpi/jog_ring_blade_ring_pressed_gray.png b/core/res/res/drawable-mdpi/jog_ring_blade_ring_pressed_gray.png Binary files differnew file mode 100644 index 0000000..eeed5b9 --- /dev/null +++ b/core/res/res/drawable-mdpi/jog_ring_blade_ring_pressed_gray.png diff --git a/core/res/res/drawable-mdpi/jog_ring_blade_ring_pressed_green.png b/core/res/res/drawable-mdpi/jog_ring_blade_ring_pressed_green.png Binary files differnew file mode 100644 index 0000000..23e3908 --- /dev/null +++ b/core/res/res/drawable-mdpi/jog_ring_blade_ring_pressed_green.png diff --git a/core/res/res/drawable-mdpi/jog_ring_blade_ring_pressed_red.png b/core/res/res/drawable-mdpi/jog_ring_blade_ring_pressed_red.png Binary files differnew file mode 100644 index 0000000..f5bf8ac --- /dev/null +++ b/core/res/res/drawable-mdpi/jog_ring_blade_ring_pressed_red.png diff --git a/core/res/res/drawable-mdpi/jog_ring_blade_ring_pressed_yellow.png b/core/res/res/drawable-mdpi/jog_ring_blade_ring_pressed_yellow.png Binary files differnew file mode 100644 index 0000000..065541b --- /dev/null +++ b/core/res/res/drawable-mdpi/jog_ring_blade_ring_pressed_yellow.png diff --git a/core/res/res/drawable-mdpi/jog_ring_blade_secback_normal.png b/core/res/res/drawable-mdpi/jog_ring_blade_secback_normal.png Binary files differnew file mode 100644 index 0000000..8962d96 --- /dev/null +++ b/core/res/res/drawable-mdpi/jog_ring_blade_secback_normal.png diff --git a/core/res/res/drawable/jog_ring_blade_ring_gray.xml b/core/res/res/drawable/jog_ring_blade_ring_gray.xml new file mode 100644 index 0000000..8fb963a --- /dev/null +++ b/core/res/res/drawable/jog_ring_blade_ring_gray.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2009 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. +--> + +<!-- StateListDrawable used for buttons in the in-call onscreen touch UI. --> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" + android:drawable="@drawable/jog_ring_blade_ring_pressed_gray" /> + + <item android:state_enabled="true" + android:drawable="@drawable/jog_ring_blade_ring_normal" /> + + <item android:state_active="true" + android:drawable="@drawable/jog_ring_blade_ring_pressed_gray" /> + +</selector> diff --git a/core/res/res/drawable/jog_ring_blade_ring_green.xml b/core/res/res/drawable/jog_ring_blade_ring_green.xml new file mode 100644 index 0000000..109c01e --- /dev/null +++ b/core/res/res/drawable/jog_ring_blade_ring_green.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2009 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. +--> + +<!-- StateListDrawable used for buttons in the in-call onscreen touch UI. --> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" + android:drawable="@drawable/jog_ring_blade_ring_pressed_green" /> + + <item android:state_enabled="true" + android:drawable="@drawable/jog_ring_blade_ring_normal" /> + + <item android:state_active="true" + android:drawable="@drawable/jog_ring_blade_ring_pressed_green" /> + +</selector> diff --git a/core/res/res/drawable/jog_ring_blade_ring_red.xml b/core/res/res/drawable/jog_ring_blade_ring_red.xml new file mode 100644 index 0000000..f89f91d --- /dev/null +++ b/core/res/res/drawable/jog_ring_blade_ring_red.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2009 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. +--> + +<!-- StateListDrawable used for buttons in the in-call onscreen touch UI. --> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" + android:drawable="@drawable/jog_ring_blade_ring_pressed_red" /> + + <item android:state_enabled="true" + android:drawable="@drawable/jog_ring_blade_ring_normal" /> + + <item android:state_active="true" + android:drawable="@drawable/jog_ring_blade_ring_pressed_red" /> + +</selector> diff --git a/core/res/res/drawable/jog_ring_blade_ring_yellow.xml b/core/res/res/drawable/jog_ring_blade_ring_yellow.xml new file mode 100644 index 0000000..21834dc --- /dev/null +++ b/core/res/res/drawable/jog_ring_blade_ring_yellow.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2009 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. +--> + +<!-- StateListDrawable used for buttons in the in-call onscreen touch UI. --> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" + android:drawable="@drawable/jog_ring_blade_ring_pressed_yellow" /> + + <item android:state_enabled="true" + android:drawable="@drawable/jog_ring_blade_ring_normal" /> + + <item android:state_active="true" + android:drawable="@drawable/jog_ring_blade_ring_pressed_yellow" /> + +</selector> diff --git a/policy/src/com/android/internal/policy/impl/LockScreen.java b/policy/src/com/android/internal/policy/impl/LockScreen.java index fed1f53..6ae6681 100644 --- a/policy/src/com/android/internal/policy/impl/LockScreen.java +++ b/policy/src/com/android/internal/policy/impl/LockScreen.java @@ -581,6 +581,14 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM resCustom = R.drawable.ic_jog_dial_holo_custom; resTarget = R.drawable.jog_tab_target_holo; break; + case Blade: + resSecNorm = R.drawable.jog_ring_blade_secback_normal; + resRingGreen = R.drawable.jog_ring_blade_ring_green; + resRingHighlight = R.drawable.jog_ring_blade_ring_pressed_red; + resUnlock = R.drawable.ic_jog_dial_unlock; + resCustom = R.drawable.ic_jog_dial_custom; + resTarget = R.drawable.jog_tab_target_green; + break; default: resSecNorm = R.drawable.jog_ring_secback_normal; resRingGreen = R.drawable.jog_ring_ring_green; @@ -864,6 +872,10 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM iconId = R.drawable.ic_jog_dial_holo_sound_on; } break; + case Blade: + ringResource = mSilentMode ? R.drawable.jog_ring_blade_ring_yellow : + R.drawable.jog_ring_blade_ring_gray; + break; default: ringResource = mSilentMode ? R.drawable.jog_ring_ring_yellow : R.drawable.jog_ring_ring_gray; |