Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,402 Commits 1 Branch 0 Tags
0886bf22716d6e0501b6a5cb7bc202a01e2df875
Commit Graph

22244 Commits

Author SHA1 Message Date
Andres Morales
11dcefc9a8 Merge "handle devices that don\'t support FLASH_LOCK_STATE" into nyc-dev 
am: 2006403

* commit '20064037a7e52584a69edbaeccd29c23630a4156':
  handle devices that don't support FLASH_LOCK_STATE

Change-Id: Ib5857f6a49aa8f2e105900a6ec0bcb2bf4908067
 2016-04-07 00:09:13 +00:00
Andres Morales
20064037a7 Merge "handle devices that don't support FLASH_LOCK_STATE" into nyc-dev 2016-04-07 00:00:38 +00:00
Andres Morales
ce4bdca151 handle devices that don't support FLASH_LOCK_STATE 
only disable OEM unlocking pref for devices that report
FLASH_LOCK_UNLOCKED.

Bug: 27967926
Change-Id: Ia41b0dc9249e11df2fb35263ebde05f3a2e0d29a
 2016-04-06 15:04:48 -07:00
Fan Zhang
a911917162 Merge "Add a RecyclerView adapter for first tab in settings." 2016-04-06 20:40:28 +00:00
Fan Zhang
228a0e49c2 Merge "Fix animation when expand conditional notices in Settings." into nyc-dev am: df634d0 
am: 4b2519d

* commit '4b2519d3c1d1030cae6212e37565ecf42bbef5b2':
  Fix animation when expand conditional notices in Settings.

Change-Id: I8109c31e037d2bedba15965210b74fef41077ac1
 2016-04-06 19:31:51 +00:00
Fan Zhang
4b2519d3c1 Merge "Fix animation when expand conditional notices in Settings." into nyc-dev 
am: df634d0

* commit 'df634d03c52ea88f64855935810ee45250fa8528':
  Fix animation when expand conditional notices in Settings.

Change-Id: I40ba59ed57d8bd8c82f400bf4dcba7bc7fa794ab
 2016-04-06 19:26:11 +00:00
Fan Zhang
df634d03c5 Merge "Fix animation when expand conditional notices in Settings." into nyc-dev 2016-04-06 19:07:10 +00:00
Anna Galusza
b95de86ae3 Merge "Revert "Fix issues with wrong configuration being used to inflate layouts. Bug: 27700406" Framework bug was fixed by ag/900274, so this is no longer needed." into nyc-dev am: a3d8c31 
am: 8e13f72

* commit '8e13f725dc1f1bad626410a5accdbf52bf5b6fc7':
  Revert "Fix issues with wrong configuration being used to inflate layouts. Bug: 27700406" Framework bug was fixed by ag/900274, so this is no longer needed.

Change-Id: Ifee675dfc34c5233af5c2f4f90d8ccef2a6535cc
 2016-04-06 17:51:21 +00:00
Anna Galusza
8e13f725dc Merge "Revert "Fix issues with wrong configuration being used to inflate layouts. Bug: 27700406" Framework bug was fixed by ag/900274, so this is no longer needed." into nyc-dev 
am: a3d8c31

* commit 'a3d8c316d4902edb97fe6c5c257a47406b1c30bb':
  Revert "Fix issues with wrong configuration being used to inflate layouts. Bug: 27700406" Framework bug was fixed by ag/900274, so this is no longer needed.

Change-Id: I9ef886bd7bdad975a55411ed5830837f3d965f0f
 2016-04-06 17:48:16 +00:00
Anna Galusza
a3d8c316d4 Merge "Revert "Fix issues with wrong configuration being used to inflate layouts. Bug: 27700406" Framework bug was fixed by ag/900274, so this is no longer needed." into nyc-dev 2016-04-06 17:47:09 +00:00
Fan Zhang
44e7be1289 Add a RecyclerView adapter for first tab in settings. 
Bug: 27907841

The new adapter eventually will contain: conditionals, status,
suggestions.

Change-Id: I62f9db3db6557b16255ad94e2ce166b3c376e1bb
 2016-04-06 10:13:38 -07:00
Fan Zhang
905002a01d Fix animation when expand conditional notices in Settings. 
Bug: 28017593
Change-Id: I8275cb2050f79d26e58c02ffd91cb1a3e32a5ff2
 2016-04-06 10:07:03 -07:00
Clara Bayarri
ea8772a9c3 Add Keyboard Shortcuts Helper entry in Settings 
Bug: 27811273
Change-Id: Ic4a97c869d6476bf427e41023dc595b39589e6ce
 2016-04-06 14:55:49 +01:00
Jason Monk
9964504e51 Merge "Add dev options to set swXdp" into nyc-dev am: b22dd20 
am: 51970c8

* commit '51970c855812232a9514958dd67959f18749fbe1':
  Add dev options to set swXdp

