Loading packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarComponent.java +4 −0 Original line number Diff line number Diff line Loading @@ -16,6 +16,8 @@ package com.android.systemui.statusbar.phone.dagger; import static com.android.systemui.statusbar.phone.dagger.StatusBarViewModule.STATUS_BAR_FRAGMENT; import static java.lang.annotation.RetentionPolicy.RUNTIME; import com.android.keyguard.LockIconViewController; Loading @@ -34,6 +36,7 @@ import com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragment; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import javax.inject.Named; import javax.inject.Scope; import dagger.Subcomponent; Loading Loading @@ -133,5 +136,6 @@ public interface StatusBarComponent { * Creates a new {@link CollapsedStatusBarFragment} each time it's called. See * {@link StatusBarViewModule#createCollapsedStatusBarFragment}. */ @Named(STATUS_BAR_FRAGMENT) CollapsedStatusBarFragment createCollapsedStatusBarFragment(); } packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarViewModule.java +5 −3 Original line number Diff line number Diff line Loading @@ -73,6 +73,7 @@ public abstract class StatusBarViewModule { public static final String SPLIT_SHADE_HEADER = "split_shade_header"; private static final String SPLIT_SHADE_BATTERY_VIEW = "split_shade_battery_view"; public static final String SPLIT_SHADE_BATTERY_CONTROLLER = "split_shade_battery_controller"; public static final String STATUS_BAR_FRAGMENT = "status_bar_fragment"; /** */ @Provides Loading Loading @@ -238,10 +239,11 @@ public abstract class StatusBarViewModule { * time this method is called. This is intentional because we need fragments to re-created in * certain lifecycle scenarios. * * **IMPORTANT**: This method also intentionally does not have a {@link Provides} annotation. If * you need to get access to a {@link CollapsedStatusBarFragment}, go through * {@link StatusBarFragmentComponent} instead. * This provider is {@link Named} such that it does not conflict with the provider inside of * {@link StatusBarFragmentComponent}. */ @Provides @Named(STATUS_BAR_FRAGMENT) public static CollapsedStatusBarFragment createCollapsedStatusBarFragment( StatusBarFragmentComponent.Factory statusBarFragmentComponentFactory, OngoingCallController ongoingCallController, Loading packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java +1 −6 Original line number Diff line number Diff line Loading @@ -66,13 +66,9 @@ import com.android.systemui.statusbar.phone.panelstate.PanelExpansionStateManage import com.android.systemui.statusbar.policy.EncryptionHelper; import com.android.systemui.statusbar.policy.KeyguardStateController; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.List; import javax.inject.Inject; /** * Contains the collapsed status bar and handles hiding/showing based on disable flags * and keyguard state. Also manages lifecycle to make sure the views it contains are being Loading Loading @@ -131,7 +127,6 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue }; private OperatorNameViewController mOperatorNameViewController; @Inject public CollapsedStatusBarFragment( StatusBarFragmentComponent.Factory statusBarFragmentComponentFactory, OngoingCallController ongoingCallController, Loading Loading @@ -582,7 +577,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue } @Override public void onSystemChromeAnimationUpdate(@NotNull ValueAnimator animator) { public void onSystemChromeAnimationUpdate(@NonNull ValueAnimator animator) { mSystemIconArea.setAlpha((float) animator.getAnimatedValue()); } Loading Loading
packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarComponent.java +4 −0 Original line number Diff line number Diff line Loading @@ -16,6 +16,8 @@ package com.android.systemui.statusbar.phone.dagger; import static com.android.systemui.statusbar.phone.dagger.StatusBarViewModule.STATUS_BAR_FRAGMENT; import static java.lang.annotation.RetentionPolicy.RUNTIME; import com.android.keyguard.LockIconViewController; Loading @@ -34,6 +36,7 @@ import com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragment; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import javax.inject.Named; import javax.inject.Scope; import dagger.Subcomponent; Loading Loading @@ -133,5 +136,6 @@ public interface StatusBarComponent { * Creates a new {@link CollapsedStatusBarFragment} each time it's called. See * {@link StatusBarViewModule#createCollapsedStatusBarFragment}. */ @Named(STATUS_BAR_FRAGMENT) CollapsedStatusBarFragment createCollapsedStatusBarFragment(); }
packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarViewModule.java +5 −3 Original line number Diff line number Diff line Loading @@ -73,6 +73,7 @@ public abstract class StatusBarViewModule { public static final String SPLIT_SHADE_HEADER = "split_shade_header"; private static final String SPLIT_SHADE_BATTERY_VIEW = "split_shade_battery_view"; public static final String SPLIT_SHADE_BATTERY_CONTROLLER = "split_shade_battery_controller"; public static final String STATUS_BAR_FRAGMENT = "status_bar_fragment"; /** */ @Provides Loading Loading @@ -238,10 +239,11 @@ public abstract class StatusBarViewModule { * time this method is called. This is intentional because we need fragments to re-created in * certain lifecycle scenarios. * * **IMPORTANT**: This method also intentionally does not have a {@link Provides} annotation. If * you need to get access to a {@link CollapsedStatusBarFragment}, go through * {@link StatusBarFragmentComponent} instead. * This provider is {@link Named} such that it does not conflict with the provider inside of * {@link StatusBarFragmentComponent}. */ @Provides @Named(STATUS_BAR_FRAGMENT) public static CollapsedStatusBarFragment createCollapsedStatusBarFragment( StatusBarFragmentComponent.Factory statusBarFragmentComponentFactory, OngoingCallController ongoingCallController, Loading
packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java +1 −6 Original line number Diff line number Diff line Loading @@ -66,13 +66,9 @@ import com.android.systemui.statusbar.phone.panelstate.PanelExpansionStateManage import com.android.systemui.statusbar.policy.EncryptionHelper; import com.android.systemui.statusbar.policy.KeyguardStateController; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.List; import javax.inject.Inject; /** * Contains the collapsed status bar and handles hiding/showing based on disable flags * and keyguard state. Also manages lifecycle to make sure the views it contains are being Loading Loading @@ -131,7 +127,6 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue }; private OperatorNameViewController mOperatorNameViewController; @Inject public CollapsedStatusBarFragment( StatusBarFragmentComponent.Factory statusBarFragmentComponentFactory, OngoingCallController ongoingCallController, Loading Loading @@ -582,7 +577,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue } @Override public void onSystemChromeAnimationUpdate(@NotNull ValueAnimator animator) { public void onSystemChromeAnimationUpdate(@NonNull ValueAnimator animator) { mSystemIconArea.setAlpha((float) animator.getAnimatedValue()); } Loading