OSDN Git Service
Ricky Wai [Tue, 12 Apr 2016 17:16:23 +0000 (17:16 +0000)]
Merge "Do not update unified setting before updating primary profile lock" into nyc-dev am:
8e91558
am:
16d93fb
* commit '
16d93fbae43639ae421045b4fcbcc650fec02865':
Do not update unified setting before updating primary profile lock
Change-Id: I99b287d03411311d807d739e529813d80dd82adc
Ricky Wai [Tue, 12 Apr 2016 17:11:05 +0000 (17:11 +0000)]
Merge "Do not update unified setting before updating primary profile lock" into nyc-dev
am:
8e91558
* commit '
8e91558c0a70a042e0fcbabb8e9c536c9f23b47f':
Do not update unified setting before updating primary profile lock
Change-Id: Ibd55f7cd0bfce0361494246d3c9ba7cb0f3d0f5d
Ricky Wai [Tue, 12 Apr 2016 16:57:03 +0000 (16:57 +0000)]
Merge "Do not update unified setting before updating primary profile lock" into nyc-dev
Jason Monk [Tue, 12 Apr 2016 16:56:21 +0000 (16:56 +0000)]
Merge "Fix switchbar margin" into nyc-dev am:
eb72900
am:
6e7b095
* commit '
6e7b09561f7019b4684f55c26fa075180f882bfe':
Fix switchbar margin
Change-Id: Id711bb8464fe556af06d2d3e79cb48162e248351
Jason Monk [Tue, 12 Apr 2016 16:56:21 +0000 (16:56 +0000)]
Merge "Settings dashboard performance work" into nyc-dev am:
36ac2a1
am:
fb60f61
* commit '
fb60f61b56647dadaaf5035b8610c48e7ce44a4b':
Settings dashboard performance work
Change-Id: I26686589f1a4fe07dc32541fe67751e6c1f07345
Jason Monk [Tue, 12 Apr 2016 16:50:32 +0000 (16:50 +0000)]
Merge "Fix switchbar margin" into nyc-dev
am:
eb72900
* commit '
eb7290055c377cf9f6136cc609646c0f897587a2':
Fix switchbar margin
Change-Id: I45abaf3127a7402d473389ece8cba0a12b690605
Jason Monk [Tue, 12 Apr 2016 16:50:32 +0000 (16:50 +0000)]
Merge "Settings dashboard performance work" into nyc-dev
am:
36ac2a1
* commit '
36ac2a1eab550a69b787ab1df0ab5e11aa6c4687':
Settings dashboard performance work
Change-Id: Ie777a3437797b17abf1627298f37af0054e785e3
Jason Monk [Tue, 12 Apr 2016 16:38:08 +0000 (16:38 +0000)]
Merge "Fix switchbar margin" into nyc-dev
Jason Monk [Tue, 12 Apr 2016 16:35:43 +0000 (16:35 +0000)]
Merge "Settings dashboard performance work" into nyc-dev
Jason Monk [Tue, 12 Apr 2016 16:35:01 +0000 (12:35 -0400)]
Fix switchbar margin
All screens have an up arrow or a drawer icon so the switchbar should
always have the subsettings margin.
Change-Id: If016dc718612d1a26c4e01a5e3f6c8f2f88c6fc1
Fixes:
27599891
Ricky Wai [Tue, 12 Apr 2016 16:34:59 +0000 (17:34 +0100)]
Do not update unified setting before updating primary profile lock
Bug:
28135945
Change-Id: Ib6332f42d3b6416d8fd08d5f829bf9852fa0e9f0
Sanket Padawe [Tue, 12 Apr 2016 16:12:01 +0000 (16:12 +0000)]
Merge "Fix UI issue in Sim Settings screen." into nyc-dev am:
348a5c4
am:
5f16c14d
* commit '
5f16c14d155be9021832a06df1824a9d29634649':
Fix UI issue in Sim Settings screen.
Change-Id: Ie9abbc180601acde2f6e8102358bccb397a93314
Sanket Padawe [Tue, 12 Apr 2016 16:06:27 +0000 (16:06 +0000)]
Merge "Fix UI issue in Sim Settings screen." into nyc-dev
am:
348a5c4
* commit '
348a5c4c35038dd138c94e2c8f629da4e71dcd9d':
Fix UI issue in Sim Settings screen.
Change-Id: I1c8567506e93e2ab0476da680b7a482c80f6b818
Sanket Padawe [Tue, 12 Apr 2016 15:58:06 +0000 (15:58 +0000)]
Merge "Fix UI issue in Sim Settings screen." into nyc-dev
Jason Monk [Tue, 12 Apr 2016 14:32:20 +0000 (10:32 -0400)]
Settings dashboard performance work
- Don't block main thread with rebuild work
- Don't run rebuild as foreground priority
- Don't use comparator on apps/notifications summaries, we don't
care about order
- Simplify dashboard item layout
Change-Id: I33bdd06a234ea308b44b45cac5ed1e9eac1c7d43
Fixes:
26541310
Ricky Wai [Tue, 12 Apr 2016 11:20:54 +0000 (11:20 +0000)]
Merge "Hint user that fingerprint cannot unlock FBE keys" into nyc-dev am:
2f99770
am:
a62dd8b
* commit '
a62dd8b1d116ca0f17a33551480f8173e1ff9b31':
Hint user that fingerprint cannot unlock FBE keys
Change-Id: I1fbf61bd752ace0b52b3de4e8f9f5945a6b3aa21
Daniel U [Tue, 12 Apr 2016 11:15:24 +0000 (11:15 +0000)]
Merge "Hint user that fingerprint cannot unlock FBE keys" into nyc-dev
am:
2f99770
* commit '
2f99770cc178011de27813398364da20283fce47':
Hint user that fingerprint cannot unlock FBE keys
Change-Id: I74e902c396a54b0bee8886c93eaeb30abdde54c9
Ricky Wai [Tue, 12 Apr 2016 11:06:25 +0000 (11:06 +0000)]
Merge "Hint user that fingerprint cannot unlock FBE keys" into nyc-dev
Nathan Harold [Tue, 12 Apr 2016 01:19:23 +0000 (01:19 +0000)]
Cleanup RadioInfo Test Menu am:
2b77d74
am:
262b404
* commit '
262b404cf9d6c3360439ec2a1b9a153db8ac4a16':
Cleanup RadioInfo Test Menu
Change-Id: I343d6654b9a1b923d383d34a4aca6773012e4700
Nathan Harold [Tue, 12 Apr 2016 01:14:23 +0000 (01:14 +0000)]
Cleanup RadioInfo Test Menu
am:
2b77d74
* commit '
2b77d7460ccebd97826529f186596df14050f0ae':
Cleanup RadioInfo Test Menu
Change-Id: I63f6638893e60e0eef75396d3bee0d8bf223cff1
Nathan Harold [Sat, 19 Mar 2016 20:22:10 +0000 (13:22 -0700)]
Cleanup RadioInfo Test Menu
-Convert multi-mode buttons to toggle switches to reduce
confusion.
-Remove long-deprecated PhoneStateIntentReceiver references
and convert all functions to use PhoneStateListener
-Remove vestigial menu items that no longer reference working
system properties or code
-Add new ARFCN/UARFCN/EARFCN fields to CellInfo Display
-Convert CellInfoListRate to a Dropdown menu
-Fixed bugs with screen rotation that caused network preferences
to change (and could crash the radio)
-Fixed bugs related to onResume not updating values correctly
-Re-ordered menu items to group like-items together
-Minor string edits for clarity, correctness, and consistency
Change-Id: Ied5ed7a250682ee3327e51884d80ee4f3a7eb913
Fan Zhang [Mon, 11 Apr 2016 20:45:15 +0000 (20:45 +0000)]
Merge changes from topic 'revert_noe_status'
* changes:
Revert "Add suggestion carousel view and dependencies to settings"
Remove DashboardStatusFragment and hide sliding tab layout.
Revert "Add a RecyclerView adapter for first tab in settings."
Revert "Dashboard status cards UI."
Jason Monk [Mon, 11 Apr 2016 19:11:46 +0000 (19:11 +0000)]
Merge "Fix battery history details" into nyc-dev am:
43fa74b
am:
9eeb3f3
* commit '
9eeb3f3d2d7892ca540ae6dc9567d1816dcf0613':
Fix battery history details
Change-Id: I3c3bf2755ca8d7e2cca0cbf3277d1d515c8c072e
Jason Monk [Mon, 11 Apr 2016 19:06:55 +0000 (19:06 +0000)]
Merge "Fix battery history details" into nyc-dev
am:
43fa74b
* commit '
43fa74b9fdaf8398d0c1498311b307fbfea135a0':
Fix battery history details
Change-Id: I57cc3e650cb9b1d0ff0d786dc6e27179d27107bb
Jason Monk [Mon, 11 Apr 2016 18:58:25 +0000 (18:58 +0000)]
Merge "Fix battery history details" into nyc-dev
Jason Monk [Mon, 11 Apr 2016 18:55:34 +0000 (14:55 -0400)]
Fix battery history details
Change-Id: Ibf73d28d227574cba0866accdf7c9dc810b24906
Fixes:
27844566
Alan Viverette [Mon, 11 Apr 2016 18:52:26 +0000 (18:52 +0000)]
Merge "Fix EBT helper initialization in LabeledSeekBar class" into nyc-dev am:
6a0b722
am:
50528a4
* commit '
50528a4e0011310293343b05781ee4dca0006e09':
Fix EBT helper initialization in LabeledSeekBar class
Change-Id: Iea75763062ef6b439457bfe9de9f507e738babd4
Alan Viverette [Mon, 11 Apr 2016 18:48:44 +0000 (18:48 +0000)]
Merge "Fix EBT helper initialization in LabeledSeekBar class" into nyc-dev
am:
6a0b722
* commit '
6a0b7229847c6b2afb2a83aa397d23ec36a1df5b':
Fix EBT helper initialization in LabeledSeekBar class
Change-Id: I8e400e00a4a064dc33f575223a29b01165c1b54a
Alan Viverette [Mon, 11 Apr 2016 18:32:22 +0000 (18:32 +0000)]
Merge "Fix EBT helper initialization in LabeledSeekBar class" into nyc-dev
Fyodor Kupolov [Mon, 11 Apr 2016 17:03:16 +0000 (17:03 +0000)]
Merge "Added getProfileIds method returning array of userIds" into nyc-dev am:
1ef3164
am:
1b8b3fa
* commit '
1b8b3fab3ddc71bc1567f8e260d7f0082924e5e5':
Added getProfileIds method returning array of userIds
Change-Id: I5bf3d7d6d19c73518b63f612a7d1b66880db0535
Fan Zhang [Mon, 11 Apr 2016 16:25:04 +0000 (16:25 +0000)]
Revert "Add suggestion carousel view and dependencies to settings"
This reverts commit
0050ac0bb759d15539c7551ea6149e521ad0cc08.
Change-Id: Ic61137bae0fa1a6de5ba4970e8a3a3b4fe0469a3
Fan Zhang [Mon, 11 Apr 2016 16:17:57 +0000 (09:17 -0700)]
Remove DashboardStatusFragment and hide sliding tab layout.
Bug:
28090184
Change-Id: I34ff46d0f5ba87c824d1484f1018fad154696e15
Fyodor Kupolov [Mon, 11 Apr 2016 16:50:37 +0000 (16:50 +0000)]
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
Fyodor Kupolov [Mon, 11 Apr 2016 16:40:54 +0000 (16:40 +0000)]
Merge "Added getProfileIds method returning array of userIds" into nyc-dev
Fan Zhang [Mon, 11 Apr 2016 16:09:39 +0000 (16:09 +0000)]
Revert "Add a RecyclerView adapter for first tab in settings."
This reverts commit
44e7be1289d99b4d6720bbd9ac82d23671ea7b69.
Change-Id: I1391f41a19526ebd02a0c06e628fb1e18d454a71
Fan Zhang [Mon, 11 Apr 2016 15:26:54 +0000 (15:26 +0000)]
Revert "Dashboard status cards UI."
This reverts commit
d42e233bf0e5132cc1592fe9932532474e3fb84b.
Change-Id: I58b4bcb2e153da26fb043bff2ce58d2c474b567b
Jason Monk [Mon, 11 Apr 2016 14:32:32 +0000 (14:32 +0000)]
Merge "Pull pref summaries from power usage summary" into nyc-dev am:
3cd935c
am:
4a0c449
* commit '
4a0c449ade858a12f18fb03d14115852067a4403':
Pull pref summaries from power usage summary
Change-Id: I80f9ee746cabf2c3ad9dcfd441fa37d6590963ea
Jason Monk [Mon, 11 Apr 2016 14:31:39 +0000 (14:31 +0000)]
Merge "Guard against crash in SummaryProvider" into nyc-dev am:
3095c77
am:
4fbb0e3
* commit '
4fbb0e35e8a44b23b4f9a95ccdfb5e094c663f5c':
Guard against crash in SummaryProvider
Change-Id: I8223bac4b7d8cf17f4cd4a47c479c2c2b95160e7
Jason Monk [Mon, 11 Apr 2016 14:31:38 +0000 (14:31 +0000)]
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
Jason Monk [Mon, 11 Apr 2016 14:31:38 +0000 (14:31 +0000)]
Merge "Remove OpenGL traces from dev settings" into nyc-dev am:
eeb2a19
am:
f5f750d
* commit '
f5f750d840933e4244711345cb78b67bcf9c5e61':
Remove OpenGL traces from dev settings
Change-Id: I9971817d3f2052c0c06f4997a4b5a817e70dd864
Jason Monk [Mon, 11 Apr 2016 14:28:23 +0000 (14:28 +0000)]
Merge "Pull pref summaries from power usage summary" into nyc-dev
Jason Monk [Mon, 11 Apr 2016 14:26:50 +0000 (14:26 +0000)]
Merge "Guard against crash in SummaryProvider" into nyc-dev
am:
3095c77
* commit '
3095c77d5b28839ff6e757d6c08afd1bd2cd7afa':
Guard against crash in SummaryProvider
Change-Id: I759042100f3b4f21b9056d83b817634f066fae93
Jason Monk [Mon, 11 Apr 2016 14:26:50 +0000 (14:26 +0000)]
Merge "Remove OpenGL traces from dev settings" into nyc-dev
am:
eeb2a19
* commit '
eeb2a19a50c0fa1792ed163b555d0bddf217080f':
Remove OpenGL traces from dev settings
Change-Id: Ia36a2187188f103da55e1066754ef764cc90c341
Jason Monk [Mon, 11 Apr 2016 14:25:04 +0000 (10:25 -0400)]
Pull pref summaries from power usage summary
Change-Id: I9bd3d1041576e183e7e5e03aaecc5128ea5227c2
Fixes:
27644604
Jason Monk [Mon, 11 Apr 2016 14:23:36 +0000 (14:23 +0000)]
Merge "Guard against crash in SummaryProvider" into nyc-dev
Jason Monk [Mon, 11 Apr 2016 14:21:28 +0000 (10:21 -0400)]
Guard against crash in SummaryProvider
Change-Id: Ieeae65e50211618dbbee3d320cae614ac5926543
Fixes:
26310547
Jason Monk [Mon, 11 Apr 2016 14:20:17 +0000 (14:20 +0000)]
Fix localization issues with disabled am:
9e9ba0d
am:
22b5064
* commit '
22b5064424547daf4cdda5d106aa559539e89c23':
Fix localization issues with disabled
Change-Id: I958dffd6f1c8370d5408b811a804411095a9eb74
Jason Monk [Mon, 11 Apr 2016 14:19:55 +0000 (14:19 +0000)]
Merge "Remove OpenGL traces from dev settings" into nyc-dev
Jason Monk [Mon, 11 Apr 2016 14:17:53 +0000 (10:17 -0400)]
Remove OpenGL traces from dev settings
Change-Id: I43a23e5e7bf02b798f3ddffdf4c21077ef3d5e2f
Fixes:
26741446
Jason Monk [Mon, 11 Apr 2016 14:14:53 +0000 (14:14 +0000)]
Fix localization issues with disabled
am:
9e9ba0d
* commit '
9e9ba0d75142c7af9d8f7eabb7dfd34ff59e2064':
Fix localization issues with disabled
Change-Id: If37b22b8dd44ad42265227b20c449acc97b06bb4
Jason Monk [Mon, 11 Apr 2016 13:58:55 +0000 (09:58 -0400)]
Fix localization issues with disabled
Change-Id: Iba63b50000f546a1e323c855462841e82fce4df8
Fixes:
27948378
Jason Monk [Mon, 11 Apr 2016 13:24:38 +0000 (13:24 +0000)]
Merge "Settings tweaks"
Jason Monk [Fri, 8 Apr 2016 18:54:17 +0000 (14:54 -0400)]
Settings tweaks
Change-Id: I68829fa8e49534d4635a008c94dced3c7ab6f4b1
Fixes:
27834471
Fixes:
27834626
Fixes:
27567838
Fixes:
27834676
Clara Bayarri [Mon, 11 Apr 2016 10:05:55 +0000 (10:05 +0000)]
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
Clara Bayarri [Mon, 11 Apr 2016 09:55:54 +0000 (09:55 +0000)]
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
Clara Bayarri [Mon, 11 Apr 2016 09:44:20 +0000 (09:44 +0000)]
Merge "Add Keyboard Shortcuts Helper entry in Settings" into nyc-dev
Yohei Yukawa [Sun, 10 Apr 2016 06:40:36 +0000 (06:40 +0000)]
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
Yohei Yukawa [Sun, 10 Apr 2016 06:36:54 +0000 (06:36 +0000)]
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
Yohei Yukawa [Sat, 9 Apr 2016 23:57:24 +0000 (16:57 -0700)]
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
611410a8c4b55b0fc6fde3e718f028335dea41d8
Bug:
27543291
Bug:
27959401
Change-Id: I6e4795f8c4dbe9857d036ca19689e05658aa0640
Suprabh Shukla [Sun, 10 Apr 2016 02:03:44 +0000 (19:03 -0700)]
Fixed obsolete import
Change-Id: Ibee0284c61f3e559efeb9a28788b55e86a8355c6
Bill Yi [Sat, 9 Apr 2016 22:44:03 +0000 (22:44 +0000)]
Import translations. DO NOT MERGE am:
2f26075 -s ours
am:
050ead0 -s ours
* commit '
050ead07be0f67a49688a07dee5c42302e77e502':
Import translations. DO NOT MERGE
Change-Id: I195bab1a4f01d40fd72b94befa89984550c0b112
Jason Monk [Sat, 9 Apr 2016 22:44:01 +0000 (22:44 +0000)]
Merge "Settings tweaks" into nyc-dev am:
db3fcfb
am:
14b6f12 -s ours
* commit '
14b6f12aeaaa00d35feee4e5b19f9b6792874c5f':
Settings tweaks
Change-Id: I8b1c1cdcc17a6722c9aba2cb55956f0444f8b5fe
Bill Yi [Sat, 9 Apr 2016 14:11:35 +0000 (14:11 +0000)]
Import translations. DO NOT MERGE
am:
2f26075 -s ours
* commit '
2f260757a2cec3f735d7cc175115cc1f6bee8903':
Import translations. DO NOT MERGE
Change-Id: I99a3400ce2b1583832c46b20454fc97ecfb78870
Bill Yi [Sat, 9 Apr 2016 14:01:49 +0000 (14:01 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Sat, 9 Apr 2016 13:46:45 +0000 (06:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I89dec6af8243722e59f53b19ea182dc1357e4f47
Auto-generated-cl: translation import
Bill Yi [Sat, 9 Apr 2016 13:07:07 +0000 (06:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia44b4686526adde07939fb18f43db0f792832a5f
Auto-generated-cl: translation import
Alan Viverette [Fri, 8 Apr 2016 19:23:29 +0000 (15:23 -0400)]
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
Suprabh Shukla [Sat, 9 Apr 2016 01:34:54 +0000 (18:34 -0700)]
resolve merge conflicts of
d83867c to master
Change-Id: I999d87f33ef028055ea42197b518dbe57e8312cf
Jason Monk [Sat, 9 Apr 2016 00:32:15 +0000 (00:32 +0000)]
Merge "Settings tweaks" into nyc-dev
am:
db3fcfb
* commit '
db3fcfb7cb652c0afdd093e2ec9f387dc01b7819':
Settings tweaks
Change-Id: Ibc9882219ad819cd516bf3c1ce7ce556b36ad9e6
Suprabh Shukla [Sat, 9 Apr 2016 00:32:15 +0000 (00:32 +0000)]
Merge "Moving HelpUtils to SettingsLib" into nyc-dev
am:
1d464b9
* commit '
1d464b9677c4f956dab81622b2cb59c53cbf01dd':
Moving HelpUtils to SettingsLib
Change-Id: I2b855b36d0f3af29f5bc35008017aa7539cd0677
Jason Monk [Fri, 8 Apr 2016 20:46:49 +0000 (20:46 +0000)]
Merge "Settings tweaks" into nyc-dev
Jason Monk [Fri, 8 Apr 2016 18:54:17 +0000 (14:54 -0400)]
Settings tweaks
Change-Id: I68829fa8e49534d4635a008c94dced3c7ab6f4b1
Fixes:
27834471
Fixes:
27834626
Fixes:
27567838
Fixes:
27834676
Suprabh Shukla [Fri, 8 Apr 2016 19:31:36 +0000 (19:31 +0000)]
Merge "Moving HelpUtils to SettingsLib" into nyc-dev
Jason Monk [Fri, 8 Apr 2016 17:34:47 +0000 (13:34 -0400)]
resolve merge conflicts of
65b5952 to master
Change-Id: I0adc036416f21dfa7dd671d4920bce5c26fe7cb6
Jason Monk [Fri, 8 Apr 2016 17:11:43 +0000 (17:11 +0000)]
Merge "Restore the premiume SMS Preference." into nyc-dev
am:
b8bce66
* commit '
b8bce66c02bef58d9df3bdfe0fc4a29da9491296':
Restore the premiume SMS Preference.
Change-Id: Id83745add76b1afba24bf487dab12a66ebe4f0c3
Jason Monk [Fri, 8 Apr 2016 17:04:43 +0000 (17:04 +0000)]
Merge "Restore the premiume SMS Preference." into nyc-dev
Jason Monk [Mon, 28 Mar 2016 19:36:03 +0000 (15:36 -0400)]
Restore the premiume SMS Preference.
Fixes:
27657256
Change-Id: I396eb9ba71f51fed517d7f958873369bc0ab011e
Victor Chang [Fri, 8 Apr 2016 16:02:11 +0000 (16:02 +0000)]
TrustedCredentialsSettings should be launched in personal user instead of work user am:
37afa28
am:
0b4846e
* commit '
0b4846e808f736abb5c524cf914e684d5b12627f':
TrustedCredentialsSettings should be launched in personal user instead of work user
Change-Id: I5f06de99e8f70cb3e2cc4d028c0dd00f9f138818
Victor Chang [Fri, 8 Apr 2016 15:57:44 +0000 (15:57 +0000)]
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
Daniel U [Fri, 8 Apr 2016 15:55:32 +0000 (15:55 +0000)]
Merge "Allow user to hide sensitive notifications with no work challenge" into nyc-dev am:
9f4ad67
am:
957ec6a
* commit '
957ec6aee4ad8dfbde5cedb9791effdce1ca9825':
Allow user to hide sensitive notifications with no work challenge
Change-Id: I999f240c0112abb9b366017e7def431a2c3dae79
Abodunrinwa Toki [Fri, 8 Apr 2016 15:55:32 +0000 (15:55 +0000)]
Merge "Input settings: Show keyboard layout collection." into nyc-dev am:
f103d10
am:
186d97b
* commit '
186d97bbab34d51a88321da2556eda551ea0ddd3':
Input settings: Show keyboard layout collection.
Change-Id: Ia7e6d50590ac19f9f8e9de333bc36c73d6790c09
Daniel U [Fri, 8 Apr 2016 15:51:13 +0000 (15:51 +0000)]
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
Abodunrinwa Toki [Fri, 8 Apr 2016 15:51:12 +0000 (15:51 +0000)]
Merge "Input settings: Show keyboard layout collection." into nyc-dev
am:
f103d10
* commit '
f103d10861e6a702f8f29d42e48214c94b1ddb91':
Input settings: Show keyboard layout collection.
Change-Id: I813b902c6638befc9dcd7ebd166e8fe9c33731a5
Victor Chang [Thu, 7 Apr 2016 20:20:38 +0000 (21:20 +0100)]
TrustedCredentialsSettings should be launched in personal user instead of work user
Bug:
18224038
Change-Id: I861a0b98b4b7f0792332b980c1c8e080864b4d57
Daniel U [Fri, 8 Apr 2016 15:44:44 +0000 (15:44 +0000)]
Merge "Allow user to hide sensitive notifications with no work challenge" into nyc-dev
Abodunrinwa Toki [Fri, 8 Apr 2016 15:43:13 +0000 (15:43 +0000)]
Merge "Input settings: Show keyboard layout collection." into nyc-dev
Daniel U [Thu, 7 Apr 2016 18:18:26 +0000 (19:18 +0100)]
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
Abodunrinwa Toki [Fri, 8 Apr 2016 13:08:56 +0000 (14:08 +0100)]
Input settings: Show keyboard layout collection.
E.g. Android keyboard or Nexus Compat keyboard.
Bug:
27250977
Change-Id: Icd256a760b157418f52046f10ca272561b692838
Robin Lee [Fri, 8 Apr 2016 11:02:40 +0000 (11:02 +0000)]
Merge "Credential storage: check lock quality for right user" into nyc-dev am:
16b4ac8
am:
c6696f1
* commit '
c6696f1c8675692bb0977a35ab65920f9eef67f1':
Credential storage: check lock quality for right user
Change-Id: Iea17251ba3d27f2d4a2978d4466e5f80c0effdbe
Robin Lee [Fri, 8 Apr 2016 10:58:34 +0000 (10:58 +0000)]
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
Oleksandr Peletskyi [Fri, 8 Apr 2016 10:54:27 +0000 (10:54 +0000)]
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
Robin Lee [Fri, 8 Apr 2016 10:53:23 +0000 (10:53 +0000)]
Merge "Credential storage: check lock quality for right user" into nyc-dev
Oleksandr Peletskyi [Fri, 8 Apr 2016 10:50:23 +0000 (10:50 +0000)]
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
Oleksandr Peletskyi [Fri, 8 Apr 2016 10:44:05 +0000 (10:44 +0000)]
Merge "Improved UX when DISALLOW_SET_WALLPAPER is set." into nyc-dev
Oleksandr Peletskyi [Tue, 5 Apr 2016 13:37:07 +0000 (15:37 +0200)]
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
Ruben Brunk [Fri, 8 Apr 2016 05:22:47 +0000 (05:22 +0000)]
Merge "Fix Settings activity typo." into nyc-dev am:
77359ad
am:
3f32a9f
* commit '
3f32a9ff1011134f7fcfb1da9b108074e3a988bc':
Fix Settings activity typo.
Change-Id: Idef0d055fadbb2f7b1021bdee2b2601f9add66df
Ruben Brunk [Fri, 8 Apr 2016 05:18:52 +0000 (05:18 +0000)]
Merge "Fix Settings activity typo." into nyc-dev
am:
77359ad
* commit '
77359ad76117c3ffc7fe40890f8bbdc8736f143c':
Fix Settings activity typo.
Change-Id: Ie11bb09128fbbedc72252583e0a6a721ef1e17bd
Ruben Brunk [Fri, 8 Apr 2016 05:13:18 +0000 (05:13 +0000)]
Merge "Fix Settings activity typo." into nyc-dev
Ruben Brunk [Fri, 8 Apr 2016 04:45:41 +0000 (21:45 -0700)]
Fix Settings activity typo.
Bug=
28078304
Change-Id: I2744314bbd97b1c330baa53a07534c461dab3c0f
Fyodor Kupolov [Thu, 7 Apr 2016 23:46:18 +0000 (16:46 -0700)]
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
OSDN Git Service
