Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9366afd0 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Fix percentage battery in tablet mode" into jellybean

parents a265010d 9eeb71d8

packages/SystemUI/res/layout/system_bar_notification_area.xml

+11 −0
Original line number Original line Diff line number Diff line
@@ -133,6 +133,17 @@ 
                android:layout_marginRight="-3dip"

                android:layout_marginRight="-3dip"

                android:gravity="center_vertical|left"

                android:gravity="center_vertical|left"

                />

                />

            <TextView

                android:id="@+id/battery_text"

                android:textAppearance="@style/TextAppearance.StatusBar.Battery"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:singleLine="true"

                android:textSize="20sp"

                android:paddingLeft="4dip"

                android:layout_marginRight="-3dip"

                android:gravity="center_vertical|left"

                />

            <ImageView

            <ImageView

                android:id="@+id/dock_battery"

                android:id="@+id/dock_battery"

                android:layout_height="wrap_content"

                android:layout_height="wrap_content"

packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -581,6 +581,7 @@ public class TabletStatusBar extends BaseStatusBar implements 




        mBatteryController = new BatteryController(mContext);

        mBatteryController = new BatteryController(mContext);

        mBatteryController.addIconView((ImageView)sb.findViewById(R.id.battery));

        mBatteryController.addIconView((ImageView)sb.findViewById(R.id.battery));

        mBatteryController.addLabelView((TextView)sb.findViewById(R.id.battery_text));





        mHasDockBattery = mContext.getResources().getBoolean(

        mHasDockBattery = mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_hasDockBattery);

                com.android.internal.R.bool.config_hasDockBattery);