PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,602 Commits 1 Branch 0 Tags
046501fb85c6a2c84c594bb8d2fd48a1fca0828f
Commit Graph

26602 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Maurice Lam
1a2c6f464a Update fingerprint strings during setup 
Bug: 28004437
Change-Id: I317437ddaf66158e0d30da6d411d9aa7f498688c
 2016-04-06 12:25:39 -07: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
Alan Viverette
1c12b99a2f Merge "Use normal button style for Clear data / cache buttons" into nyc-dev am: b5e2f54 
am: 28cc7c1

* commit '28cc7c12c60a5426ec30b4e8dd67f4d95ef7fcd4':
  Use normal button style for Clear data / cache buttons

Change-Id: I89e45d6b52875dd163b7e7993febed2262aefea2
 2016-04-06 17:51:20 +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
Alan Viverette
28cc7c12c6 Merge "Use normal button style for Clear data / cache buttons" into nyc-dev 
am: b5e2f54

* commit 'b5e2f54cc3cc07391d28b5e044d7d03389226272':
  Use normal button style for Clear data / cache buttons

Change-Id: Ifaee51792629609924b623461e1b0a91938dc4d5
 2016-04-06 17:45:19 +00:00
Alan Viverette
b5e2f54cc3 Merge "Use normal button style for Clear data / cache buttons" into nyc-dev 2016-04-06 17:36:35 +00:00
Bill Yi
2dc87ed5d6 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 2de9313 -s ours 
am: 5a979a6  -s ours

* commit '5a979a6fd5b7ae333c40ce73cb14da167edad3de':
  Import translations. DO NOT MERGE

Change-Id: Ia7e9646dcc3fa744b596181f74e99b053fd9d2a4
 2016-04-06 17:31:40 +00:00
Bill Yi
5a979a6fd5 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 2de9313  -s ours

* commit '2de9313d2ce487bbf9ebdbdee3cbb040c0bcd711':
  Import translations. DO NOT MERGE

Change-Id: Icfaededc7c12f9ca73b03d37680e589e5ecda14b
 2016-04-06 17:26:18 +00:00
Pankaj Kanwar
fe78760b3d Merge "Fix problem with message indent. b/25054130" into nyc-dev am: e6924ce 
am: 37ac1d5

* commit '37ac1d5d46daef83558d2f5b7e7ec8071bf380bc':
  Fix problem with message indent. b/25054130

Change-Id: I8c9205264c3402e0ac7a56015fe6a00e3be1b9f2
 2016-04-06 17:17:21 +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
Bill Yi
2de9313d2c Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-06 17:10:09 +00:00
pkanwar
37ac1d5d46 Merge "Fix problem with message indent. b/25054130" into nyc-dev 
am: e6924ce

* commit 'e6924ce8caa2177df5819abc2c7c1ebd91077038':
  Fix problem with message indent. b/25054130

Change-Id: I8581d1b47ebc5334e8baaca7209644ad3df19fb0
 2016-04-06 17:08:21 +00: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
Bill Yi
8a162396a5 Merge "Import translations. DO NOT MERGE" 2016-04-06 17:02:35 +00:00
Pankaj Kanwar
e6924ce8ca Merge "Fix problem with message indent. b/25054130" into nyc-dev 2016-04-06 16:58:09 +00:00
pkanwar
0b390884c2 Fix problem with message indent. 
b/25054130

Change-Id: I16327683f970c5b9a23316984e1815227d265c57
 2016-04-06 16:53:20 +00: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
Bill Yi
51c9a0ec71 Import translations. DO NOT MERGE 
Change-Id: I0788997407affde8dcfbcbf0f8476bc9d0d14d56
Auto-generated-cl: translation import
 2016-04-06 05:47:27 -07:00
Bill Yi
fa38369bc2 Import translations. DO NOT MERGE 
Change-Id: I03a1b8b69852dcfd45349cf5f7c0b5e1667df1d1
Auto-generated-cl: translation import
 2016-04-06 05:01:30 -07: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
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
6e4ed3ad11 Merge "Import translations. DO NOT MERGE" into nyc-dev am: e303983 -s ours 
am: 563969c  -s ours

* commit '563969ccc0e34be7d910f4df2220f01fe25d8ad1':
  Import translations. DO NOT MERGE

Change-Id: I749dfd8c6baecc26fc1032288a9df257ac5630db
 2016-04-05 18:54:26 +00: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
e0a22d41b5 Merge "Import translations. DO NOT MERGE" 2016-04-05 18:44:21 +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
Bill Yi
af48419f14 Import translations. DO NOT MERGE 
Change-Id: Iaf5308c137200996a36b389359c88c6c370991b8
Auto-generated-cl: translation import
 2016-04-05 10:39:19 -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