Commit Graph

26142 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
Nicolas Prevot
195eadc1b0 Merge "Ask the user to unlock the work profile before adding a work account." into nyc-dev
am: 74777cc

* commit '74777ccd90e8b94614ae29beb7a7e1dbadae77f0':
  Ask the user to unlock the work profile before adding a work account.

Change-Id: I2c2eb6a1117e95079ac3923368d7715e90457880
2016-04-07 09:30:19 +00:00
Nicolas Prévot
74777ccd90 Merge "Ask the user to unlock the work profile before adding a work account." into nyc-dev 2016-04-07 09:23:19 +00:00
Ryoji Miyazaki
0e90766a5f Merge "Fix user photo popup layout for RTL" into nyc-dev
am: 90b71c6

* commit '90b71c644de6b207fdd420893620214664dc4b44':
  Fix user photo popup layout for RTL

Change-Id: Iebb04501346887829d608b7ad38e78186d03fd10
2016-04-07 01:02:49 +00:00
Suprabh Shukla
90b71c644d Merge "Fix user photo popup layout for RTL" into nyc-dev 2016-04-07 00:56:04 +00:00
Amith Yamasani
3c51422067 Merge "Fix user photo popup layout for RTL" am: 6186414
am: d0d0af8

* commit 'd0d0af817c015f9fee73d445bb7881a9ce9112a2':
  Fix user photo popup layout for RTL

Change-Id: Ibe95cb653b9dcce0489abb6187448464083e224d
2016-04-07 00:53:05 +00:00
Ryoji Miyazaki
d0d0af817c Merge "Fix user photo popup layout for RTL"
am: 6186414

* commit '6186414be83ac8b0b92ebe566ca3282dfbc4127a':
  Fix user photo popup layout for RTL

Change-Id: Iebf266aa4948a2d24a55ba3876f2e15d085b7112
2016-04-07 00:50:21 +00:00
Amith Yamasani
6186414be8 Merge "Fix user photo popup layout for RTL" 2016-04-07 00:44:06 +00:00
Ryoji Miyazaki
9238e50a80 Fix user photo popup layout for RTL
When RTL language is set, the edit-photo popup window
on user profile info is not shown fully.
The popup window should be aligned with the anchor.
Cherrypick of https://android-review.googlesource.com/#/c/207762/

Bug: 27955356
Change-Id: Ia928c99fbfff3596b048cc3949aef6d03594fed7
2016-04-06 17:24:16 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
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
72304b5edd Merge "Update data saver icon" into nyc-dev 2016-04-05 16:38:38 +00:00