Commit Graph

25852 Commits

Author SHA1 Message Date
Jason Monk
3cd935c89c Merge "Pull pref summaries from power usage summary" into nyc-dev 2016-04-11 14:28:23 +00:00
Jason Monk
e04517611f Pull pref summaries from power usage summary
Change-Id: I9bd3d1041576e183e7e5e03aaecc5128ea5227c2
Fixes: 27644604
2016-04-11 10:25:04 -04:00
Jason Monk
3095c77d5b Merge "Guard against crash in SummaryProvider" into nyc-dev 2016-04-11 14:23:37 +00:00
Jason Monk
0127eb07f4 Guard against crash in SummaryProvider
Change-Id: Ieeae65e50211618dbbee3d320cae614ac5926543
Fixes: 26310547
2016-04-11 10:21:28 -04: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
9e9ba0d751 Fix localization issues with disabled
Change-Id: Iba63b50000f546a1e323c855462841e82fce4df8
Fixes: 27948378
2016-04-11 09:58:55 -04: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
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
Alan Viverette
3550a32ca9 Fix EBT helper initialization in LabeledSeekBar class
Helper should have same lifecycle as the class itself. Also rearranges
class to match up with standard Android class organization.

Bug: 27674946
Change-Id: Ib2ab1e367d4ef1757321375bbb7e4c5f0dc8f46c
2016-04-08 18:37:21 -07: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
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
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
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
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
16b4ac8a8e Merge "Credential storage: check lock quality for right user" into nyc-dev 2016-04-08 10:53: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
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
Fyodor Kupolov
4a4af5aec8 Added getProfileIds method returning array of userIds
Previously many usages of UserManager.getProfiles and getEnabledProfiles
were only using ids of returned users. Given that the list of users needs
to be parceled and unparceled for Binder calls, returning array of ids
minimizes memory usage and serialization time.

A new method getProfileIds was introduced which returns an array of userIds.
Existing method calls were updated where appropriate.

Bug: 27705805
Change-Id: Ib042f38d53d95d3b07cda7f824e5cb8c06cd10f5
2016-04-07 16:46:18 -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
Sanket Padawe
e0e651f2e0 Fix UI issue in Sim Settings screen.
+ Preference screen for Sim card selection should be enabled when 1)sim
 count > 1. 2) no default is set for Sms & Data & sim count >= 1

Bug: 27637607
Change-Id: Idb7207316a7bf9aab119ec6568038990623ba514
2016-04-07 09:43:03 -07: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
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
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
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
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
shwetachahar
b804b8ee1b Modify the pitch seekbar range to 25 to 400 in accordance with the pitch
range accepted by the Google Text-to-Speech engine.

Bug: 27871182
Change-Id: Ic6afde8fe6738f9313242beda12bbe4ba14e98bb

	modified:   src/com/android/settings/tts/TextToSpeechSettings.java

	modified:   src/com/android/settings/tts/TextToSpeechSettings.java
2016-04-07 12:26:01 +01: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 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
Suprabh Shukla
90b71c644d Merge "Fix user photo popup layout for RTL" into nyc-dev 2016-04-07 00:56:04 +00:00
Ryoji Miyazaki
9238e50a80 Fix user photo popup layout for RTL
When RTL language is set, the edit-photo popup window
on user profile info is not shown fully.
The popup window should be aligned with the anchor.
Cherrypick of https://android-review.googlesource.com/#/c/207762/

Bug: 27955356
Change-Id: Ia928c99fbfff3596b048cc3949aef6d03594fed7
2016-04-06 17:24:16 -07:00
Andres Morales
20064037a7 Merge "handle devices that don't support FLASH_LOCK_STATE" into nyc-dev 2016-04-07 00:00:38 +00:00
Andres Morales
ce4bdca151 handle devices that don't support FLASH_LOCK_STATE
only disable OEM unlocking pref for devices that report
FLASH_LOCK_UNLOCKED.

Bug: 27967926
Change-Id: Ia41b0dc9249e11df2fb35263ebde05f3a2e0d29a
2016-04-06 15:04:48 -07: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
a01e2b96f6 Merge "Update fingerprint strings during setup" into nyc-dev 2016-04-06 21:34:34 +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
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
b5e2f54cc3 Merge "Use normal button style for Clear data / cache buttons" into nyc-dev 2016-04-06 17:36:35 +00:00
Bill Yi
2de9313d2c Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-06 17:10:09 +00:00