Skip to content

Commit dc706b5

Browse files
minaripenguinhungphan2001
authored andcommitted
Settings: Miscellaneous changes
- Adjust about phone & solo cards margins - Reduce search bar height & text size - Missing + in id/icon_frame Signed-off-by: Hưng Phan <[email protected]>
1 parent 6e4536a commit dc706b5

10 files changed

+18
-18
lines changed

res/layout/about_device_info.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
android:layout_width="0dp"
1313
android:layout_height="164dp"
1414
android:layout_weight="1.2"
15-
android:layout_marginTop="10dp"
15+
android:layout_marginTop="0dp"
1616
android:layout_marginBottom="10dp"
1717
android:layout_marginStart="24dp"
1818
android:orientation="vertical"
@@ -73,7 +73,7 @@
7373
android:layout_height="170dp"
7474
android:layout_toRightOf="@+id/firmware_details"
7575
android:layout_weight="0.8"
76-
android:layout_marginTop="10dp"
76+
android:layout_marginTop="0dp"
7777
android:layout_marginBottom="10dp"
7878
android:layout_marginStart="20dp"
7979
android:layout_marginEnd="24dp"

res/layout/about_device_info_sw2.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
android:layout_width="0dp"
1313
android:layout_height="150dp"
1414
android:layout_weight="1"
15-
android:layout_marginTop="10dp"
16-
android:layout_marginBottom="10dp"
15+
android:layout_marginTop="0dp"
16+
android:layout_marginBottom="0dp"
1717
android:layout_marginStart="24dp"
1818
android:orientation="vertical"
1919
android:clickable="true"
@@ -71,8 +71,8 @@
7171
android:layout_height="150dp"
7272
android:layout_toRightOf="@+id/firmware_details"
7373
android:layout_weight="1"
74-
android:layout_marginTop="10dp"
75-
android:layout_marginBottom="10dp"
74+
android:layout_marginTop="0dp"
75+
android:layout_marginBottom="0dp"
7676
android:layout_marginStart="20dp"
7777
android:layout_marginEnd="24dp"
7878
android:background="@drawable/custom_preference_background"

res/layout/settings_preference_solo_card.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
android:layout_height="wrap_content"
66
android:layout_marginStart="@dimen/card_margin_start_aqua"
77
android:layout_marginEnd="@dimen/card_margin_end_aqua"
8-
android:layout_marginTop="10dp"
9-
android:layout_marginBottom="12dp"
8+
android:layout_marginTop="4dp"
9+
android:layout_marginBottom="4dp"
1010
android:paddingEnd="6dp"
1111
android:paddingStart="20dp"
1212
xmlns:android="http://schemas.android.com/apk/res/android"

res/layout/top_level_preference_bottom_card.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
app:cardElevation="0dp">
9090

9191
<LinearLayout
92-
android:id="@id/icon_frame"
92+
android:id="@+id/icon_frame"
9393
android:layout_width="48dp"
9494
android:layout_height="48dp"
9595
android:layout_marginStart="8dp"

res/layout/top_level_preference_google_card.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
app:cardElevation="0dp">
6161

6262
<LinearLayout
63-
android:id="@id/icon_frame"
63+
android:id="@+id/icon_frame"
6464
android:layout_width="48dp"
6565
android:layout_height="48dp"
6666
android:layout_marginStart="8dp"

res/layout/top_level_preference_middle_card.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
app:cardElevation="0dp">
8888

8989
<LinearLayout
90-
android:id="@id/icon_frame"
90+
android:id="@+id/icon_frame"
9191
android:layout_width="48dp"
9292
android:layout_height="48dp"
9393
android:layout_marginStart="8dp"

res/layout/top_level_preference_solo_card.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
android:layout_height="wrap_content"
66
android:layout_marginStart="@dimen/card_margin_start_aqua"
77
android:layout_marginEnd="@dimen/card_margin_end_aqua"
8-
android:layout_marginTop="20dp"
9-
android:layout_marginBottom="20dp"
8+
android:layout_marginTop="4dp"
9+
android:layout_marginBottom="4dp"
1010
android:paddingEnd="6dp"
1111
android:paddingStart="20dp"
1212
xmlns:android="http://schemas.android.com/apk/res/android"
@@ -89,7 +89,7 @@
8989
app:cardElevation="0dp">
9090

9191
<LinearLayout
92-
android:id="@id/icon_frame"
92+
android:id="@+id/icon_frame"
9393
android:layout_width="48dp"
9494
android:layout_height="48dp"
9595
android:layout_marginStart="8dp"

res/layout/top_level_preference_top_card.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
app:cardElevation="0dp">
8888

8989
<LinearLayout
90-
android:id="@id/icon_frame"
90+
android:id="@+id/icon_frame"
9191
android:layout_width="48dp"
9292
android:layout_height="48dp"
9393
android:layout_marginStart="8dp"

res/layout/top_level_preference_wellbeing_card.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
app:cardElevation="0dp">
6060

6161
<LinearLayout
62-
android:id="@id/icon_frame"
62+
android:id="@+id/icon_frame"
6363
android:layout_width="48dp"
6464
android:layout_height="48dp"
6565
android:layout_marginStart="8dp"

res/values/dimens.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@
8181

8282
<!-- Search bar -->
8383
<dimen name="search_bar_margin">16dp</dimen>
84-
<dimen name="search_bar_height">52dp</dimen>
85-
<dimen name="search_bar_text_size">20sp</dimen>
84+
<dimen name="search_bar_height">42dp</dimen>
85+
<dimen name="search_bar_text_size">14sp</dimen>
8686
<dimen name="search_bar_corner_radius">28dp</dimen>
8787
<dimen name="search_bar_content_inset">56dp</dimen>
8888
<dimen name="search_bar_padding_start">4dp</dimen>

0 commit comments

Comments
 (0)