Maurice Lam
f312bd68da
Merge "Update fingerprint strings during setup" into nyc-dev
...
am: a01e2b9
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
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
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
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
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
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
Clara Bayarri
ea8772a9c3
Add Keyboard Shortcuts Helper entry in Settings
...
Bug: 27811273
Change-Id: Ic4a97c869d6476bf427e41023dc595b39589e6ce
2016-04-06 14:55:49 +01:00
Jason Monk
51970c8558
Merge "Add dev options to set swXdp" into nyc-dev
...
am: b22dd20
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
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
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
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
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
Suprabh Shukla
b84720c075
Moving HelpUtils to SettingsLib
...
Moved HelpUtils to SettingsLib in frameworks/base so it can be shared by
packageinstaller as well.
Bug: b/22096093
Change-Id: I8d620abcde8279a3b4d11bbcff8ae9b6f46a1895
2016-04-05 14:37:33 -07: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
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
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
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
04bc35ca6b
Merge "Listen on new broadcasts for profile changes." into nyc-dev
...
am: 29e73f2
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
Jason Monk
cd79f40583
Merge "Fix end padding of summary text for dialog is too narrow" am: dc07c29
...
am: 69960b8
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
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
e70198d278
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 196c7f7
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
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
2016-04-04 20:13:44 +00:00
