am e51b40c4: am 36a6b2e9: am 68898395: Merge "Tweak layouts for digital clock widget." into jb-mr1.1-dev
* commit 'e51b40c48405c7a8cc2afbd84165edc95a09ec49':
Tweak layouts for digital clock widget.
diff --git a/Android.mk b/Android.mk
index a0d1b19..f19bc81 100644
--- a/Android.mk
+++ b/Android.mk
@@ -12,7 +12,7 @@
LOCAL_OVERRIDES_PACKAGES := AlarmClock
-LOCAL_SDK_VERSION := 17
+LOCAL_SDK_VERSION := current
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
diff --git a/res/drawable/clock_analog_dial_mipmap.xml b/res/drawable/clock_analog_dial_mipmap.xml
new file mode 100644
index 0000000..a92d9ce
--- /dev/null
+++ b/res/drawable/clock_analog_dial_mipmap.xml
@@ -0,0 +1,19 @@
+<?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.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+ android:mipMap="true"
+ android:src="@drawable/clock_analog_dial" />
diff --git a/res/drawable/clock_analog_hour_mipmap.xml b/res/drawable/clock_analog_hour_mipmap.xml
new file mode 100644
index 0000000..5094597
--- /dev/null
+++ b/res/drawable/clock_analog_hour_mipmap.xml
@@ -0,0 +1,19 @@
+<?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.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+ android:mipMap="true"
+ android:src="@drawable/clock_analog_hour" />
diff --git a/res/drawable/clock_analog_minute_mipmap.xml b/res/drawable/clock_analog_minute_mipmap.xml
new file mode 100644
index 0000000..553d236
--- /dev/null
+++ b/res/drawable/clock_analog_minute_mipmap.xml
@@ -0,0 +1,19 @@
+<?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.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+ android:mipMap="true"
+ android:src="@drawable/clock_analog_minute" />
diff --git a/res/drawable/clock_analog_second_mipmap.xml b/res/drawable/clock_analog_second_mipmap.xml
new file mode 100644
index 0000000..8a55626
--- /dev/null
+++ b/res/drawable/clock_analog_second_mipmap.xml
@@ -0,0 +1,19 @@
+<?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.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+ android:mipMap="true"
+ android:src="@drawable/clock_analog_second" />
diff --git a/res/layout/desk_clock_saver.xml b/res/layout/desk_clock_saver.xml
index 2cddbd6..7e44c40 100644
--- a/res/layout/desk_clock_saver.xml
+++ b/res/layout/desk_clock_saver.xml
@@ -50,9 +50,9 @@
dc:jewelRadius="5dp"
dc:jewelOffset="23dp"
dc:jewelColor="@color/clock_white"
- android:dial="@drawable/clock_analog_dial"
- android:hand_hour="@drawable/clock_analog_hour"
- android:hand_minute="@drawable/clock_analog_minute"
+ android:dial="@drawable/clock_analog_dial_mipmap"
+ android:hand_hour="@drawable/clock_analog_hour_mipmap"
+ android:hand_minute="@drawable/clock_analog_minute_mipmap"
android:layout_marginBottom="@dimen/time_margin_bottom"/>
<LinearLayout
diff --git a/res/layout/main_clock_frame.xml b/res/layout/main_clock_frame.xml
index e36565b..7857b04 100644
--- a/res/layout/main_clock_frame.xml
+++ b/res/layout/main_clock_frame.xml
@@ -31,9 +31,9 @@
android:layout_marginLeft="@dimen/analog_clock_margin"
android:layout_marginRight="@dimen/analog_clock_margin"
android:layout_gravity="center_horizontal"
- android:dial="@drawable/clock_analog_dial"
- android:hand_hour="@drawable/clock_analog_hour"
- android:hand_minute="@drawable/clock_analog_minute"
+ android:dial="@drawable/clock_analog_dial_mipmap"
+ android:hand_hour="@drawable/clock_analog_hour_mipmap"
+ android:hand_minute="@drawable/clock_analog_minute_mipmap"
android:layout_marginBottom="@dimen/time_margin_bottom"/>
<include layout="@layout/desk_clock_time_date"
android:id="@+id/digital_clock"
diff --git a/res/layout/world_clock_item.xml b/res/layout/world_clock_item.xml
index cc1b993..253660d 100644
--- a/res/layout/world_clock_item.xml
+++ b/res/layout/world_clock_item.xml
@@ -36,9 +36,9 @@
android:layout_width="@dimen/world_clock_analog_size"
android:layout_height="@dimen/world_clock_analog_size"
android:layout_gravity="center_horizontal"
- android:dial="@drawable/clock_analog_dial"
- android:hand_hour="@drawable/clock_analog_hour"
- android:hand_minute="@drawable/clock_analog_minute"/>
+ android:dial="@drawable/clock_analog_dial_mipmap"
+ android:hand_hour="@drawable/clock_analog_hour_mipmap"
+ android:hand_minute="@drawable/clock_analog_minute_mipmap"/>
</FrameLayout>
<com.android.deskclock.widget.EllipsizeLayout
android:id="@+id/city_name_layout"
diff --git a/res/values-de/array.xml b/res/values-de/array.xml
index 0fc970e..3f5815a 100644
--- a/res/values-de/array.xml
+++ b/res/values-de/array.xml
@@ -286,7 +286,7 @@
<item msgid="4214691757607136548">"Hanoi"</item>
<item msgid="484506613000693635">"Ankara"</item>
<item msgid="1958807113380596945">"Bangalore"</item>
- <item msgid="2258411542499008700">"Brasilia"</item>
+ <item msgid="2258411542499008700">"Brasília"</item>
<item msgid="770086263560182220">"Kapstadt"</item>
<item msgid="5936333722350504953">"Islamabad"</item>
<item msgid="3631805761163219329">"Rio de Janeiro"</item>
diff --git a/src/com/android/deskclock/AnalogClock.java b/src/com/android/deskclock/AnalogClock.java
index 55fff90..c3f0b3e 100644
--- a/src/com/android/deskclock/AnalogClock.java
+++ b/src/com/android/deskclock/AnalogClock.java
@@ -79,10 +79,10 @@
mContext = context;
Resources r = mContext.getResources();
- mDial = r.getDrawable(R.drawable.clock_analog_dial);
- mHourHand = r.getDrawable(R.drawable.clock_analog_hour);
- mMinuteHand = r.getDrawable(R.drawable.clock_analog_minute);
- mSecondHand = r.getDrawable(R.drawable.clock_analog_second);
+ mDial = r.getDrawable(R.drawable.clock_analog_dial_mipmap);
+ mHourHand = r.getDrawable(R.drawable.clock_analog_hour_mipmap);
+ mMinuteHand = r.getDrawable(R.drawable.clock_analog_minute_mipmap);
+ mSecondHand = r.getDrawable(R.drawable.clock_analog_second_mipmap);
TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.AnalogClock);
mDotRadius = a.getDimension(R.styleable.AnalogClock_jewelRadius, 0);
