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

Merge "Dismiss keyguard when user button is tapped" into nyc-dev

Browse Source 
am: 819b9bc

* commit '819b9bc9dbf31b8b6db999ff56477038ad95ffcf':
  Dismiss keyguard when user button is tapped

Change-Id: I8c88b4067bd58adf66c86f5246ad3674f34784d3
This commit is contained in:
Kaori Katou
2016-04-13 21:39:10 +00:00
committed by android-build-merger
parent d79d1ba4bc 819b9bc9db
commit 8f2d7678a5
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
View File

@@ -30,6 +30,7 @@ import android.widget.TextView;
import com.android.systemui.BatteryMeterView;
import com.android.systemui.Interpolators;
import com.android.systemui.R;
import com.android.systemui.qs.QSPanel;
import com.android.systemui.statusbar.policy.BatteryController;
import com.android.systemui.statusbar.policy.KeyguardUserSwitcher;
import com.android.systemui.statusbar.policy.UserInfoController;
@@ -150,6 +151,10 @@ public class KeyguardStatusBarView extends RelativeLayout
});
}
public void setQSPanel(QSPanel qsp) {
mMultiUserSwitch.setQsPanel(qsp);
}
@Override
public void onBatteryLevelChanged(int level, boolean pluggedIn, boolean charging) {
String percentage = NumberFormat.getPercentInstance().format((double) level / 100.0);

6
packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java
View File

@@ -127,10 +127,10 @@ public class MultiUserSwitch extends FrameLayout implements View.OnClickListener
mTmpInt2);
}
} else {
Intent intent = ContactsContract.QuickContact.composeQuickContactsIntent(
getContext(), v, ContactsContract.Profile.CONTENT_URI,
ContactsContract.QuickContact.MODE_LARGE, null);
if (mQsPanel != null) {
Intent intent = ContactsContract.QuickContact.composeQuickContactsIntent(
getContext(), v, ContactsContract.Profile.CONTENT_URI,
ContactsContract.QuickContact.MODE_LARGE, null);
mQsPanel.getHost().startActivityDismissingKeyguard(intent);
}
}

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

@@ -893,6 +893,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
qsContainer.setHost(qsh);
mQSPanel = qsContainer.getQsPanel();
mQSPanel.setBrightnessMirror(mBrightnessMirrorController);
mKeyguardStatusBar.setQSPanel(mQSPanel);
mHeader = qsContainer.getHeader();
initSignalCluster(mHeader);
mHeader.setActivityStarter(PhoneStatusBar.this);