Fan Zhang
00b127b134
Merge "Bring escalation options UI closer to mock." into nyc-mr1-dev
2016-05-04 17:47:17 +00: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
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
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
Baligh Uddin
5c4e2d741a
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: e6a875576f
2016-05-03 16:49:04 +00:00
Baligh Uddin
ad4773b774
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-05-03 16:41:21 +00:00
Baligh Uddin
e6a875576f
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-05-03 16:41:17 +00:00
Baligh Uddin
0737787235
Import translations. DO NOT MERGE
...
Change-Id: Ief7fdf92fd579e99764edbf2438caa44d6735da7
Auto-generated-cl: translation import
2016-05-03 01:39:46 -07: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
fe99c4282e
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
000293cbb9
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:58 +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
ec3fec5f94
Merge "Remove top padding only if illustration is present" into nyc-dev
...
am: 0e4816efb9
2016-05-02 18:05:23 +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
Fan Zhang
ac74071630
Merge "Explicitly setAccount in the same way as setHasInternet." into nyc-mr1-dev
2016-05-02 16:57:12 +00:00
Fan Zhang
9502163f92
Explicitly setAccount in the same way as setHasInternet.
...
Bug: 28141203
This frees adapter from updating account and internet internally, and
allows refreshData() be private.
Change-Id: I8ccb4311c48c66222ee19e2d01b1c4943acdb0ee
2016-05-02 09:24:59 -07:00
Adrian Roos
c14a9af008
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
fc63188c2c
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
Fan Zhang
7efc40797a
Merge "Disable stable id in support adapter." into nyc-mr1-dev
2016-04-29 18:20:51 +00:00
