Commit Graph

26413 Commits

Author SHA1 Message Date
Nicolas Prevot
a599c8fd04 Ask the user to unlock the work profile before adding a work account.
If the work profile is locked, and the user tries to add a
work account from Settings:
Show the work profile security challenge.

BUG:28005200
Change-Id: I87ff25d9de94026b0d7ac307ea3a541e77989aa6
2016-04-06 11:19:08 +01:00
Oleksandr Peletskyi
a2810b8eaa Merge "Block "Screen lock" menu for Work Challenge." into nyc-dev
am: 4ffa5c8

* commit '4ffa5c8af5ad7042e74e3cfddd407ad1161cb544':
  Block "Screen lock" menu for Work Challenge.

Change-Id: Ifc34a13c1ee69db2e61c4fdf7864ff092a2c97d2
2016-04-06 09:36:14 +00:00
Oleksandr Peletskyi
4ffa5c8af5 Merge "Block "Screen lock" menu for Work Challenge." into nyc-dev 2016-04-06 09:31:22 +00:00
Joseph Pirozzo
4c74ed3318 Merge "PBAP Pairing Permission" into nyc-dev
am: e5b8ec0

* commit 'e5b8ec020cc03c7ce331b21b2cb56c7000cb69e5':
  PBAP Pairing Permission

Change-Id: I336a32e7e220808e67b999a4c0c6471e342a7bc9
2016-04-05 23:44:12 +00:00
Sanket Agarwal
e5b8ec020c Merge "PBAP Pairing Permission" into nyc-dev 2016-04-05 23:39:55 +00:00
Fyodor Kupolov
e1d9fd8346 Merge "Do not store bitmap into Bundle in onSaveInstanceState" into nyc-dev
am: 84948db

* commit '84948db8d085a8ea2a33338597dd31b9c9c36eaa':
  Do not store bitmap into Bundle in onSaveInstanceState

Change-Id: I2342ef88d5848e82d0e4cd1f262e5828c2d3da88
2016-04-05 23:34:05 +00:00
Fyodor Kupolov
84948db8d0 Merge "Do not store bitmap into Bundle in onSaveInstanceState" into nyc-dev 2016-04-05 22:20:16 +00:00
Suprabh Shukla
b84720c075 Moving HelpUtils to SettingsLib
Moved HelpUtils to SettingsLib in frameworks/base so it can be shared by
packageinstaller as well.

Bug: b/22096093
Change-Id: I8d620abcde8279a3b4d11bbcff8ae9b6f46a1895
2016-04-05 14:37:33 -07:00
Victor Chang
a390d63682 Add button to trust a CA cert
- Put Disable button for system cert and Remove button for user cert as action button in cert dialog
- OK (dismiss) button is displayed when trust button is not shown
- Showing chain of cert dialot will be in a later CL

Bug: 18224038
Change-Id: Ieef70e12fd8bdf711be48dc0488f03dbe143d3c5
2016-04-05 22:22:41 +01:00
Jason Monk
449f97204a Add dev options to set swXdp
Change-Id: Ibe88e2b1a2e818838baf452b6da204fc9e004a42
Fixes: 27734698
2016-04-05 16:47:44 -04:00
Bill Yi
563969ccc0 Merge "Import translations. DO NOT MERGE" into nyc-dev
am: e303983  -s ours

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

Change-Id: I6415fff0a6bb98a571d7a5376c589ea23a353d53
2016-04-05 18:51:23 +00:00
Bill Yi
e303983e5d Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-05 18:44:35 +00:00
Bill Yi
c75d555a33 Import translations. DO NOT MERGE
Change-Id: I9359139bccc9223f079201807385a9b4f531474a
Auto-generated-cl: translation import
2016-04-05 11:25:39 -07:00
Fyodor Kupolov
7a5e897db0 Do not store bitmap into Bundle in onSaveInstanceState
It may cause TransactionTooLargeException because of the parcel size limit

Bug: 27990767
Change-Id: Ie1a702810a5c26e25fc485ebae09dc65e2b48e41
2016-04-05 10:46:20 -07:00
Anna Galusza
51ccf7c7a9 Merge "Add Tron Logging to portion of A11y SUW that lives in Settings. Bug: 27777706" into nyc-dev
am: da0e4d3

* commit 'da0e4d3280917594fc96a9096950524b9bdb643a':
  Add Tron Logging to portion of A11y SUW that lives in Settings. Bug: 27777706

Change-Id: I472e177ba8b83b8f952405a05dd81671ff644801
2016-04-05 16:55:00 +00:00
Anna Galusza
da0e4d3280 Merge "Add Tron Logging to portion of A11y SUW that lives in Settings. Bug: 27777706" into nyc-dev 2016-04-05 16:46:29 +00:00
Jason Monk
80058c6f3a Merge "Update data saver icon" into nyc-dev
am: 72304b5

* commit '72304b5edd62fa14d9f61265eb6dcda0d6aeea59':
  Update data saver icon

Change-Id: I44d5e08939a912123bce2d8e92530fc613851c9f
2016-04-05 16:45:56 +00:00
Jason Monk
72304b5edd Merge "Update data saver icon" into nyc-dev 2016-04-05 16:38:38 +00:00
Jason Monk
4145fb96d4 Update data saver icon
Change-Id: I9ffd81224da2601a9c4618da04a058da1c08d38e
Fixes: 28004364
2016-04-05 12:36:24 -04:00
Rubin Xu
04bc35ca6b Merge "Listen on new broadcasts for profile changes." into nyc-dev
am: 29e73f2

* commit '29e73f2d4c96b73aab15603131f5caccaf9222a4':
  Listen on new broadcasts for profile changes.

Change-Id: I18afc97449c378e75f5b93bab227ffd977e60639
2016-04-05 15:04:55 +00:00
Rubin Xu
29e73f2d4c Merge "Listen on new broadcasts for profile changes." into nyc-dev 2016-04-05 14:52:00 +00:00
Jason Monk
cd79f40583 Merge "Fix end padding of summary text for dialog is too narrow" am: dc07c29
am: 69960b8

* commit '69960b8da7eec23fb2ee0b9199c2e2ea9e131a08':
  Fix end padding of summary text for dialog is too narrow

Change-Id: I987214f302cd56fd1301ebe7307f843c5da276a5
2016-04-05 14:38:54 +00:00
Qi Ding
69960b8da7 Merge "Fix end padding of summary text for dialog is too narrow"
am: dc07c29

* commit 'dc07c2935e46c07e05c6ff85feaa35ccebc49481':
  Fix end padding of summary text for dialog is too narrow

Change-Id: Ie3cb6b60d2a404194f6050818048bd443680ec74
2016-04-05 14:36:07 +00:00
Jason Monk
dc07c2935e Merge "Fix end padding of summary text for dialog is too narrow" 2016-04-05 14:20:44 +00:00
Bill Yi
e70198d278 Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 196c7f7  -s ours

* commit '196c7f74dbb1a30bc3898e607f8a70a8233abc65':
  Import translations. DO NOT MERGE

Change-Id: I8b9ce1df4ddebca2b4fa9e66d65d80b280586f14
2016-04-05 03:29:31 +00:00
Bill Yi
196c7f74db Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-05 03:22:40 +00:00
Qi Ding
e5d4a5db28 Fix end padding of summary text for dialog is too narrow
The end padding of summary text is too narrow,
so "dialogPreferredPadding" attribute should be used
as the end padding of the whole list item.

Change-Id: I348c1a0ac8da011b4971b4f38c7f5ee3e295146f
2016-04-05 11:31:36 +09:00
Bill Yi
30ea505237 Import translations. DO NOT MERGE
Change-Id: I38d52ee3540f9b1e593d482d2eccb180d7936212
Auto-generated-cl: translation import
2016-04-04 18:10:36 -07:00
Udam Saini
a837edb3c6 Merge "Adds a multi line preference class." into nyc-dev
am: 9a8f009

* commit '9a8f0098805f225f84b5adbc11a76ffc7afe7a8b':
  Adds a multi line preference class.

Change-Id: Ibbea8a472b7c2514c32d451c597970470d9a8e17
2016-04-04 20:13:44 +00:00
Udam Saini
9a8f009880 Merge "Adds a multi line preference class." into nyc-dev 2016-04-04 20:06:30 +00:00
Julia Reynolds
41317c639c Merge "Show fewer filters on notifications page." into nyc-dev
am: a003fa5

* commit 'a003fa583cc7ca1aa2b4b98d9a6c2a96d7943e5c':
  Show fewer filters on notifications page.

Change-Id: Ie5c4d7139702fcfd3c1b8f696d386c728645cbb1
2016-04-04 19:48:39 +00:00
Julia Reynolds
6a165a1b9d Merge "Fix ringtone persistance after device rotation." into nyc-dev
am: cd37e59

* commit 'cd37e59b9a1d54a5896dfb0491c32eedb4326939':
  Fix ringtone persistance after device rotation.

Change-Id: Ic2453dd647b2e86f7c0ef1177ed7af18f40bcc9a
2016-04-04 19:48:39 +00:00
Julia Reynolds
a003fa583c Merge "Show fewer filters on notifications page." into nyc-dev 2016-04-04 19:39:26 +00:00
Julia Reynolds
cd37e59b9a Merge "Fix ringtone persistance after device rotation." into nyc-dev 2016-04-04 19:39:13 +00:00
Jason Monk
ed84c11657 Merge "Add moar dividers" into nyc-dev
am: da6ae85

