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

am f129ee37: Merge "Fix padding between battery and system icons" into lmp-mr1-dev

Browse Source 
automerge: 97f1a97

* commit '97f1a97d89366159374c2be3d74e0642705d80bf':
  Fix padding between battery and system icons
This commit is contained in:
Jorim Jaggi
2014-10-27 21:25:59 +00:00
committed by android-build-merger
parent 7157ce9e94 97f1a97d89
commit f53bc26f4e
4 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/res/layout/signal_cluster_view.xml
View File

@@ -24,6 +24,7 @@
android:layout_width="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingEnd="@dimen/signal_cluster_battery_padding"
>
<ImageView
android:id="@+id/vpn"

3
packages/SystemUI/res/layout/system_icons.xml
View File

@@ -36,6 +36,5 @@
<com.android.systemui.BatteryMeterView android:id="@+id/battery"
android:layout_height="14.5dp"
android:layout_width="9.5dp"
android:layout_marginBottom="@dimen/battery_margin_bottom"
android:layout_marginStart="7dp"/>
android:layout_marginBottom="@dimen/battery_margin_bottom"/>
</LinearLayout>

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

@@ -508,4 +508,10 @@
<dimen name="fake_shadow_inset">1dp</dimen>
<dimen name="fake_shadow_size">8dp</dimen>
<!-- Padding between signal cluster and battery icon -->
<dimen name="signal_cluster_battery_padding">7dp</dimen>
<!-- Padding for signal cluster and battery icon when there are not icons in signal cluster -->
<dimen name="no_signal_cluster_battery_padding">3dp</dimen>
</resources>

9
packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
View File

@@ -57,6 +57,8 @@ public class SignalClusterView
View mWifiSignalSpacer;
private int mWideTypeIconStartPadding;
private int mEndPadding;
private int mEndPaddingNothingVisible;
public SignalClusterView(Context context) {
this(context, null);
@@ -87,6 +89,10 @@ public class SignalClusterView
super.onFinishInflate();
mWideTypeIconStartPadding = getContext().getResources().getDimensionPixelSize(
R.dimen.wide_type_icon_start_padding);
mEndPadding = getContext().getResources().getDimensionPixelSize(
R.dimen.signal_cluster_battery_padding);
mEndPaddingNothingVisible = getContext().getResources().getDimensionPixelSize(
R.dimen.no_signal_cluster_battery_padding);
}
@Override
@@ -255,6 +261,9 @@ public class SignalClusterView
mMobileStrengthId, mMobileTypeId));
mMobileType.setVisibility(mMobileTypeId != 0 ? View.VISIBLE : View.GONE);
boolean anythingVisible = mWifiVisible || mIsAirplaneMode || mMobileVisible || mVpnVisible;
setPaddingRelative(0, 0, anythingVisible ? mEndPadding : mEndPaddingNothingVisible, 0);
}
}