Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
e
os
android_packages_apps_DeskClock
Commits
c3450b4f
Commit
c3450b4f
authored
Jun 02, 2020
by
LuK1337
Committed by
Bruno Martins
Jun 07, 2020
Browse files
DeskClock: Modernize timer_setup_time look
Change-Id: I6ba715acbcdfcbd7472d5f7bf2008efa6027139a
parent
5d6523ae
Changes
11
Hide whitespace changes
Inline
Side-by-side
res/layout/timer_setup_time.xml
View file @
c3450b4f
...
...
@@ -19,9 +19,11 @@
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"
match_par
ent"
android:layout_width=
"
wrap_cont
ent"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:gravity=
"center"
android:minHeight=
"@dimen/timer_setup_top_size"
android:layoutDirection=
"ltr"
android:orientation=
"horizontal"
>
...
...
@@ -42,7 +44,6 @@
android:id=
"@+id/timer_setup_delete"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/timer_setup_delete_margin"
android:contentDescription=
"@string/timer_delete"
android:padding=
"12dp"
android:scaleType=
"center"
...
...
res/layout/timer_setup_view.xml
View file @
c3450b4f
...
...
@@ -21,8 +21,7 @@
android:layout_height=
"match_parent"
android:gravity=
"center_horizontal"
android:orientation=
"vertical"
android:paddingBottom=
"@dimen/fab_height"
android:paddingTop=
"@dimen/timer_setup_top_margin"
>
android:paddingBottom=
"@dimen/fab_height"
>
<include
layout=
"@layout/timer_setup_time"
/>
...
...
res/values-land/dimens.xml
View file @
c3450b4f
...
...
@@ -20,9 +20,6 @@
<resources>
<dimen
name=
"time_margin_top"
>
24dip
</dimen>
<dimen
name=
"timer_setup_delete_margin"
>
12sp
</dimen>
<dimen
name=
"timer_setup_digit_font_size"
>
26sp
</dimen>
<!-- Size of margin for circles. -->
<dimen
name=
"analog_clock_margin"
>
70dp
</dimen>
<dimen
name=
"analog_clock_size"
>
168dp
</dimen>
...
...
res/values-sw320dp-port/dimens.xml
View file @
c3450b4f
...
...
@@ -16,5 +16,4 @@
<resources>
<dimen
name=
"no_alarms_size"
>
120dp
</dimen>
<dimen
name=
"timer_setup_digit_font_size"
>
40sp
</dimen>
</resources>
res/values-sw320dp/dimens.xml
View file @
c3450b4f
...
...
@@ -16,5 +16,4 @@
<resources>
<dimen
name=
"big_font_size"
>
60sp
</dimen>
<dimen
name=
"timer_setup_digit_font_size"
>
32sp
</dimen>
</resources>
\ No newline at end of file
res/values-sw360dp-land/dimens.xml
deleted
100644 → 0
View file @
5d6523ae
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2016 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>
<dimen
name=
"timer_setup_digit_font_size"
>
40sp
</dimen>
</resources>
res/values-sw360dp/dimens.xml
View file @
c3450b4f
...
...
@@ -18,5 +18,4 @@
<dimen
name=
"big_font_size"
>
70sp
</dimen>
<dimen
name=
"main_clock_font_size"
>
80sp
</dimen>
<dimen
name=
"no_alarms_size"
>
120dp
</dimen>
<dimen
name=
"timer_setup_digit_font_size"
>
56sp
</dimen>
</resources>
res/values-sw600dp-land/dimens.xml
View file @
c3450b4f
...
...
@@ -19,9 +19,6 @@
<resources>
<dimen
name=
"time_margin_top"
>
32dip
</dimen>
<dimen
name=
"timer_setup_delete_margin"
>
19sp
</dimen>
<dimen
name=
"timer_setup_digit_font_size"
>
46sp
</dimen>
<!-- Size of margin for circles. -->
<dimen
name=
"circle_margin_top"
>
0dp
</dimen>
<dimen
name=
"analog_clock_margin"
>
48dp
</dimen>
...
...
res/values-sw600dp/dimens.xml
View file @
c3450b4f
...
...
@@ -44,11 +44,6 @@
<dimen
name=
"label_margin_big"
>
8dp
</dimen>
<!-- Specified in sp to match the top margin of the time on the adjacent world clock tab. -->
<dimen
name=
"timer_setup_top_margin"
>
24sp
</dimen>
<dimen
name=
"timer_setup_delete_margin"
>
21sp
</dimen>
<dimen
name=
"timer_setup_digit_font_size"
>
86sp
</dimen>
<!-- Size of margin for circles. -->
<dimen
name=
"circle_margin_top"
>
48dp
</dimen>
<dimen
name=
"analog_clock_margin"
>
96dp
</dimen>
...
...
res/values-sw720dp-land/dimens.xml
deleted
100644 → 0
View file @
5d6523ae
<?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.
-->
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources>
<dimen
name=
"timer_setup_delete_margin"
>
19sp
</dimen>
<dimen
name=
"timer_setup_digit_font_size"
>
76sp
</dimen>
</resources>
res/values/dimens.xml
View file @
c3450b4f
...
...
@@ -52,7 +52,8 @@
<dimen
name=
"day_button_font_size"
>
16sp
</dimen>
<dimen
name=
"alarm_info_font_size"
>
36sp
</dimen>
<dimen
name=
"no_alarm_font_size"
>
16sp
</dimen>
<dimen
name=
"timer_setup_digit_font_size"
>
32sp
</dimen>
<dimen
name=
"timer_setup_digit_font_size"
>
42sp
</dimen>
<dimen
name=
"timer_setup_top_size"
>
120dip
</dimen>
<dimen
name=
"alarm_picker_dialog_horizontal_margin"
>
30dp
</dimen>
<dimen
name=
"alarm_picker_dialog_vertical_margin"
>
20dp
</dimen>
...
...
@@ -72,12 +73,6 @@
<dimen
name=
"label_margin_big"
>
4dp
</dimen>
<!--margin should be ~ half timer_setup_font_size -->
<dimen
name=
"timer_setup_delete_margin"
>
14sp
</dimen>
<!-- Specified in sp to match the top margin of the time on the adjacent world clock tab. -->
<dimen
name=
"timer_setup_top_margin"
>
18sp
</dimen>
<dimen
name=
"cities_list_item_height"
>
56dip
</dimen>
<!-- Size of margin for circles. -->
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment