PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,261 Commits 1 Branch 0 Tags
b0d54ca66083e945d0b51a3801e36873dd24c466
Commit Graph

10053 Commits

Author SHA1 Message Date
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
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
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
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
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
4145fb96d4 Update data saver icon 
Change-Id: I9ffd81224da2601a9c4618da04a058da1c08d38e
Fixes: 28004364
 2016-04-05 12:36:24 -04: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
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
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
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
Jason Monk
3676b931d9 Add moar dividers 
Bug: 27834471
Change-Id: I575040edcdf76124f21a667e64762acb86a65cb2
 2016-04-04 13:20:59 -04:00
Julia Reynolds
5360308d18 Merge "Lowercase s." into nyc-dev am: b24cfaf 
am: cf61f2e

* commit 'cf61f2e160b8463474f6978e8a0bcf2b53bd8e13':
  Lowercase s.

Change-Id: I6e3efc44b140b2a5828bdb1dd0bdf2fd0af7f8e7
 2016-04-04 14:00:23 +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
Julia Reynolds
b24cfafd1d Merge "Lowercase s." into nyc-dev 2016-04-04 13:52:27 +00:00
Clara Bayarri
234f737610 Merge "Remove fullstop at end of phrases" into nyc-dev am: bd5eb13 
am: 4b91148

* commit '4b91148b3d2d3126cb5463f4401d651af7f0206f':
  Remove fullstop at end of phrases

Change-Id: I22eb5096a610569007e09fe5b7f3e96fdfe5c2af
 2016-04-04 12:28:06 +00:00
Clara Bayarri
4b91148b3d Merge "Remove fullstop at end of phrases" into nyc-dev 
am: bd5eb13

* commit 'bd5eb1331ecc741bae84b1d1093c5102877f36b9':
  Remove fullstop at end of phrases

Change-Id: I79391dfad9814397dc6276ffb70042ba67a0543a
 2016-04-04 12:24:46 +00:00
Clara Bayarri
bd5eb1331e Merge "Remove fullstop at end of phrases" into nyc-dev 2016-04-04 12:17:00 +00:00
Jeff Sharkey
a6ea5a4bdc Merge "Mark UI components for tests to find." into nyc-dev am: 9069181 
am: 6cd645a

* commit '6cd645a4879c58fb19a1a9713088c31c652e7b35':
  Mark UI components for tests to find.

Change-Id: I8f0075afaccbcf7ec718bc09c847eb3e23860b27
 2016-04-03 04:14:27 +00:00
Jeff Sharkey
6cd645a487 Merge "Mark UI components for tests to find." into nyc-dev 
am: 9069181

* commit '9069181c847168896c6fac97e8869944c97f0f2e':
  Mark UI components for tests to find.

Change-Id: Ie822df10d4a0c64727f46a29fbb6e07e366de702
 2016-04-03 04:09:00 +00:00
Jeff Sharkey
9069181c84 Merge "Mark UI components for tests to find." into nyc-dev 2016-04-03 03:59:21 +00:00
Jeff Sharkey
a77652fea9 Mark UI components for tests to find. 
Bug: 26498834
Change-Id: Id8ade0b9230a946c7facf8ebaf9700c196b31ee3
 2016-04-01 23:18:11 -06:00
Anna Galusza
16d58e78df Add Tron Logging to portion of A11y SUW that lives in Settings. 
Bug: 27777706

Change-Id: I0c0f0f1c30ba5b1d40bc4e74faadacbdb93dbc51
 2016-04-01 14:34:17 -07:00
Udam Saini
a2a73452a9 Increase string char limit. 
This string wraps around when shown in setup wizard, so this should be
safe.

bug:27942672
Change-Id: Id1ef964b90ddc2ebb127351176afa19a96fe977e
 2016-04-01 14:25:01 -07:00
Rachel Zhang
12b2261033 Merge "Add suggestion carousel view and dependencies to settings" 2016-04-01 17:35:47 +00:00
Alan Viverette
26753d7106 Use normal button style for Clear data / cache buttons 
Bug: 27967106
Change-Id: I251edc122a74c69e8174b8467c36c28ca47aa853
 2016-04-01 12:26:11 -04:00
Fan Zhang
e5287f10ce Merge "Add an empty status fragment for status and suggestions." 2016-04-01 16:08:48 +00:00