Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix spacing between clock and date" into sc-qpr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-09-20 20:34:35 +00:00
committed by Android (Google) Code Review
parent 86536be56b 40a10b28c3
commit 40ab23303d
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/layout/quick_qs_status_icons.xml
View File

@@ -39,7 +39,6 @@
android:id="@+id/clock" android:id="@+id/clock"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:minWidth="48dp"
android:minHeight="48dp" android:minHeight="48dp"
android:gravity="center_vertical|start" android:gravity="center_vertical|start"
android:paddingStart="@dimen/status_bar_left_clock_starting_padding" android:paddingStart="@dimen/status_bar_left_clock_starting_padding"
@@ -51,6 +50,7 @@
android:id="@+id/date_clock" android:id="@+id/date_clock"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginStart="@dimen/status_bar_left_clock_end_padding"
android:gravity="center_vertical|start" android:gravity="center_vertical|start"
android:singleLine="true" android:singleLine="true"
android:textAppearance="@style/TextAppearance.QS.Status" android:textAppearance="@style/TextAppearance.QS.Status"

2
packages/SystemUI/res/values/dimens.xml
View File

@@ -90,7 +90,7 @@
<dimen name="status_bar_left_clock_starting_padding">0dp</dimen> <dimen name="status_bar_left_clock_starting_padding">0dp</dimen>
<!-- End padding for left-aligned status bar clock --> <!-- End padding for left-aligned status bar clock -->
<dimen name="status_bar_left_clock_end_padding">7dp</dimen> <dimen name="status_bar_left_clock_end_padding">2dp</dimen>
<!-- Spacing after the wifi signals that is present if there are any icons following it. --> <!-- Spacing after the wifi signals that is present if there are any icons following it. -->
<dimen name="status_bar_wifi_signal_spacer_width">2.5dp</dimen> <dimen name="status_bar_wifi_signal_spacer_width">2.5dp</dimen>

19
packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
View File

@@ -277,6 +277,25 @@ public class QuickStatusBarHeader extends FrameLayout {
updateBatteryMode(); updateBatteryMode();
updateHeadersPadding(); updateHeadersPadding();
updateAnimators(); updateAnimators();
updateClockDatePadding();
}
private void updateClockDatePadding() {
int startPadding = mContext.getResources()
.getDimensionPixelSize(R.dimen.status_bar_left_clock_starting_padding);
int endPadding = mContext.getResources()
.getDimensionPixelSize(R.dimen.status_bar_left_clock_end_padding);
mClockView.setPaddingRelative(
startPadding,
mClockView.getPaddingTop(),
endPadding,
mClockView.getPaddingBottom()
);
MarginLayoutParams lp = (MarginLayoutParams) mClockDateView.getLayoutParams();
lp.setMarginStart(endPadding);
mClockDateView.setLayoutParams(lp);
} }
private void updateAnimators() { private void updateAnimators() {