Mahaver Chopra
b735c1baf7
Merge "More informative title while choosing work lock." into nyc-dev
...
am: 9efcb2e314
2016-05-04 14:22:27 +00:00
Mahaver Chopra
9efcb2e314
Merge "More informative title while choosing work lock." into nyc-dev
2016-05-04 14:03:09 +00:00
Nicolas Prevot
d16c520451
Merge "Only ask for credentials in add account if user is locked." into nyc-dev
...
am: 832c8e4fda
2016-05-04 12:53:44 +00:00
Nicolas Prévot
832c8e4fda
Merge "Only ask for credentials in add account if user is locked." into nyc-dev
2016-05-04 12:43:31 +00:00
Mahaver Chopra
bc18b40623
More informative title while choosing work lock.
...
When Intent ACTION_SET_NEW_PASSWORD is called from a managed profile,
ChooseLockGeneric fragment shows title "Unlock Selection", update that to
"Choose work lock".
Bug: 28451356
Change-Id: I9bcf4698557fa453337aa666f10f94f15e7624fa
2016-05-04 13:13:44 +01:00
Nicolas Prevot
bd4c570bfd
Only ask for credentials in add account if user is locked.
...
Also: if work mode is off, ask to turn work on before adding
a work account.
BUG:28220470
Change-Id: Ib23f87f056ad41c1f9713bb8d3c5263f015e6475
2016-05-04 11:34:26 +01:00
Tony Mak
b8cfa32bf1
Merge "Add managed profile setting page" into nyc-dev
...
am: d5b3a5d342
2016-05-04 09:41:58 +00:00
Tony Mak
d5b3a5d342
Merge "Add managed profile setting page" into nyc-dev
2016-05-04 09:33:24 +00:00
Baligh Uddin
bf78b8c221
Import translations. DO NOT MERGE
...
am: 61e99fed5b
2016-05-04 00:23:42 +00:00
Baligh Uddin
61e99fed5b
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 28463229
Change-Id: I7f6bb467fe967635f9febafb61764b596d075fa3
2016-05-03 17:00:33 -07:00
Jason Monk
639ed29bae
Merge "Fix leaks" into nyc-dev
...
am: ea8ee68507
2016-05-03 19:39:59 +00:00
Jason Monk
ea8ee68507
Merge "Fix leaks" into nyc-dev
2016-05-03 19:36:34 +00:00
Jason Monk
4e8d3013a2
Fix leaks
...
Change-Id: Iba29be756934d9564cfdee1f6281c56345772dc7
Fixes: 28074995
2016-05-03 15:24:05 -04:00
Jason Monk
508e93babd
Merge "Try to fix receiver crash" into nyc-dev
...
am: 5a2d6800b6
2016-05-03 18:42:05 +00:00
Jason Monk
5a2d6800b6
Merge "Try to fix receiver crash" into nyc-dev
2016-05-03 18:37:24 +00:00
Michael Wright
df824969af
Merge "Add subtext for default keyboard layout." into nyc-dev
...
am: 12c2c2538b
2016-05-03 18:34:18 +00:00
Michael Wright
12c2c2538b
Merge "Add subtext for default keyboard layout." into nyc-dev
2016-05-03 18:28:59 +00:00
Michael Wright
276cc4d8ed
Add subtext for default keyboard layout.
...
Bug: 27742933
Change-Id: I51bec339c0cbcfb114f85758b6a227deb57a69e2
2016-05-03 18:27:16 +00:00
Jason Monk
a8a029f8eb
Try to fix receiver crash
...
Change-Id: I98fcde7f4595d0bf90bf2a2b8ba96cb96519a008
Fixes: 28554650
2016-05-03 14:25:56 -04:00
Tony Mak
64f6d9896f
Add managed profile setting page
...
Bug: 28281560
Change-Id: I1187f834dd9d002ec898a7d343198025963d1c26
2016-05-03 18:55:41 +01:00
Baligh Uddin
8c648f3fd5
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: e6a875576f
2016-05-03 16:49:06 +00:00
Baligh Uddin
e6a875576f
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-05-03 16:41:17 +00:00
Baligh Uddin
e118a96fd0
Import translations. DO NOT MERGE
...
Change-Id: If49388814aafcf05ad9b1899b7e991463c8c3662
Auto-generated-cl: translation import
2016-05-03 01:25:52 -07:00
Philip P. Moltmann
0c71d3b5cf
Merge "Read disk ID from intent" into nyc-dev
...
am: e0e7fa4501
2016-05-02 23:24:05 +00:00
Philip P. Moltmann
e0e7fa4501
Merge "Read disk ID from intent" into nyc-dev
2016-05-02 23:00:30 +00:00
Sudheer Shanka
0814dfbccb
Merge "Show app installer info even if it doesn\'t handle ACTION.APP_SHOW_INFO." into nyc-dev
...
am: 57e6a9144a
2016-05-02 20:09:59 +00:00
Sudheer Shanka
57e6a9144a
Merge "Show app installer info even if it doesn't handle ACTION.APP_SHOW_INFO." into nyc-dev
2016-05-02 20:00:45 +00:00
Maurice Lam
0f27a312b7
Merge "Remove top padding only if illustration is present" into nyc-dev
...
am: 0e4816efb9
2016-05-02 18:05:27 +00:00
Maurice Lam
0e4816efb9
Merge "Remove top padding only if illustration is present" into nyc-dev
2016-05-02 17:58:10 +00:00
Adrian Roos
3b8cc35b4a
Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev
...
am: 820d7c85c7
2016-05-02 15:21:02 +00:00
Adrian Roos
820d7c85c7
Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev
2016-05-02 15:13:40 +00:00
Philip P. Moltmann
2fc2eb49a9
Read disk ID from intent
...
mDisk might be null, but we can recover the disk ID from the original
Intent.
Bug: 28177789
Change-Id: Ic3e33a60084c42eb0bb06145ad50a45077e650d0
2016-04-29 16:35:28 -07:00
Maurice Lam
4d227268c6
Remove top padding only if illustration is present
...
Bug: 28469515
Change-Id: Ifc41b09b2b1675b696291753ff68fe4a801c76c2
2016-04-29 15:07:40 -07:00
Adrian Roos
4bd42073d4
Properly handle rotation in NotificationLockscreenPreference
...
There were some issues because we didn't explicitly
track and restore the selected position upon rotating,
so the fragment's oppinion of which item was selected
didn't match the ListView's.
Change-Id: Ia86e25dab36b44931297f8bcc7bcb7d6974f4b76
Fixes: 27921546
2016-04-29 14:37:16 -07:00
Jason Monk
4b32f9f5ad
Merge "Don\'t crash on Settings data usage" into nyc-dev
...
am: b60c7560af
2016-04-29 18:58:41 +00:00
Jason Monk
b60c7560af
Merge "Don't crash on Settings data usage" into nyc-dev
2016-04-29 18:54:08 +00:00
Jason Monk
bc4e200a59
Don't crash on Settings data usage
...
Consider Settings uid (SYSTEM_UID) to be an app.
Change-Id: Ia5cc7897eafdf3d654e8a23715bd25502097bab8
Fixes: 28193076
2016-04-29 14:06:10 -04:00
Jason Monk
cf5a448ce5
Merge "Don\'t crash settings when out of space." into nyc-dev
...
am: a1fe122b99
2016-04-29 17:57:27 +00:00
Jason Monk
a1fe122b99
Merge "Don't crash settings when out of space." into nyc-dev
2016-04-29 17:54:34 +00:00
Jason Monk
ef71f605f3
Don't crash settings when out of space.
...
Change-Id: I2e36fe845601558d789f38ae9f70d1a1684d8fd4
Fixes: 28198128
2016-04-29 13:51:08 -04:00
Mihai Nita
f02a31beaa
Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev
...
am: 7dce005fab
2016-04-29 17:50:39 +00:00
Mihai Niță
7dce005fab
Merge "Fix: accessibility actions move languages but don't update" into nyc-dev
2016-04-29 17:46:16 +00:00
Clara Bayarri
1159a0a79c
Merge "Remove Secure Startup option from Security Settings" into nyc-dev
...
am: 35bf932eb0
2016-04-29 17:38:56 +00:00
Clara Bayarri
35bf932eb0
Merge "Remove Secure Startup option from Security Settings" into nyc-dev
2016-04-29 17:28:42 +00:00
Clara Bayarri
0a84fd121d
Merge "Storage Settings shows hamburger instead of back arrow" into nyc-dev
...
am: d2549ce663
2016-04-29 16:46:27 +00:00
Clara Bayarri
d2549ce663
Merge "Storage Settings shows hamburger instead of back arrow" into nyc-dev
2016-04-29 16:38:12 +00:00
Clara Bayarri
f534a66afd
Storage Settings shows hamburger instead of back arrow
...
When there is only internal storage, StorageSettings forwards
automatically to this sub settings page, causing the navigation
icon to be the back arrow. Fixed to make it a hamburger in this
case.
Bug: 28197210
Change-Id: Ief3f7daa3973332a800faa652261e2cfdec36e85
2016-04-29 16:58:09 +01:00
Julia Reynolds
1d5fbf6672
Merge "Fix NPE in user settings." into nyc-dev
...
am: e69d754865
2016-04-29 14:34:28 +00:00
Julia Reynolds
e69d754865
Merge "Fix NPE in user settings." into nyc-dev
2016-04-29 14:29:18 +00:00
shwetachahar
bf4e0306bc
Merge "Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java" into nyc-dev
...
am: 19c01f0351
2016-04-29 13:34:19 +00:00
