Fyodor Kupolov
1b8b3fab3d
Merge "Added getProfileIds method returning array of userIds" into nyc-dev
...
am: 1ef3164
* commit '1ef3164424cf6ac7ab604e9cdf0e1a2c67a7ea89':
Added getProfileIds method returning array of userIds
Change-Id: I2f64e0079fc57d4e51fd222b9e8835d202e84448
2016-04-11 16:50:37 +00:00
Fyodor Kupolov
1ef3164424
Merge "Added getProfileIds method returning array of userIds" into nyc-dev
2016-04-11 16:40:54 +00:00
Chris Wren
6b11a06035
update station to show ranking and autobundles
...
Bug: 26919636
Change-Id: I5f1ce737ca2d06e6706c3248bd09bd40ef36774f
2016-04-11 12:26:50 -04:00
Jason Monk
4a0c449ade
Merge "Pull pref summaries from power usage summary" into nyc-dev
...
am: 3cd935c
* commit '3cd935c89c46cdbbe5556823393045081ef6d844':
Pull pref summaries from power usage summary
Change-Id: Ic512bfb11423a01db290fe941ef8365a53b67d4e
2016-04-11 14:31:38 +00:00
Jason Monk
3cd935c89c
Merge "Pull pref summaries from power usage summary" into nyc-dev
2016-04-11 14:28:23 +00:00
Jason Monk
4fbb0e35e8
Merge "Guard against crash in SummaryProvider" into nyc-dev
...
am: 3095c77
* commit '3095c77d5b28839ff6e757d6c08afd1bd2cd7afa':
Guard against crash in SummaryProvider
Change-Id: I759042100f3b4f21b9056d83b817634f066fae93
2016-04-11 14:26:50 +00:00
Jason Monk
f5f750d840
Merge "Remove OpenGL traces from dev settings" into nyc-dev
...
am: eeb2a19
* commit 'eeb2a19a50c0fa1792ed163b555d0bddf217080f':
Remove OpenGL traces from dev settings
Change-Id: Ia36a2187188f103da55e1066754ef764cc90c341
2016-04-11 14:26:50 +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
22b5064424
Fix localization issues with disabled
...
am: 9e9ba0d
* commit '9e9ba0d75142c7af9d8f7eabb7dfd34ff59e2064':
Fix localization issues with disabled
Change-Id: If37b22b8dd44ad42265227b20c449acc97b06bb4
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
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
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
050ead07be
Import translations. DO NOT MERGE
...
am: 2f26075
-s ours
* commit '2f260757a2cec3f735d7cc175115cc1f6bee8903':
Import translations. DO NOT MERGE
Change-Id: I99a3400ce2b1583832c46b20454fc97ecfb78870
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
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
14b6f12aea
Merge "Settings tweaks" into nyc-dev
...
am: db3fcfb
* commit 'db3fcfb7cb652c0afdd093e2ec9f387dc01b7819':
Settings tweaks
Change-Id: Ibc9882219ad819cd516bf3c1ce7ce556b36ad9e6
2016-04-09 00:32:15 +00:00
Suprabh Shukla
d83867c551
Merge "Moving HelpUtils to SettingsLib" into nyc-dev
...
am: 1d464b9
* commit '1d464b9677c4f956dab81622b2cb59c53cbf01dd':
Moving HelpUtils to SettingsLib
Change-Id: I2b855b36d0f3af29f5bc35008017aa7539cd0677
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
* commit 'b8bce66c02bef58d9df3bdfe0fc4a29da9491296':
Restore the premiume SMS Preference.
Change-Id: Id83745add76b1afba24bf487dab12a66ebe4f0c3
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
* commit '37afa286f926b527c430c312d509eb8ebe7a2593':
TrustedCredentialsSettings should be launched in personal user instead of work user
Change-Id: I85809994177a3c605e3b3ca4e9d57c7996016566
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
* commit '9f4ad67fad34331aecbdabd4a0193038fa0e9f79':
Allow user to hide sensitive notifications with no work challenge
Change-Id: I80943b49439532bdb676825ac9a8ee5bc7088b11
2016-04-08 15:51:13 +00:00
Abodunrinwa Toki
186d97bbab
Merge "Input settings: Show keyboard layout collection." into nyc-dev
...
am: f103d10
* commit 'f103d10861e6a702f8f29d42e48214c94b1ddb91':
Input settings: Show keyboard layout collection.
Change-Id: I813b902c6638befc9dcd7ebd166e8fe9c33731a5
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
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
c6696f1c86
Merge "Credential storage: check lock quality for right user" into nyc-dev
...
am: 16b4ac8
* commit '16b4ac8a8efb7ea06397ff559984c3c08f275398':
Credential storage: check lock quality for right user
Change-Id: Iea518cce08617d5ccfa6d5e43d5a65e377631528
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
* 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
Ruben Brunk
3f32a9ff10
Merge "Fix Settings activity typo." into nyc-dev
...
am: 77359ad
* commit '77359ad76117c3ffc7fe40890f8bbdc8736f143c':
Fix Settings activity typo.
Change-Id: Ie11bb09128fbbedc72252583e0a6a721ef1e17bd
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
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
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
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
0a18f9d94c
Fix work profile screen timeout policy
...
am: 36cce83
* commit '36cce830b9319985b138432b89ea1022acf68785':
Fix work profile screen timeout policy
Change-Id: If444464cd47efd2ced9c7b3d4f99465ab48360ea
2016-04-07 16:30:20 +00:00