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

Merge \"QS Edit: Extra extra make sure hidden when locked\" into nyc-dev

Browse Source 
am: fd6e7e6790

Change-Id: I0fbfd17114fbcf6c4552d5f192ce17722272a6c6
This commit is contained in:
Jason Monk
2016-06-08 19:21:33 +00:00
committed by android-build-merger
parent d97d435c09 fd6e7e6790
commit 7399cf0ca6
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java
View File

@@ -42,6 +42,7 @@ import com.android.systemui.qs.QSTile;
import com.android.systemui.statusbar.phone.NotificationsQuickSettingsContainer;
import com.android.systemui.statusbar.phone.PhoneStatusBar;
import com.android.systemui.statusbar.phone.QSTileHost;
import com.android.systemui.statusbar.policy.KeyguardMonitor.Callback;
import java.util.ArrayList;
import java.util.List;
@@ -141,6 +142,7 @@ public class QSCustomizer extends LinearLayout implements OnMenuItemClickListene
mNotifQsContainer.setCustomizerShowing(true);
announceForAccessibility(mContext.getString(
R.string.accessibility_desc_quick_settings_edit));
mHost.getKeyguardMonitor().addCallback(mKeyguardCallback);
}
}
@@ -156,6 +158,7 @@ public class QSCustomizer extends LinearLayout implements OnMenuItemClickListene
mNotifQsContainer.setCustomizerShowing(false);
announceForAccessibility(mContext.getString(
R.string.accessibility_desc_quick_settings));
mHost.getKeyguardMonitor().removeCallback(mKeyguardCallback);
}
}
@@ -201,6 +204,15 @@ public class QSCustomizer extends LinearLayout implements OnMenuItemClickListene
mTileAdapter.saveSpecs(mHost);
}
private final Callback mKeyguardCallback = new Callback() {
@Override
public void onKeyguardChanged() {
if (mHost.getKeyguardMonitor().isShowing()) {
hide(0, 0);
}
}
};
private final AnimatorListener mExpandAnimationListener = new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {