Robin Lee
6dd792e2cd
Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am: 662731fb55
...
am: ed5f33740c
2016-05-04 21:49:45 +00:00
Hyunyoung Song
5a3e547143
Merge "Add shortcut manager support to Settings (2/2) b/28298258" into nyc-mr1-dev
2016-05-04 20:43:10 +00:00
Jason Monk
a058ae0dda
Fix cell data limit dialog title
...
Change-Id: I0303bc74bb7b0e46ed020d255baf2465c7db0fc5
Fixes: 27604216
2016-05-04 15:46:05 -04:00
Philip P. Moltmann
c43f32d331
Merge "Do not set order for print services settings." into nyc-dev
...
am: de4e43edda
2016-05-04 19:19:06 +00:00
Philip P. Moltmann
5cc5f2d70e
Merge "Do not set order for print services settings." into nyc-dev
...
am: de4e43edda
2016-05-04 19:19:06 +00:00
Philip P. Moltmann
de4e43edda
Merge "Do not set order for print services settings." into nyc-dev
2016-05-04 19:08:49 +00:00
Robin Lee
eb36dbea1f
Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev
...
am: 662731fb55
2016-05-04 18:58:17 +00:00
Robin Lee
ed5f33740c
Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev
...
am: 662731fb55
2016-05-04 18:54:52 +00:00
Hyunyoung Song
79ec6df771
Add shortcut manager support to Settings (2/2)
...
b/28298258
Locale change will be handled in future CL/ dynamic shortcut list
change using a UI will be handled in follow up CL.
Change-Id: I5468b17e8c8b32625139ab0484d5d0386be0961d
2016-05-04 18:52:03 +00:00
Robin Lee
662731fb55
Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev
2016-05-04 18:38:28 +00:00
Fan Zhang
aa21c1b07a
Merge "Bring escalation options UI closer to mock." into nyc-mr1-dev
...
am: 00b127b134
2016-05-04 18:03:42 +00:00
Jeff Sharkey
6bb1f8146b
Merge "UX polish tweaks to FallbackHome." into nyc-dev am: e50853f485
...
am: 0d613ab2cf
2016-05-04 18:00:35 +00:00
Fan Zhang
00b127b134
Merge "Bring escalation options UI closer to mock." into nyc-mr1-dev
2016-05-04 17:47:17 +00:00
Jason Monk
f82b3afdd6
Don't crash on non-app data usage
...
Change-Id: Ib39fc280a892dea2e3e7cbe22339799ab51a6eca
Fixes: 28531037
2016-05-04 13:43:26 -04:00
Jeff Sharkey
6c2fccfabf
Merge "UX polish tweaks to FallbackHome." into nyc-dev
...
am: e50853f485
2016-05-04 17:34:56 +00:00
Jeff Sharkey
0d613ab2cf
Merge "UX polish tweaks to FallbackHome." into nyc-dev
...
am: e50853f485
2016-05-04 17:34:55 +00:00
TreeHugger Robot
e50853f485
Merge "UX polish tweaks to FallbackHome." into nyc-dev
2016-05-04 17:13:16 +00:00
Philip P. Moltmann
7978909120
Do not set order for print services settings.
...
What happened before was that negative number turned out to be order
behind ORDER_LAST.
Change-Id: I714f623a2b1be06dde86ae7f36b39c64006203f2
2016-05-04 09:44:06 -07:00
Daniel Nishi
f2ea09f405
Merge "Fix a bug where negative file sizes were being used." into nyc-mr1-dev
...
am: 38cdbf7fdc
2016-05-04 16:31:26 +00:00
Daniel Nishi
38cdbf7fdc
Merge "Fix a bug where negative file sizes were being used." into nyc-mr1-dev
2016-05-04 16:13:24 +00:00
Fan Zhang
cd09151224
Bring escalation options UI closer to mock.
...
Bug: 28141203
Change-Id: Ia6d50d7d6f3010695c62fc1e8bd07f858715e455
2016-05-04 08:58:00 -07:00
Mahaver Chopra
1ebe441ae2
Merge "More informative title while choosing work lock." into nyc-dev am: 9efcb2e314
...
am: b735c1baf7
2016-05-04 14:31:53 +00:00
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
49a3cc0fb6
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 Prévot
dc47ac730e
Merge "Only ask for credentials in add account if user is locked." into nyc-dev am: 832c8e4fda
...
am: d16c520451
2016-05-04 13:00:47 +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 Prevot
0eab365289
Merge "Only ask for credentials in add account if user is locked." into nyc-dev
...
am: 832c8e4fda
2016-05-04 12:53:36 +00:00
Tony Mak
82d9096796
Should forward the intent even if its activity is disabled in Settings
...
This fixes the cross profile intent filter test in CtsVerifier.
Activities of action APPLICATION_DEVELOPMENT_SETTINGS and
NFC_PAYMENT_SETTINGS are disabled in managed profile. But we still
want their corresponding intents to be forwarded to personal side.
Bug: 28426865
Change-Id: I65afc06f7faf4532d9e132f44c1faa49f47d1a2e
2016-05-04 13:51:41 +01: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
Tony Mak
2211926ac4
resolve merge conflicts of d5b3a5d to nyc-mr1-dev
...
am: 8f14564787
2016-05-04 10:40:57 +00: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
8f14564787
resolve merge conflicts of d5b3a5d to nyc-mr1-dev
...
Change-Id: I1eb01bfdad24935efbbdbeaee0dcf1c374a2cadb
2016-05-04 11:14:48 +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
Daniel Nishi
30eaf00f3c
Fix a bug where negative file sizes were being used.
...
Negative file sizes for packages occurs when the file size is either
unknown or if an error occurred during size calculation. As a result,
we can skip them for total freeable space calculations.
Bug: 28465884
Change-Id: I340d725a66a228fd94993781c5e8ef732a60a7b3
2016-05-03 17:21:51 -07:00
Jeff Sharkey
c80dc5e5ef
UX polish tweaks to FallbackHome.
...
When showing during first boot (before provisioned), render as
completely black to avoid wallpaper jank before showing SUW. Also
tweak theme used during normal (provisioned) launches to avoid
rendering the dim layer behind status bar.
Bug: 28530777
Change-Id: I4b9e6c54583f07c78d86fbe9bda7f24b6959f4ba
2016-05-03 17:25:40 -06:00
Andrew Sapperstein
30b566e7c6
Merge "Null check intent before starting "learn more"." into nyc-mr1-dev
...
am: bc25322de8
2016-05-03 19:45:50 +00:00
TreeHugger Robot
bc25322de8
Merge "Null check intent before starting "learn more"." into nyc-mr1-dev
2016-05-03 19:43:30 +00:00
Jason Monk
f239345b0c
Merge "Fix leaks" into nyc-dev am: ea8ee68507
...
am: 639ed29bae
2016-05-03 19:42:19 +00:00
Jason Monk
639ed29bae
Merge "Fix leaks" into nyc-dev
...
am: ea8ee68507
2016-05-03 19:39:59 +00:00
Jason Monk
065f27b14b
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
22ac2b749a
Merge "Try to fix receiver crash" into nyc-dev am: 5a2d6800b6
...
am: 508e93babd
2016-05-03 18:44:38 +00:00
Jason Monk
bf96779cbf
Merge "Try to fix receiver crash" into nyc-dev
...
am: 5a2d6800b6
2016-05-03 18:42:10 +00: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
8a2d933b58
Merge "Add subtext for default keyboard layout." into nyc-dev am: 12c2c2538b
...
am: df824969af
2016-05-03 18:36:48 +00:00
