Fan Zhang
be61a14fcd
Add estimate time under support options.
...
Bug: 28141203
- SupportFeatureProvider will provide a localized estimate string.
- Use a builder pattern to instantiate SupportData to avoid increasing
constructor args.
Change-Id: I92e90cd57b4ef4e1d921f403801cfd5984ef6a3b
2016-05-05 11:06:08 -07:00
Rachel Zhang
1529a875db
Merge "Launch Help & Feedback" into nyc-mr1-dev
2016-05-05 17:58:14 +00:00
Abodunrinwa Toki
48bd6631af
Merge "InputSettings: Define order of items in Physical keyboards screen." into nyc-dev
...
am: 56f7bc44a1
2016-05-05 16:46:48 +00:00
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
1c06aedc3f
Merge "Don\'t crash on non-app data usage" into nyc-dev
...
am: d1a4e452ed
2016-05-05 15:47:50 +00:00
Jason Monk
0c7d11fe56
Merge "Fix cell data limit dialog title" into nyc-dev
...
am: 2a6bc40d49
2016-05-05 15:47:50 +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
ce2201a04c
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
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
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
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
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
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
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
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 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
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
d5b3a5d342
Merge "Add managed profile setting page" into nyc-dev
2016-05-04 09:33:24 +00:00
Baligh Uddin
cce4c8e845
Import translations. DO NOT MERGE
...
am: 61e99fed5b
2016-05-04 00:23:48 +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
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
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
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
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
bf96779cbf
Merge "Try to fix receiver crash" into nyc-dev
...
am: 5a2d6800b6
2016-05-03 18:42:10 +00:00
Jason Monk
5a2d6800b6
Merge "Try to fix receiver crash" into nyc-dev
2016-05-03 18:37:24 +00:00
Michael Wright
e71a6ac6cd
Merge "Add subtext for default keyboard layout." into nyc-dev
...
am: 12c2c2538b
2016-05-03 18:34:17 +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
Andrew Sapperstein
6561d4870f
Null check intent before starting "learn more".
...
It is possible in certain build configurations to have an invalid
link. Instead of crashing, swallow the error and write to logs.
BUG: 28381984
Change-Id: I19f20b96afb42758187707f1b86a5817e8d737a8
2016-05-03 11:01:35 -07:00
Tony Mak
64f6d9896f
Add managed profile setting page
...
Bug: 28281560
Change-Id: I1187f834dd9d002ec898a7d343198025963d1c26
2016-05-03 18:55:41 +01:00
