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

Commit 12e95d42 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Status bar: Make CM status icon customisations respect lights out mode" into jellybean

parents 0b5b94ce 05504ccb

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+6 −0
Original line number Diff line number Diff line
@@ -1855,7 +1855,9 @@ public class PhoneStatusBar extends BaseStatusBar { 
            final View notifications = mStatusBarView.findViewById(R.id.notification_icon_area);

            final View systemIcons = mStatusBarView.findViewById(R.id.statusIcons);

            final View signal = mStatusBarView.findViewById(R.id.signal_cluster);

            final View signalText = mStatusBarView.findViewById(R.id.signal_cluster_text);

            final View battery = mStatusBarView.findViewById(R.id.battery);

            final View batteryText = mStatusBarView.findViewById(R.id.battery_text);

            final View clock = mStatusBarView.findViewById(R.id.clock);



            mLightsOutAnimation = new AnimatorSet();
@@ -1863,7 +1865,9 @@ public class PhoneStatusBar extends BaseStatusBar { 
                    ObjectAnimator.ofFloat(notifications, View.ALPHA, 0),

                    ObjectAnimator.ofFloat(systemIcons, View.ALPHA, 0),

                    ObjectAnimator.ofFloat(signal, View.ALPHA, 0),

                    ObjectAnimator.ofFloat(signalText, View.ALPHA, 0),

                    ObjectAnimator.ofFloat(battery, View.ALPHA, 0.5f),

                    ObjectAnimator.ofFloat(batteryText, View.ALPHA, 0),

                    ObjectAnimator.ofFloat(clock, View.ALPHA, 0.5f)

                );

            mLightsOutAnimation.setDuration(750);
@@ -1873,7 +1877,9 @@ public class PhoneStatusBar extends BaseStatusBar { 
                    ObjectAnimator.ofFloat(notifications, View.ALPHA, 1),

                    ObjectAnimator.ofFloat(systemIcons, View.ALPHA, 1),

                    ObjectAnimator.ofFloat(signal, View.ALPHA, 1),

                    ObjectAnimator.ofFloat(signalText, View.ALPHA, 1),

                    ObjectAnimator.ofFloat(battery, View.ALPHA, 1),

                    ObjectAnimator.ofFloat(batteryText, View.ALPHA, 1),

                    ObjectAnimator.ofFloat(clock, View.ALPHA, 1)

                );

            mLightsOnAnimation.setDuration(250);