Jason Monk
e74ae23269
resolve merge conflicts of 65b5952 to master
...
Change-Id: I0adc036416f21dfa7dd671d4920bce5c26fe7cb6
2016-04-08 13:34:47 -04:00
Jason Monk
65b5952e4c
Merge "Restore the premiume SMS Preference." into nyc-dev
...
am: b8bce66
2016-04-08 17:11:43 +00:00
Jason Monk
ea35f87377
Restore the premiume SMS Preference.
...
Fixes: 27657256
Change-Id: I396eb9ba71f51fed517d7f958873369bc0ab011e
2016-04-08 13:02:48 -04:00
Oleksandr Peletskyi
046501fb85
Merge "Improved UX when DISALLOW_SET_WALLPAPER is set." into nyc-dev am: 76a2981
...
am: 717ed0e
2016-04-08 10:54:27 +00:00
Oleksandr Peletskyi
717ed0eed7
Merge "Improved UX when DISALLOW_SET_WALLPAPER is set." into nyc-dev
...
am: 76a2981
2016-04-08 10:50:23 +00:00
Oleksandr Peletskyi
76a29810c3
Merge "Improved UX when DISALLOW_SET_WALLPAPER is set." into nyc-dev
2016-04-08 10:44:06 +00:00
Oleksandr Peletskyi
c485487ac5
Improved UX when DISALLOW_SET_WALLPAPER is set.
...
Changed type of Settings > Display > Wallpeper menu item
to RestrictedPreference. This allows to show the reason,
why the Wallpaper menu item is blocked.
BUG: 27914814
Change-Id: I6eb23ec9fcaa39bb7e45d020a5aaca0d83cef81f
2016-04-08 11:32:48 +02:00
Toni Barzic
b70e224060
Teach settings about PASSWORD_QUALITY_MANAGED constant am: e7d6e4d
...
am: 513bdfd
2016-04-07 23:24:56 +00:00
Toni Barzic
513bdfd052
Teach settings about PASSWORD_QUALITY_MANAGED constant
...
am: e7d6e4d
2016-04-07 23:21:17 +00:00
Fan Zhang
1d090c798f
Merge "Dashboard status cards UI."
2016-04-07 23:10:07 +00:00
Fan Zhang
d42e233bf0
Dashboard status cards UI.
...
Bug: 27907841
This adds a card view type to display status in Settings dashboard. Also
added necessary pieces to layout status and condition views properly.
The data for status is not wired up yet.
Change-Id: I8ed624177645f389ec0bb71420f073c6dbc03ccb
2016-04-07 13:23:37 -07:00
Toni Barzic
e7d6e4ddb2
Teach settings about PASSWORD_QUALITY_MANAGED constant
...
Add hooks for adding an option for selecting a managed password as
lock credential. By default this option will not be visible.
BUG=27923581
Change-Id: Id17bd8074bf23cbcffb96d8576cc760df6f2298a
2016-04-07 10:44:35 -07:00
Winston Man
6f250236dc
Amend icon size for delete work profile dialog am: 90aec18
...
am: bea2dd7
2016-04-07 09:51:20 +00:00
Winston Man
bea2dd773d
Amend icon size for delete work profile dialog
...
am: 90aec18
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
87da294262
Merge "Update fingerprint strings during setup" into nyc-dev am: a01e2b9
...
am: f312bd6
2016-04-06 21:41:44 +00:00
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
a911917162
Merge "Add a RecyclerView adapter for first tab in settings."
2016-04-06 20:40:28 +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
1c12b99a2f
Merge "Use normal button style for Clear data / cache buttons" into nyc-dev am: b5e2f54
...
am: 28cc7c1
2016-04-06 17:51:20 +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
Pankaj Kanwar
fe78760b3d
Merge "Fix problem with message indent. b/25054130" into nyc-dev am: e6924ce
...
am: 37ac1d5
2016-04-06 17:17:21 +00:00
Fan Zhang
44e7be1289
Add a RecyclerView adapter for first tab in settings.
...
Bug: 27907841
The new adapter eventually will contain: conditionals, status,
suggestions.
Change-Id: I62f9db3db6557b16255ad94e2ce166b3c376e1bb
2016-04-06 10:13:38 -07: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
Bill Yi
8a162396a5
Merge "Import translations. DO NOT MERGE"
2016-04-06 17:02:35 +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
9964504e51
Merge "Add dev options to set swXdp" into nyc-dev am: b22dd20
...
am: 51970c8
2016-04-06 13:31:44 +00: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
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
2016-04-06 11:07:55 +00: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
Oleksandr Peletskyi
28489bbd72
Merge "Block "Screen lock" menu for Work Challenge." into nyc-dev am: 4ffa5c8
...
am: a2810b8
2016-04-06 09:38:58 +00: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
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
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
2016-04-05 16:55:00 +00:00
Jason Monk
e1359b2483
Merge "Update data saver icon" into nyc-dev am: 72304b5
...
am: 80058c6
2016-04-05 16:48:57 +00:00
