diff options
| author | Steve Kondik <shade@chemlab.org> | 2013-02-13 00:37:05 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-02-13 00:37:05 -0800 |
| commit | 1f5a43d0469fce561c311a19c85ac8dd036c4cac (patch) | |
| tree | 3b3ce44c9eccb23e898ee53c45c3e9bac1962fb7 /res/layout/timer_list_item.xml | |
| parent | 057d88c735d8d0e7dce9714f9db28388501c24e7 (diff) | |
| parent | 0ed03e8e14cf2edcda9ee3ecc604d4e048c8ccf3 (diff) | |
| download | android_packages_apps_DeskClock-1f5a43d0469fce561c311a19c85ac8dd036c4cac.tar.gz android_packages_apps_DeskClock-1f5a43d0469fce561c311a19c85ac8dd036c4cac.tar.bz2 android_packages_apps_DeskClock-1f5a43d0469fce561c311a19c85ac8dd036c4cac.zip | |
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/DeskClock into 1.1mr1.1-staging
Android 4.2.2 release 1
Conflicts:
res/xml/settings.xml
src/com/android/deskclock/AlarmAlertFullScreen.java
src/com/android/deskclock/AlarmKlaxon.java
src/com/android/deskclock/DeskClock.java
src/com/android/deskclock/SettingsActivity.java
Change-Id: Ieba9c47923469713cf14c310044fe8fb3b31523c
Diffstat (limited to 'res/layout/timer_list_item.xml')
| -rw-r--r-- | res/layout/timer_list_item.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/layout/timer_list_item.xml b/res/layout/timer_list_item.xml index 1dfc04f28..f5ac85101 100644 --- a/res/layout/timer_list_item.xml +++ b/res/layout/timer_list_item.xml @@ -27,8 +27,8 @@ android:id="@+id/timer_frame" android:layout_width="match_parent" android:layout_height="@dimen/timer_circle_diameter" - android:layout_marginLeft="@dimen/circle_margin" - android:layout_marginRight="@dimen/circle_margin"> + android:layout_marginLeft="@dimen/timer_circle_margin" + android:layout_marginRight="@dimen/timer_circle_margin"> <com.android.deskclock.CircleTimerView android:id="@+id/timer_time" |