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

Merge "Fixed a bug where the burmese clock could overlap" into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-07-15 01:33:32 +00:00
committed by Android (Google) Code Review
parent 83fa7a8255 b6143c1291
commit f25486f8a5
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/Keyguard/res/values-my-rMM/dimens.xml Normal file
View File

@@ -0,0 +1,19 @@
<?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="bottom_text_spacing_digital">4dp</dimen>
</resources>

5
packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java
View File

@@ -127,6 +127,11 @@ public class KeyguardStatusView extends GridLayout {
super.onConfigurationChanged(newConfig);
mClockView.setTextSize(TypedValue.COMPLEX_UNIT_PX,
getResources().getDimensionPixelSize(R.dimen.widget_big_font_size));
// Some layouts like burmese have a different margin for the clock
MarginLayoutParams layoutParams = (MarginLayoutParams) mClockView.getLayoutParams();
layoutParams.bottomMargin = getResources().getDimensionPixelSize(
R.dimen.bottom_text_spacing_digital);
mClockView.setLayoutParams(layoutParams);
mDateView.setTextSize(TypedValue.COMPLEX_UNIT_PX,
getResources().getDimensionPixelSize(R.dimen.widget_label_font_size));
mOwnerInfo.setTextSize(TypedValue.COMPLEX_UNIT_PX,