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

Merge "Remove the clock view when DISABLE_CLOCK is set" into pi-dev

Browse Source
This commit is contained in:
android-build-team Robot
2018-05-07 22:05:40 +00:00
committed by Android (Google) Code Review
parent 0458578642 74435e6486
commit 6d4917b673
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java
View File

@@ -212,7 +212,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue
}
public void hideClock(boolean animate) {
animateHide(mClockView, animate);
animateHiddenState(mClockView, View.GONE, animate);
}
public void showClock(boolean animate) {
@@ -240,21 +240,29 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue
}
/**
* Hides a view.
* Animate a view to INVISIBLE or GONE
*/
private void animateHide(final View v, boolean animate) {
private void animateHiddenState(final View v, int state, boolean animate) {
v.animate().cancel();
if (!animate) {
v.setAlpha(0f);
v.setVisibility(View.INVISIBLE);
v.setVisibility(state);
return;
}
v.animate()
.alpha(0f)
.setDuration(160)
.setStartDelay(0)
.setInterpolator(Interpolators.ALPHA_OUT)
.withEndAction(() -> v.setVisibility(View.INVISIBLE));
.withEndAction(() -> v.setVisibility(state));
}
/**
* Hides a view.
*/
private void animateHide(final View v, boolean animate) {
animateHiddenState(v, View.INVISIBLE, animate);
}
/**

2
packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragmentTest.java
View File

@@ -121,7 +121,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest {
fragment.initNotificationIconArea(mMockNotificiationAreaController);
fragment.disable(StatusBarManager.DISABLE_CLOCK, 0, false);
assertEquals(View.INVISIBLE, mFragment.getView().findViewById(R.id.clock).getVisibility());
assertEquals(View.GONE, mFragment.getView().findViewById(R.id.clock).getVisibility());
fragment.disable(0, 0, false);