Commit Graph

26525 Commits

Author SHA1 Message Date
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

* commit '9efcb2e314f4c31de26cea629b03b436f7b84df1':
  More informative title while choosing work lock.

Change-Id: Ib71598d4112cb10392fa32cc39aa10699ad6855e
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

* commit '832c8e4fdadce8b8fd9b13fe584a7dfb0324d0a0':
  Only ask for credentials in add account if user is locked.

Change-Id: Ic93962179b1ce9ac19233810dbf065aedd662168
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  -s ours

* commit '61e99fed5bf1791f0cc73199f8d99d9519a9f811':
  Import translations. DO NOT MERGE

Change-Id: I6f32a88ec655e494347168c37cb0ecba7ebea8ba
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
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
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

* commit 'ea8ee685077c4fff18f6ac8e12b69d1d119a022d':
  Fix leaks

Change-Id: I5fffa584a7e265533c17b341636421ee99d4812c
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

* commit '5a2d6800b67fdfa3ef3ba930c09668e1f59f8cfc':
  Try to fix receiver crash

Change-Id: I3c2bb9113fbd9599450a011836881e91dbfd8270
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

* commit '12c2c2538b1e87f1a2d75f001772719bca9ab8f4':
  Add subtext for default keyboard layout.

Change-Id: I4cfe66c6352b72e7b9baf933d9835df2a8c84282
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
Rachel Zhang
8088907360 Launch Help & Feedback
Bug: 28139684
Bug: 28141203
Change-Id: I9853fa5fd789cd6404dddfd9b00b7dc3afe73d91
2016-05-03 10:48:05 -07:00
Baligh Uddin
5c4e2d741a Merge "Import translations. DO NOT MERGE" into nyc-dev
am: e6a875576f  -s ours

* commit 'e6a875576f3713c755c5bbca855b43b1048b3618':
  Import translations. DO NOT MERGE

Change-Id: I54dbc26d0afdd735fb798eefd4eab6d3a3773aa1
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
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
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

* commit 'e0e7fa4501214be7c2cdf0fbf3e503d54504bd3f':
  Read disk ID from intent

Change-Id: Ifd8786add5110d6556a0974d1e0379e68490acb4
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

* commit '57e6a9144a0577308bd9888f3498c17ca96e4f5f':
  Show app installer info even if it doesn't handle ACTION.APP_SHOW_INFO.

Change-Id: I078516706896910eeee3e86b525e96cdf807aa1b
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

* commit '0e4816efb99e28a25efecee1702c552bfb9ba849':
  Remove top padding only if illustration is present

Change-Id: Ice07c970200be51a0b8447a1cfcaf59eac4e8142
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

* commit '820d7c85c724b28267b1a5d0dee8b190f49d8517':
  Properly handle rotation in NotificationLockscreenPreference

Change-Id: I67be3fb9333356f0e1e7fa3de7c4a3838554b32a
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