Jason Monk
ce15b1c7ed
Merge "Remove OpenGL traces from dev settings" into nyc-dev am: eeb2a19
...
am: f5f750d
2016-04-11 14:31:38 +00:00
Jason Monk
f5f750d840
Merge "Remove OpenGL traces from dev settings" into nyc-dev
...
am: eeb2a19
2016-04-11 14:26:50 +00:00
Jason Monk
4b32de0d35
Fix localization issues with disabled am: 9e9ba0d
...
am: 22b5064
2016-04-11 14:20:17 +00:00
Jason Monk
eeb2a19a50
Merge "Remove OpenGL traces from dev settings" into nyc-dev
2016-04-11 14:19:55 +00:00
Jason Monk
4572249f5d
Remove OpenGL traces from dev settings
...
Change-Id: I43a23e5e7bf02b798f3ddffdf4c21077ef3d5e2f
Fixes: 26741446
2016-04-11 10:17:53 -04:00
Jason Monk
22b5064424
Fix localization issues with disabled
...
am: 9e9ba0d
2016-04-11 14:14:53 +00:00
Jason Monk
9e9ba0d751
Fix localization issues with disabled
...
Change-Id: Iba63b50000f546a1e323c855462841e82fce4df8
Fixes: 27948378
2016-04-11 09:58:55 -04:00
Jason Monk
19fad2550e
Merge "Settings tweaks"
2016-04-11 13:24:38 +00:00
Jason Monk
c19eb986f3
Settings tweaks
...
Change-Id: I68829fa8e49534d4635a008c94dced3c7ab6f4b1
Fixes: 27834471
Fixes: 27834626
Fixes: 27567838
Fixes: 27834676
2016-04-11 09:21:24 -04:00
Clara Bayarri
99ea9716d5
Merge "Add Keyboard Shortcuts Helper entry in Settings" into nyc-dev am: 6599660
...
am: 232302e
2016-04-11 10:05:55 +00:00
Clara Bayarri
232302ef30
Merge "Add Keyboard Shortcuts Helper entry in Settings" into nyc-dev
...
am: 6599660
2016-04-11 09:55:54 +00:00
Clara Bayarri
6599660196
Merge "Add Keyboard Shortcuts Helper entry in Settings" into nyc-dev
2016-04-11 09:44:20 +00:00
Yohei Yukawa
efa5468c0e
Shorten title name so as not to hit char limit. am: cf87fd5
...
am: 5eff28a
2016-04-10 06:40:36 +00:00
Yohei Yukawa
5eff28a5cf
Shorten title name so as not to hit char limit.
...
am: cf87fd5
2016-04-10 06:36:54 +00:00
Yohei Yukawa
cf87fd5bed
Shorten title name so as not to hit char limit.
...
This is a follow up CL to my previous CL [1], which tried to rename a
settings item "Add virtual keyboard" but ended up with hitting char
limit in many languages. We decided to use "Manage keyboards" instead
so as not to hit char limit.
[1]: Id2ae61519152bbe622aa5915f728a4cbbc49e078
611410a8c4
2016-04-10 06:30:38 +00:00
Bill Yi
2f260757a2
Import translations. DO NOT MERGE
...
Change-Id: I89dec6af8243722e59f53b19ea182dc1357e4f47
Auto-generated-cl: translation import
2016-04-09 06:46:45 -07:00
Bill Yi
e890fab34c
Import translations. DO NOT MERGE
...
Change-Id: Ia44b4686526adde07939fb18f43db0f792832a5f
Auto-generated-cl: translation import
2016-04-09 06:07:07 -07:00
Jason Monk
14b6f12aea
Merge "Settings tweaks" into nyc-dev
...
am: db3fcfb
2016-04-09 00:32:15 +00:00
Jason Monk
db3fcfb7cb
Merge "Settings tweaks" into nyc-dev
2016-04-08 20:46:49 +00:00
Jason Monk
be8d5aa2b9
Settings tweaks
...
Change-Id: I68829fa8e49534d4635a008c94dced3c7ab6f4b1
Fixes: 27834471
Fixes: 27834626
Fixes: 27567838
Fixes: 27834676
2016-04-08 16:44:31 -04:00
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