Change-Id: Id25b198c9af3e7b6eca478c3936341096d5edd2e
 2016-04-06 13:31:44 +00:00
Jason Monk
51970c8558 Merge "Add dev options to set swXdp" into nyc-dev 
am: b22dd20

* commit 'b22dd2071ff35294a2a2663fa5b77064f5dab773':
  Add dev options to set swXdp

Change-Id: Iad0577e86d364977faaa9f02c91507774cf9ab62
 2016-04-06 13:29:09 +00:00
Jason Monk
b22dd2071f Merge "Add dev options to set swXdp" into nyc-dev 2016-04-06 13:20:07 +00:00
Victor Chang
67691696f2 Merge "Add button to trust a CA cert" into nyc-dev am: b49c901 
am: 2bd4e16

* commit '2bd4e1689f1e154a9a4a1d47ccbe13c6e8f08dea':
  Add button to trust a CA cert

Change-Id: If836edae5e6cf7b4759ac6874cef4d324af91f16
 2016-04-06 11:07:55 +00:00
Victor Chang
2bd4e1689f Merge "Add button to trust a CA cert" into nyc-dev 
am: b49c901

* commit 'b49c901f8ea6a2408755f62423eccb4be92d6ca6':
  Add button to trust a CA cert

Change-Id: I39906ba5bcd57de254b028222099a3cda4e6b8ee
 2016-04-06 11:04:59 +00:00
Victor Chang
b49c901f8e Merge "Add button to trust a CA cert" into nyc-dev 2016-04-06 10:59:20 +00:00
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
28489bbd72 Merge "Block "Screen lock" menu for Work Challenge." into nyc-dev am: 4ffa5c8 
am: a2810b8

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

Change-Id: I4b5003f5479283739817746375de0048128cf8fb
 2016-04-06 09:38:58 +00: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
Sanket Agarwal
c051e25d6a Merge "PBAP Pairing Permission" into nyc-dev am: e5b8ec0 
am: 4c74ed33

* commit '4c74ed3318a11b9ea6754795188093eee85779f1':
  PBAP Pairing Permission

Change-Id: I3967a917cfa7c82f3cd439fc1fe3ab8e7a896975
 2016-04-05 23:45:17 +00:00
Fyodor Kupolov
702cc477fd Merge "Do not store bitmap into Bundle in onSaveInstanceState" into nyc-dev am: 84948db 
am: e1d9fd8

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

Change-Id: I372cc35b9f653d055ca61bd4bcd0911e651990ff
 2016-04-05 23:45:17 +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
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
e5511d5edf Merge "Add Tron Logging to portion of A11y SUW that lives in Settings. Bug: 27777706" into nyc-dev am: da0e4d3 
am: 51ccf7c

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

Change-Id: I8f56e88b37c78c0443974a268a196b441edeb68a
 2016-04-05 16:57:57 +00: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
Rubin Xu
ef773cfcf9 Merge "Listen on new broadcasts for profile changes." into nyc-dev am: 29e73f2 
am: 04bc35c

* commit '04bc35ca6b5926afcbbde08e4ea99518ae00901e':
  Listen on new broadcasts for profile changes.

Change-Id: If84146ebc3c410d44812cc13d2b5825ed1493f8d
 2016-04-05 15:13:56 +00: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
Udam Saini
4105d0d436 Merge "Adds a multi line preference class." into nyc-dev am: 9a8f009 
am: a837edb

* commit 'a837edb3c66014d1244a9e57be963c1f94b1676a':
  Adds a multi line preference class.

Change-Id: I4114b9206389d3dedfb288a5ee969461ab514d53
 2016-04-04 20:18:16 +00: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
eeca411ed6 Merge "Show fewer filters on notifications page." into nyc-dev am: a003fa5 
am: 41317c6

* commit '41317c639ca45b3e9d49e7b68897a52ca5596a4b':
  Show fewer filters on notifications page.

Change-Id: I601b7ebab89437b9651fee3e5282890b203d844c
 2016-04-04 19:52:28 +00:00
Julia Reynolds
dce90a057f Merge "Fix ringtone persistance after device rotation." into nyc-dev am: cd37e59 
am: 6a165a1

* commit '6a165a1b9d4c2c5ffec0b53ceb4fcaa2a043d6eb':
  Fix ringtone persistance after device rotation.

Change-Id: I92643fbaec82df5d7c8fc8a0e777799440e965b3
 2016-04-04 19:52:28 +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
Jason Monk
9300f59223 Merge "Add moar dividers" into nyc-dev am: da6ae85 
am: ed84c11

* commit 'ed84c11657da0f17176dca77ef1f349aac5baf22':
  Add moar dividers

Change-Id: Ia3ecd5c8ef3f35926684f878ecf94afea6f4f658
 2016-04-04 19:41:05 +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