* commit 'da6ae856a9fc76f05553cc2d9a0d1bb09ae07b29':
  Add moar dividers

Change-Id: Ic418d2eac4c41dda4fc8efe9ace712d2a7587fbf
2016-04-04 19:36:44 +00:00
Jason Monk
da6ae856a9 Merge "Add moar dividers" into nyc-dev 2016-04-04 19:29:55 +00:00
Julia Reynolds
1e91f9f30e Show fewer filters on notifications page.
Bug: 27834480
Change-Id: Ibdc9924a7ea1b1db7be089507485de5c4fd41b58
2016-04-04 15:20:11 -04:00
Julia Reynolds
c736efcb61 Fix ringtone persistance after device rotation.
Bug: 26122624
Change-Id: I187fe673dea250e93c6e9603239f01845ed378a3
2016-04-04 15:20:11 -04:00
Maurice Lam
4317f907c4 Merge "Set LinkMovementMethod in LinkTextView" into nyc-dev
am: f9db17e

* commit 'f9db17e3ccca5ce4c2ce5504fd6410db4bf52371':
  Set LinkMovementMethod in LinkTextView

Change-Id: Ibb4733e2b3c854f57c8101ffa424a64cbb6e1d4e
2016-04-04 18:04:12 +00:00
Maurice Lam
f9db17e3cc Merge "Set LinkMovementMethod in LinkTextView" into nyc-dev 2016-04-04 17:57:52 +00:00
Yohei Yukawa
4ddc39e17f Merge "Fix PhysicalKeyboardFragment crash bug." into nyc-dev
am: 19998fe

* commit '19998fef793c175280440a407bf74567bfc41e50':
  Fix PhysicalKeyboardFragment crash bug.

Change-Id: I5e7559eb4b02dd809fbc34d9949ff2737bcc0476
2016-04-04 17:43:22 +00:00
Yohei Yukawa
19998fef79 Merge "Fix PhysicalKeyboardFragment crash bug." into nyc-dev 2016-04-04 17:28:23 +00:00
Jason Monk
3676b931d9 Add moar dividers
Bug: 27834471
Change-Id: I575040edcdf76124f21a667e64762acb86a65cb2
2016-04-04 13:20:59 -04:00
Rubin Xu
819f78e91b Listen on new broadcasts for profile changes.
The change is due to API review comments on the platform side.

Bug: 27532254
Change-Id: Iacb87f97148ceead6bf1f1cc7a0671711698b061
2016-04-04 17:24:30 +01:00
Tony Mak
0e5caa2080 Force work challenge activity to be not resizable
We need to add the flag resizeableActivity to the root activity of
the task that holding the work challenge activity which is
ConfirmDeviceCredentialActivity$InternalActivity.

This activity is the entry point for work challenge and is not used
elsewhere.

Bug: 27565539

Change-Id: I79157e4ea9c7a52a1727919dcd4d311380492f3d
2016-04-04 16:25:24 +01:00
Julia Reynolds
7effca50d4 Merge "Hide repeat callers instead of disabling." into nyc-dev
am: 03a3a1e

* commit '03a3a1efd56edbba65750be7a89085c78c64d8d3':
  Hide repeat callers instead of disabling.

Change-Id: I76c256e0204d6cb42c09a801005dc0583262e49c
2016-04-04 13:56:54 +00:00
Julia Reynolds
cf61f2e160 Merge "Lowercase s." into nyc-dev
am: b24cfaf

* commit 'b24cfafd1dfbc95f85341ebd6f355e35d05f8b7e':
  Lowercase s.

Change-Id: I6606efd93f4d7550d3004af5be0ad809b4593614
2016-04-04 13:56:54 +00:00
Daniel U
6e556092f5 Allow user to hide sensitive notifications with no work challenge
When a user upgrades to N, her work profile is automatically
unified even though no work challenge setting is shown to the user
if the user has not upgraded her DPC. Allow the user to hide
sensitive notifications based on whethere there's a profile, but not
on whether there is a work challenge.

Bug:27673591
Change-Id: Iec41dda2d9e479597b3e593e7f9b7f1c0fcd2a49
2016-04-04 14:55:56 +01:00
Julia Reynolds
03a3a1efd5 Merge "Hide repeat callers instead of disabling." into nyc-dev 2016-04-04 13:52:36 +00:00
Julia Reynolds
b24cfafd1d Merge "Lowercase s." into nyc-dev 2016-04-04 13:52:27 +00:00