Julia Reynolds
83eec7037b
Note timezone changes.
...
Bug: 28945282
Change-Id: I62fc62e359435f19fecd7e52b2fe778475c5804c
2016-05-25 13:02:39 -04:00
Mady Mellor
4f3ab93147
Changes based on API council feedback for performContextClick
...
Added an overloaded version with (float x, float y).
Fixes: 28295818
Change-Id: I41c2bf225964436655986b3ad4d0c630c658e38b
2016-05-25 09:52:51 -07:00
Chris Banes
ec39b57e6f
Fix text appearances not working in colored button styles
...
Caused by using an explicit textColor in the base
styles, which will always override any textColors in the
text appearance.
BUG: 28933171
Change-Id: I3a9b2884cdd66b329593ae5cea0c314244f4f116
2016-05-25 16:49:43 +00:00
John Reck
c57a36a634
Merge "Fix a translate issue with saveLayer" into nyc-dev
...
am: f4ae997719
2016-05-25 16:47:51 +00:00
Diego Perez
9bb16a480d
Merge "Workaround to display menus for AppCompat themes" into nyc-dev
...
am: 36cd747bb6
2016-05-25 16:47:47 +00:00
Roshan Pius
2078d3499b
BatteryStats: Allow for sample errors in wlan stats
...
Add some leeway in the reported time because some inaccuracy
is expected in these stats between samples.
BUG: 28932100
Change-Id: Ia643fa666ca16c0c707d189ec2bc703fe1ef08a4
2016-05-25 09:41:31 -07:00
Alan Viverette
3fb5c7b8fa
Fix DatePicker.setMin/MaxDate()
...
Previously it would only allow year changes, which... doesn't make sense.
Bug: 28953902
Change-Id: I9b15b96662d9d496e11fb426ff23f14b26e90800
2016-05-25 12:34:55 -04:00
Jason Monk
d075b21a85
QS: Fix QS touch breaking
...
Seems not all of the QS container logic was inside the inflate
callback.
Change-Id: I78a8b40d1c181f5dac7127a5b5d20d45ae0f333e
Fixes: 28177371
2016-05-25 12:30:51 -04:00
John Reck
f4ae997719
Merge "Fix a translate issue with saveLayer" into nyc-dev
2016-05-25 16:27:31 +00:00
Alan Viverette
ffa81d0440
Merge "Use ICU\'s Calendar class in date picker & related classes" into nyc-dev
...
am: cfbca5640c
2016-05-25 16:24:57 +00:00
Diego Perez
36cd747bb6
Merge "Workaround to display menus for AppCompat themes" into nyc-dev
2016-05-25 16:23:56 +00:00
Alan Viverette
cfbca5640c
Merge "Use ICU's Calendar class in date picker & related classes" into nyc-dev
2016-05-25 16:20:16 +00:00
Kenny Guy
7c127bbaf1
Merge "Update suspended to disabled." into nyc-dev
...
am: 646a817caf
2016-05-25 15:57:56 +00:00
Kenny Guy
646a817caf
Merge "Update suspended to disabled." into nyc-dev
2016-05-25 15:49:52 +00:00
Alan Viverette
68763be41c
Use ICU's Calendar class in date picker & related classes
...
Also organizes imports.
Bug: 28756630
Change-Id: I4e59c4b35c88edd94ff4b2945ad9feb2a4bd0022
2016-05-25 11:42:42 -04:00
Jason Monk
6d21e0d8d2
QS API: Handle return value from bindServiceAsUser
...
To avoid crashes better.
Change-Id: I72e74729fbc0b1400c21e1ebc165b565ecd13fba
Fixes: 28721139
2016-05-25 11:37:47 -04:00
Jason Monk
931f5464f5
QS Edit: Hide black bar in landscape
...
Change-Id: I954e5571c01945b697c6254c168c1830467ff7db
Fixes: 28924803
2016-05-25 11:19:04 -04:00
Adam Powell
01a7baa7a3
Merge "Update preloaded drawables" into nyc-dev
...
am: ef817a1deb
2016-05-25 15:09:50 +00:00
Adam Powell
ef817a1deb
Merge "Update preloaded drawables" into nyc-dev
2016-05-25 14:59:34 +00:00
Jason Monk
ad5db2979b
QS Edit: Fix up accessibility
...
Change-Id: I13d426d4ae447c7db074bc7165067870bd8cae5d
Fixes: 28913622
2016-05-25 10:54:43 -04:00
Lajos Molnar
0581ee4971
media: check profile, level and bitrate for isFormatSupported
...
Bug: 28671284
Change-Id: I90639816a7410cf65bcd1c5549c3830ca43b8140
2016-05-25 07:44:15 -07:00
Ricky Wai
7b9eb419e3
Store work lock type even it uses unified lock
...
If we are not storing this, LockPatternUtils.isSecure(workUserId)
will return false, and cause some methods like trySetQuietModeDisabled()
cannot show screen lock correctly.
Bug: 28738725
Change-Id: I7d0b61022b0afff2dac4cdae72d558118ea892e7
2016-05-25 15:38:34 +01:00
Alan Viverette
6b525a2645
Merge "Prevent LayerDrawable bounds updates from being re-entrant" into nyc-dev
...
am: 5c9444216d
2016-05-25 14:28:04 +00:00
Alan Viverette
83e714bcc9
Merge "Default system theme should be DeviceDefault" into nyc-dev
...
am: 10ed7de7ae
2016-05-25 14:28:01 +00:00
Alan Viverette
5c9444216d
Merge "Prevent LayerDrawable bounds updates from being re-entrant" into nyc-dev
2016-05-25 14:19:40 +00:00
Alan Viverette
10ed7de7ae
Merge "Default system theme should be DeviceDefault" into nyc-dev
2016-05-25 14:18:28 +00:00
Ricky Wai
ed39b3b166
Hide work profile key in user credentials screen
...
am: d398244513
2016-05-25 13:20:51 +00:00
Ricky Wai
2281b83051
Do not allow DPM.resetPassword() when child profile exists or user is locked
...
am: 977ade26dd
2016-05-25 13:15:33 +00:00
Ricky Wai
efc3838caa
Merge "Unlock work profile storage even work mode is off" into nyc-dev
...
am: f420c413b9
2016-05-25 13:15:26 +00:00
Ricky Wai
88986c8887
Merge "Do not tie managed profile synchronously in onUnlockUser()" into nyc-dev
...
am: 99df649aa4
2016-05-25 13:12:07 +00:00
Ricky Wai
d398244513
Hide work profile key in user credentials screen
...
Bug: 28878708
Change-Id: Ib250fae2388b061430d93b7d65133002ce664993
2016-05-25 13:11:09 +00:00
Ricky Wai
977ade26dd
Do not allow DPM.resetPassword() when child profile exists or user is locked
...
Bug: 28878708
Change-Id: Iaae2a9ba9c7c0ff388264c474c78a0dcd9fec258
2016-05-25 13:09:44 +00:00
Ricky Wai
f420c413b9
Merge "Unlock work profile storage even work mode is off" into nyc-dev
2016-05-25 13:06:24 +00:00
Ricky Wai
99df649aa4
Merge "Do not tie managed profile synchronously in onUnlockUser()" into nyc-dev
2016-05-25 13:04:32 +00:00
Ricky Wai
4613fe41ac
Add resetKeyStore() in LockSettingsService
...
Before resetKeyStore(), it will back up child profile keys,
and will be restored after primary profile keystore is cleared.
Bug: 28878708
Change-Id: I0cb4a1f885d468894bc7eb95af694328bf92ce16
2016-05-25 11:39:56 +01:00
Yohei Yukawa
ef68474698
Merge "Make IMM more robust to spurious window focus-in" into nyc-dev
...
am: 50c33d1ca1
2016-05-25 04:58:20 +00:00
Yohei Yukawa
50c33d1ca1
Merge "Make IMM more robust to spurious window focus-in" into nyc-dev
2016-05-25 04:47:31 +00:00
Seigo Nonaka
7b77768d39
Merge "Use original theme for SuggestsionsPopupWindow" into nyc-dev
...
am: 7c8305bcfe
2016-05-25 03:31:38 +00:00
Hugo Benichi
bfbf55fcbd
Merge "Fix default network transition event recording" into nyc-dev
...
am: 9d4e66ece6
2016-05-25 03:31:34 +00:00
Seigo Nonaka
7c8305bcfe
Merge "Use original theme for SuggestsionsPopupWindow" into nyc-dev
2016-05-25 03:24:11 +00:00
Hugo Benichi
9d4e66ece6
Merge "Fix default network transition event recording" into nyc-dev
2016-05-25 03:22:32 +00:00
Hang Yin
703d3fd84d
Merge "Created 4 camera preview stress test cases." into nyc-dev
...
am: 581387a4ae
2016-05-25 03:18:05 +00:00
Suprabh Shukla
057a81d0b3
Merge "Updating user restrictions when they are removed" into nyc-dev
...
am: 1893c4cea7
2016-05-25 03:14:39 +00:00
Hang Yin
581387a4ae
Merge "Created 4 camera preview stress test cases." into nyc-dev
2016-05-25 03:14:02 +00:00
TreeHugger Robot
1893c4cea7
Merge "Updating user restrictions when they are removed" into nyc-dev
2016-05-25 03:11:49 +00:00
Keisuke Kuroyanagi
66e5b59d85
Merge "Set input method mode for CascadingMenuPopup." into nyc-dev
...
am: edebcae978
2016-05-25 02:11:22 +00:00
Keisuke Kuroyanagi
edebcae978
Merge "Set input method mode for CascadingMenuPopup." into nyc-dev
2016-05-25 02:06:25 +00:00
Pavlin Radoslavov
6005123cea
Merge "Add missing "try ... finally" safeguards" am: 47ae606d2c
...
am: 3ef690cd7f
2016-05-25 01:51:45 +00:00
Android Build Merger (Role)
b2f00b93b0
Merge "Merge "Clamp start delay to non-negative range" into nyc-dev am: 54d89e078d" into nyc-dev-plus-aosp
2016-05-25 01:47:35 +00:00
TreeHugger Robot
152ce74448
Merge "resolve merge conflicts of e1a6098 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp
2016-05-25 01:47:23 +00:00
