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
* commit '232302ef30ea47d19b635ea9839ed83eccb864b1':
Add Keyboard Shortcuts Helper entry in Settings
Change-Id: Iff3367c55d8d92b25328224599cad9e445a6ab48
2016-04-11 10:05:55 +00:00
Clara Bayarri
232302ef30
Merge "Add Keyboard Shortcuts Helper entry in Settings" into nyc-dev
...
am: 6599660
* commit '659966019601b64fecd24a80d549b8d870059435':
Add Keyboard Shortcuts Helper entry in Settings
Change-Id: I99dd51ef8dfdb80a59e003f332988b298e20152c
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
* commit '5eff28a5cfce5c7c29a367c4a9885514088d8a41':
Shorten title name so as not to hit char limit.
Change-Id: Id00e95153de7464c8fcbf7adae9dd2009d1b1f98
2016-04-10 06:40:36 +00:00
Yohei Yukawa
5eff28a5cf
Shorten title name so as not to hit char limit.
...
am: cf87fd5
* commit 'cf87fd5beda44205a0d87565d2672cf038fbe70e':
Shorten title name so as not to hit char limit.
Change-Id: I849aacf5c30610a8396146b86b65c9ff612ac29d
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
Bug: 27543291
Bug: 27959401
Change-Id: I6e4795f8c4dbe9857d036ca19689e05658aa0640
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
* commit 'db3fcfb7cb652c0afdd093e2ec9f387dc01b7819':
Settings tweaks
Change-Id: Ibc9882219ad819cd516bf3c1ce7ce556b36ad9e6
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
* commit 'b8bce66c02bef58d9df3bdfe0fc4a29da9491296':
Restore the premiume SMS Preference.
Change-Id: Id83745add76b1afba24bf487dab12a66ebe4f0c3
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
Daniel U
6655e1b6f5
Hint user that fingerprint cannot unlock FBE keys
...
Show a hint text to user noting that pattern/PIN/password is
required when decrypting the credential based storage when file
based encryption is turned on.
The hint text is the same as that of the device unlock screen after
device reboot.
Bug: 27964055
Change-Id: I0d5a493bab69eae5ce4742bd07d4851387863cac
2016-04-08 15:23:46 +01:00
Oleksandr Peletskyi
046501fb85
Merge "Improved UX when DISALLOW_SET_WALLPAPER is set." into nyc-dev am: 76a2981
...
am: 717ed0e
* commit '717ed0eed7bf60ed5163b8139bfdf7fc4f8a3072':
Improved UX when DISALLOW_SET_WALLPAPER is set.
Change-Id: I8d712b436c36041f28e3a1d0871b2a3d83a265f3
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
* commit '76a29810c30978b958f953c3248fbd4ef19b5f79':
Improved UX when DISALLOW_SET_WALLPAPER is set.
Change-Id: I354816c172deb4624326128079b50d6de4bf9031
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
* commit '513bdfd0526579d79336341d3bb7150ac53b5f20':
Teach settings about PASSWORD_QUALITY_MANAGED constant
Change-Id: I2d329042ad356c568907336f82d5043d591f89d6
2016-04-07 23:24:56 +00:00
Toni Barzic
513bdfd052
Teach settings about PASSWORD_QUALITY_MANAGED constant
...
am: e7d6e4d
* commit 'e7d6e4ddb2371dc49015e17e2d6b9dc604fbbf58':
Teach settings about PASSWORD_QUALITY_MANAGED constant
Change-Id: Iae34431928a38b8bf7de0f59fb0b7bfb306760ff
2016-04-07 23:21:17 +00:00
Fan Zhang
1d090c798f
Merge "Dashboard status cards UI."
2016-04-07 23:10:07 +00:00
Sudheer Shanka
d6807c37dc
Add new section in Apps screen to show app installer name.
...
Bug: 27404193
Change-Id: I589a7618250dc1cd40deb282f0563ea65da62108
2016-04-07 14:10:09 -07: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
* commit 'bea2dd773d40b2bcb5c317ae060b7cd5094e48b3':
Amend icon size for delete work profile dialog
Change-Id: I5f17e6cb394039b4b88de3163edd13223809027e
2016-04-07 09:51:20 +00:00
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
Sudheer Shanka
7d77a335ae
Auto-link web urls in support messages.
...
Fixes: 28019243
Change-Id: Ifc4400cf037286d3cdd6b7ac78cefb58f2af400f
2016-04-06 15:03:58 -07:00
Maurice Lam
87da294262
Merge "Update fingerprint strings during setup" into nyc-dev am: a01e2b9
...
am: f312bd6
* commit 'f312bd68dadd6404c3cd86c614b6e08be7d25797':
Update fingerprint strings during setup
Change-Id: Ieb0f1fd7529754ca0a346cb0cb805fb73d0e2996
2016-04-06 21:41:44 +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
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
* commit '28cc7c12c60a5426ec30b4e8dd67f4d95ef7fcd4':
Use normal button style for Clear data / cache buttons
Change-Id: I89e45d6b52875dd163b7e7993febed2262aefea2
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
* 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
Pankaj Kanwar
fe78760b3d
Merge "Fix problem with message indent. b/25054130" into nyc-dev am: e6924ce
...
am: 37ac1d5
* commit '37ac1d5d46daef83558d2f5b7e7ec8071bf380bc':
Fix problem with message indent. b/25054130
Change-Id: I8c9205264c3402e0ac7a56015fe6a00e3be1b9f2
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
* commit 'e6924ce8caa2177df5819abc2c7c1ebd91077038':
Fix problem with message indent. b/25054130
Change-Id: I8581d1b47ebc5334e8baaca7209644ad3df19fb0
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
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
9964504e51
Merge "Add dev options to set swXdp" into nyc-dev am: b22dd20
...
am: 51970c8
* commit '51970c855812232a9514958dd67959f18749fbe1':
Add dev options to set swXdp
Change-Id: Id25b198c9af3e7b6eca478c3936341096d5edd2e
2016-04-06 13:31:44 +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