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
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
050ead07be
Import translations. DO NOT MERGE
...
am: 2f26075
2016-04-09 14:11:35 +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
Jason Monk
14b6f12aea
Merge "Settings tweaks" into nyc-dev
...
am: db3fcfb
2016-04-09 00:32:15 +00:00
Suprabh Shukla
d83867c551
Merge "Moving HelpUtils to SettingsLib" into nyc-dev
...
am: 1d464b9
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
Suprabh Shukla
1d464b9677
Merge "Moving HelpUtils to SettingsLib" into nyc-dev
2016-04-08 19:31:37 +00: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
b8bce66c02
Merge "Restore the premiume SMS Preference." into nyc-dev
2016-04-08 17:04:43 +00:00
Jason Monk
ea35f87377
Restore the premiume SMS Preference.
...
Fixes: 27657256
Change-Id: I396eb9ba71f51fed517d7f958873369bc0ab011e
2016-04-08 13:02:48 -04:00
Victor Chang
0b4846e808
TrustedCredentialsSettings should be launched in personal user instead of work user
...
am: 37afa28
2016-04-08 15:57:44 +00:00
Daniel U
957ec6aee4
Merge "Allow user to hide sensitive notifications with no work challenge" into nyc-dev
...
am: 9f4ad67
2016-04-08 15:51:13 +00:00
Abodunrinwa Toki
186d97bbab
Merge "Input settings: Show keyboard layout collection." into nyc-dev
...
am: f103d10
2016-04-08 15:51:12 +00:00
Victor Chang
37afa286f9
TrustedCredentialsSettings should be launched in personal user instead of work user
...
Bug: 18224038
Change-Id: I861a0b98b4b7f0792332b980c1c8e080864b4d57
2016-04-08 15:48:04 +00:00
Daniel U
9f4ad67fad
Merge "Allow user to hide sensitive notifications with no work challenge" into nyc-dev
2016-04-08 15:44:44 +00:00
Abodunrinwa Toki
f103d10861
Merge "Input settings: Show keyboard layout collection." into nyc-dev
2016-04-08 15:43:13 +00:00
Abodunrinwa Toki
f6053d1536
Input settings: Show keyboard layout collection.
...
E.g. Android keyboard or Nexus Compat keyboard.
Bug: 27250977
Change-Id: Icd256a760b157418f52046f10ca272561b692838
2016-04-08 14:08:56 +01:00
Robin Lee
c6696f1c86
Merge "Credential storage: check lock quality for right user" into nyc-dev
...
am: 16b4ac8
2016-04-08 10:58:34 +00:00
Robin Lee
16b4ac8a8e
Merge "Credential storage: check lock quality for right user" into nyc-dev
2016-04-08 10:53:23 +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
Ruben Brunk
3f32a9ff10
Merge "Fix Settings activity typo." into nyc-dev
...
am: 77359ad
2016-04-08 05:18:52 +00:00
Ruben Brunk
77359ad761
Merge "Fix Settings activity typo." into nyc-dev
2016-04-08 05:13:18 +00:00
Ruben Brunk
c461d5c03d
Fix Settings activity typo.
...
Bug=28078304
Change-Id: I2744314bbd97b1c330baa53a07534c461dab3c0f
2016-04-07 22:08:09 -07:00
Toni Barzic
513bdfd052
Teach settings about PASSWORD_QUALITY_MANAGED constant
...
am: e7d6e4d
2016-04-07 23:21:17 +00: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
Ricky Wai
0a18f9d94c
Fix work profile screen timeout policy
...
am: 36cce83
2016-04-07 16:30:20 +00:00
Ricky Wai
36cce830b9
Fix work profile screen timeout policy
...
Settings screen should apply both primary and managed maximum
timeout policy, even separate profile challenge is enabled.
Bug: 27493348
Change-Id: I09e815d6c6ae6ecd554316cfac82daf0ad0b0cdf
2016-04-07 17:18:04 +01:00
Ricky Wai
d82f072e0c
Delete all work fingerprints when unified lock changes to None/Swipe
...
am: 751de37
2016-04-07 15:53:08 +00:00
Ricky Wai
751de37275
Delete all work fingerprints when unified lock changes to None/Swipe
...
Bug: 27551139
Change-Id: I64105621057e04be0e4d8073626ac3ed0f1e72d2
2016-04-07 15:41:18 +00:00
Ricky Wai
e9da44277d
Fingerprint should confirm device lock when unified
...
am: 996d0df
2016-04-07 15:39:00 +00:00
Ricky Wai
996d0dfa6e
Fingerprint should confirm device lock when unified
...
When unified and adding a fingerprint, the user is prompted to set up
a backup
Bug:27419438
Change-Id: I6cfa8c276ae69a0af51580be390c3da4e9596874
2016-04-07 15:11:14 +00:00
Ricky Wai
3c6e0008d6
Keymaster init for work profile
...
am: 4bbf065
2016-04-07 14:38:22 +00:00
Ricky Wai
4bbf0653c0
Keymaster init for work profile
...
Changes:
(1) When unified work challenge is enabled and screen lock is secure
- Store work profile secure key in primary profile
- When primary user keystore unlocked, unlock work profile keystore
- When primary user change lock to none, remove work secure key
(2) When unified work challenge is enabled but screen lock is not secure
- When screen lock changes to secure, store work secure key in primary
(3) When user changes work challenge from unified to separated
- Remove work secure key in primary
(4) When user changes work challenge from separate to unified
- Do (1) and (2)
Bug: 27460698
Change-Id: Id7464c178e6ea7b561643477e7cd84f963048c87
2016-04-07 14:23:55 +00:00
Robin Lee
330c2052ec
Credential storage: check lock quality for right user
...
Checking the wrong user can lead to an infinite loop when trying to
install credentials from a managed profile.
Bug: 28043334
Change-Id: I3e1044069f0d5139a47de461996a6d98e0fe5e2f
2016-04-07 14:55:06 +01:00
Robin Lee
73925bfe54
Merge "Guard double-showing of user credentials dialog" into nyc-dev
...
am: 1dea763
2016-04-07 13:40:21 +00:00
Robin Lee
1dea763d05
Merge "Guard double-showing of user credentials dialog" into nyc-dev
2016-04-07 13:32:53 +00:00
Robin Lee
f8e2dbf2d2
Guard double-showing of user credentials dialog
...
Only create & show the dialogfragment if it does not already exist.
Bug: 28058930
Change-Id: Ia48cc8a5fd60a12c3beb6c9263036a449cf8d67c
2016-04-07 13:20:21 +01: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
Nicolas Prevot
195eadc1b0
Merge "Ask the user to unlock the work profile before adding a work account." into nyc-dev
...
am: 74777cc
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
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
2016-04-07 00:53:05 +00:00
