Abodunrinwa Toki
56f7bc44a1
Merge "InputSettings: Define order of items in Physical keyboards screen." into nyc-dev
2016-05-05 16:40:58 +00:00
Jason Monk
9c38c20900
Merge "Don\'t crash on non-app data usage" into nyc-dev
...
am: d1a4e452ed
2016-05-05 15:47:54 +00:00
Jason Monk
6f71ed9dbb
Merge "Fix cell data limit dialog title" into nyc-dev
...
am: 2a6bc40d49
2016-05-05 15:47:54 +00:00
Jason Monk
d1a4e452ed
Merge "Don't crash on non-app data usage" into nyc-dev
2016-05-05 15:41:17 +00:00
Jason Monk
2a6bc40d49
Merge "Fix cell data limit dialog title" into nyc-dev
2016-05-05 15:40:51 +00:00
Tony Mak
a428e704e0
Merge "Should forward the intent even if its activity is disabled in Settings" into nyc-dev
...
am: de4b51c8ce
2016-05-05 13:57:03 +00:00
Tony Mak
de4b51c8ce
Merge "Should forward the intent even if its activity is disabled in Settings" into nyc-dev
2016-05-05 13:50:10 +00:00
Abodunrinwa Toki
226e452c15
InputSettings: Define order of items in Physical keyboards screen.
...
Bug: 28158120
Change-Id: Ia7cec64edb9da53a2048865e317b2b9d4b2059b0
2016-05-05 13:52:03 +01: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
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
662731fb55
Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev
2016-05-04 18:38:28 +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
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
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
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
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
Jim Miller
8ec45f877e
Show signal strength indication while in CryptKeeper
...
Fixes bug 28011104
Change-Id: I66186e3f47b469489578cd776a31bdd6193b6d92
2016-05-03 16:39:11 -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
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
Felipe Leme
f79c20500e
Implemented onRestrictPowerChanged().
...
BUG: 28521946
Change-Id: I702e27401f74eee6ce884351ae4e0bc89ec6b8e2
2016-05-03 08:43:08 -07:00
Robin Lee
cdebe28c15
Add lockdownEnabled parameter to always-on VPN API
...
Allows callers to opt-out of blockading network traffic during boot and
on VPN app failure.
Bug: 26694104
Change-Id: Ic2c25b79d8a17917025eb37be7de929fe156e2a3
2016-05-03 13:27:05 +01: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
