PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,525 Commits 1 Branch 0 Tags
9964504e51de71d93a9aa35b2d965cc9ac25d66c
Commit Graph

26525 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Jason Monk
e1359b2483 Merge "Update data saver icon" into nyc-dev am: 72304b5 
am: 80058c6

* commit '80058c6f3a317f46a57cad7ecc97dd7f3d489deb':
  Update data saver icon

Change-Id: I4f18f9d9aa2e86ccca04c3d5e4cd8e014b626003
 2016-04-05 16:48:57 +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
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
Qi Ding
519ca78639 Merge "Fix end padding of summary text for dialog is too narrow" am: dc07c29 am: 69960b8 
am: cd79f40

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

Change-Id: I6f112eb356cc3bf28bd9abff134e317c3cceced9
 2016-04-05 14:41:44 +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
fa7aa422e6 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 196c7f7 -s ours 
am: e70198d  -s ours

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

Change-Id: Idf59d4afa4a8dfde76d6b0aa51ceffd0eeac7f84
 2016-04-05 03:34:22 +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
Bill Yi
8dea99bb1e Merge "Import translations. DO NOT MERGE" 2016-04-05 03:22:02 +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
Bill Yi
74e731f34e Import translations. DO NOT MERGE 
Change-Id: I344146b41edaf6d5a98c0159ab4f07e717e077b6
Auto-generated-cl: translation import
 2016-04-04 17:26:33 -07: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