OSDN Git Service

Merge changes I4d34ed4b,Iddfbdf5c into nyc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Wed, 4 May 2016 23:31:31 +0000 (23:31 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 4 May 2016 23:31:33 +0000 (23:31 +0000)
commit17bc1fd09042f2749a1c822d32bc48eeb3b280f6
treeed8f93f7ddb81a3742d3f9a623d4c0abe96807d2
parent05d61edeb271167b6a9a97aa9adf1fe7bfb9bfbf
parentaa8bbf1aefa03e567d56e2b62fe7e5a48e0f82a9
Merge changes I4d34ed4b,Iddfbdf5c into nyc-dev

* changes:
  Fixed a bug where the pin wasn't scaled correctly
  Fixed a bug where the scrim was transparent
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java