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

Commit ca067811 authored by Brad Stenning's avatar Brad Stenning Committed by android-build-merger
Browse files

Merge "Signal view is no loner apart of this fragment Removing custom battery... 

Merge "Signal view is no loner apart of this fragment Removing custom battery display functionality until a complete fix is implemented." into pi-dev
am: 1e617f5c

Change-Id: Ifeccb66d335bc5413861732dfd434eea46ea53dc
parents d4cc3784 1e617f5c

packages/SystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java

+0 −21
Original line number Diff line number Diff line
@@ -182,27 +182,6 @@ public class CarStatusBar extends StatusBar implements 
            // By default, the BatteryMeterView should not be visible. It will be toggled

            // when a device has connected by bluetooth.

            mBatteryMeterView.setVisibility(View.GONE);



            ViewStub stub = fragment.getView().findViewById(R.id.connected_device_signals_stub);

            View signalsView = stub.inflate();



            // When a ViewStub if inflated, it does not respect the margins on the

            // inflated view.

            // As a result, manually add the ending margin.

            ((LinearLayout.LayoutParams) signalsView.getLayoutParams()).setMarginEnd(

                    mContext.getResources().getDimensionPixelOffset(

                            R.dimen.status_bar_connected_device_signal_margin_end));



            if (mConnectedDeviceSignalController != null) {

                mConnectedDeviceSignalController.stopListening();

            }

            mConnectedDeviceSignalController = new ConnectedDeviceSignalController(mContext,

                    signalsView);

            mConnectedDeviceSignalController.startListening();



            if (Log.isLoggable(TAG, Log.DEBUG)) {

                Log.d(TAG, "makeStatusBarView(). mBatteryMeterView: " + mBatteryMeterView);

            }

        });

    }