Commit Graph

8699 Commits

Author SHA1 Message Date
Winston Man
bea2dd773d Amend icon size for delete work profile dialog
am: 90aec18

* commit '90aec184b4229afca5cd7ae549b49ae8f93fd1e7':
  Amend icon size for delete work profile dialog

Change-Id: I7ee70923ea575aae530304472acdfd34438bd898
2016-04-07 09:48:20 +00:00
Winston Man
90aec184b4 Amend icon size for delete work profile dialog
Changes are referenced from
https://cs.corp.google.com/android/packages/apps/ManagedProvisioning/res/layout/device_manager_icon_label.xml

Fixed screenshot:
https://screenshot.googleplex.com/01qOjUp0rp8

Bug:27636781

Change-Id: Ib6cf303caa388a8b0d2b7664fd9828a8d2f67098
2016-04-07 09:42:11 +00:00
Maurice Lam
f312bd68da Merge "Update fingerprint strings during setup" into nyc-dev
am: a01e2b9

* commit 'a01e2b96f6c5741e5304e1ae399bbbff32eeaaa4':
  Update fingerprint strings during setup

Change-Id: I1a212f2c1d8e28f6743bfbc38e92f1a9cad723aa
2016-04-06 21:39:29 +00:00
Maurice Lam
a01e2b96f6 Merge "Update fingerprint strings during setup" into nyc-dev 2016-04-06 21:34:34 +00:00
Maurice Lam
1a2c6f464a Update fingerprint strings during setup
Bug: 28004437
Change-Id: I317437ddaf66158e0d30da6d411d9aa7f498688c
2016-04-06 12:25:39 -07: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
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
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
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
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
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
c75d555a33 Import translations. DO NOT MERGE
Change-Id: I9359139bccc9223f079201807385a9b4f531474a
Auto-generated-cl: translation import
2016-04-05 11:25:39 -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
4145fb96d4 Update data saver icon
Change-Id: I9ffd81224da2601a9c4618da04a058da1c08d38e
Fixes: 28004364
2016-04-05 12:36:24 -04: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
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
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
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
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
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
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
Tyler Gunn
d5eb67f566 Merge "Adding "wifi only" option for wifi calling." into nyc-dev
am: 00c334c

* commit '00c334ccba341761af448805ddfc842394f3dfbb':
  Adding "wifi only" option for wifi calling.

Change-Id: I7766c8b09b3713fa75c72838f7136bd8dc32b332
2016-04-01 15:58:41 +00:00
Tyler Gunn
00c334ccba Merge "Adding "wifi only" option for wifi calling." into nyc-dev 2016-04-01 15:43:08 +00:00
Tyler Gunn
2013ba8ed1 Adding "wifi only" option for wifi calling.
- Added "wifi-only" option to the list of wifi calling modes.
- Added code in settings initialization to check whether the carrier
supports including the wifi-only option.  If it does not, changes the
entries/values to a ser which does not include the wifi-only option.

Bug: 27858149
Change-Id: Ib02a97afcf6f2722c28b7a4d9c241774944c52d0
2016-04-01 08:41:18 -07:00
Julia Reynolds
96ddca3519 Lowercase s.
Bug: 27853578
Change-Id: I1c0b3a7fc00ba4f5e8330885213d641aec9518f7
2016-04-01 10:53:10 -04:00
Clara Bayarri
3cb2511166 Remove fullstop at end of phrases
Requested by UX

Bug: 27913794
Change-Id: Ieb6ace1236787128825e39c310331603f574a32b
2016-04-01 12:39:35 +01:00
Clara Bayarri
dfae1467ea Merge "Change Work Challenge background image" into nyc-dev
am: 63096e9

* commit '63096e965c1ff95b8b7eed53388aa00014500381':
  Change Work Challenge background image

Change-Id: Ib2b87c666fe73da24de6f375c74505f4b3498e21
2016-04-01 11:27:42 +00:00