OSDN Git Service
Glen Kuhne [Fri, 28 Apr 2017 00:07:00 +0000 (00:07 +0000)]
Merge "Disable submit button when PSK pass is invalid" into oc-dev
am:
35cc22fcf2
Change-Id: I85453268629231b8c3003b207e4edbf70c140ee2
Doris Ling [Fri, 28 Apr 2017 00:06:38 +0000 (00:06 +0000)]
Merge "Refresh the App Info option menu after unintalling app updates." into oc-dev
am:
64857437a4
Change-Id: Ifa91856e910de3df6f695d1a31462ca8edda0822
Doris Ling [Fri, 28 Apr 2017 00:06:18 +0000 (00:06 +0000)]
Merge "Add summary to special app access." into oc-dev
am:
02619a6d9f
Change-Id: Iafd970711e33556aeead681128aaeda5046df34b
Sudheer Shanka [Fri, 28 Apr 2017 00:05:53 +0000 (00:05 +0000)]
Merge "Update ActivityMonitor.onMatchIntent to ActivityMonitor.onStartActivity." into oc-dev
am:
f64c5236c7
Change-Id: Id4d543b5ff4a8abbb0356b7cd97ffe99bdc6540a
TreeHugger Robot [Thu, 27 Apr 2017 23:11:46 +0000 (23:11 +0000)]
Merge "Disable submit button when PSK pass is invalid" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 23:08:19 +0000 (23:08 +0000)]
Merge "Refresh the App Info option menu after unintalling app updates." into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 22:31:47 +0000 (22:31 +0000)]
Merge "Add summary to special app access." into oc-dev
Sudheer Shanka [Thu, 27 Apr 2017 20:46:07 +0000 (20:46 +0000)]
Merge "Update ActivityMonitor.onMatchIntent to ActivityMonitor.onStartActivity." into oc-dev
Matthew Fritze [Thu, 27 Apr 2017 19:55:29 +0000 (19:55 +0000)]
Merge "Remove search duplicates for Wifi and Bluetooth" into oc-dev
am:
b48e6e46b3
Change-Id: I8aedf3695394a296cb1b1ea7111232c6d25aa07a
TreeHugger Robot [Thu, 27 Apr 2017 19:50:30 +0000 (19:50 +0000)]
Merge "Remove search duplicates for Wifi and Bluetooth" into oc-dev
Matthew Fritze [Thu, 13 Apr 2017 20:08:33 +0000 (13:08 -0700)]
Remove search duplicates for Wifi and Bluetooth
Remove the master switch duplicates between the switch
and their targets. Only show the actual Wifi and Bluetooth
settings as search results.
Bug:
33701673
Test: make RunSettingsRoboTests
Change-Id: I226cc8db40a308bd9bcfacdd4fc6ae709fb809c5
Maurice Lam [Thu, 27 Apr 2017 19:34:08 +0000 (19:34 +0000)]
Fix Robolectric test on oc-dev. DO NOT MERGE
am:
8352421baa
Change-Id: I09a285e1c6ed2c9b27e41b37569922cf648044dd
Maurice Lam [Thu, 27 Apr 2017 18:58:12 +0000 (11:58 -0700)]
Fix Robolectric test on oc-dev. DO NOT MERGE
The directories for setup wizard lib renamed on master.
Test: cd tests/robotests && mma
Bug:
37745541
Change-Id: Iffb7aa85a41a1d84c17357144f964e1d6da693be
Ajay Panicker [Thu, 27 Apr 2017 17:18:50 +0000 (17:18 +0000)]
Merge "Limit btsnoop file size (4/8)" am:
7baae2a924 am:
7469ff3e1c
am:
2151ee9b86
Change-Id: I5199a59ae071fa654477e0b5d8968cddc87cff5a
Ajay Panicker [Thu, 27 Apr 2017 17:08:48 +0000 (17:08 +0000)]
Merge "Limit btsnoop file size (4/8)" am:
7baae2a924
am:
7469ff3e1c
Change-Id: I34175cce212bd5c291481bee5758501b741f197c
Ajay Panicker [Thu, 27 Apr 2017 17:06:18 +0000 (17:06 +0000)]
Merge "Limit btsnoop file size (4/8)"
am:
7baae2a924
Change-Id: I62ac2896f84a32d622fcc139c42ead660f4945bc
Treehugger Robot [Thu, 27 Apr 2017 17:02:03 +0000 (17:02 +0000)]
Merge "Limit btsnoop file size (4/8)"
Philip P. Moltmann [Thu, 27 Apr 2017 16:56:20 +0000 (16:56 +0000)]
Merge "Don't show autofill settings if not enabled" into oc-dev
am:
32d3d383cb
Change-Id: I58a04882f08402e77f0e5e4c9d0b183a8a2679da
TreeHugger Robot [Thu, 27 Apr 2017 16:43:20 +0000 (16:43 +0000)]
Merge "Don't show autofill settings if not enabled" into oc-dev
Pavel Grafov [Thu, 27 Apr 2017 16:34:12 +0000 (16:34 +0000)]
Merge "Disable "Verify apps over usb" according to user restriction." into oc-dev
am:
6e34174f72
Change-Id: Ic19583cb62f8f00831a5564c1f63fa1ede22efb6
TreeHugger Robot [Thu, 27 Apr 2017 16:23:00 +0000 (16:23 +0000)]
Merge "Disable "Verify apps over usb" according to user restriction." into oc-dev
Julia Reynolds [Thu, 27 Apr 2017 15:24:02 +0000 (15:24 +0000)]
Merge "App & channel notification settings updates" into oc-dev
am:
8e305ee536
Change-Id: I49e3c39f7796048335f19da176d6dec276051e79
Julia Reynolds [Thu, 27 Apr 2017 15:11:32 +0000 (15:11 +0000)]
Merge "App & channel notification settings updates" into oc-dev
Philip P. Moltmann [Mon, 24 Apr 2017 23:13:21 +0000 (16:13 -0700)]
Don't show autofill settings if not enabled
The non-indexable keys of language-and-input on my angler are:
game_controller_settings_category, gesture_assist,
gesture_double_tap_screen, default_autofill
Fixes:
35956220
Test: Disabled auto-fill and looked at settings: did not find
autofill button and could not find auto-fill in search
Settings robolectric test
Merged-In: I0923e707422d1b1de5153a63fa3a5fe4773c055d
Change-Id: I0923e707422d1b1de5153a63fa3a5fe4773c055d
Denis Kuznetsov [Thu, 27 Apr 2017 13:36:20 +0000 (13:36 +0000)]
DO Disclosures: detailed application lists
am:
3de32ae4dc
Change-Id: I6af13a0cd991a038c2b93c8e62aa031113f414a1
Denis Kuznetsov [Thu, 27 Apr 2017 13:36:04 +0000 (13:36 +0000)]
DO Disclosure: add UI that lists apps that were managed by owner: - had permissions granted by admin - were installed by owner via policy
am:
7db69b7a26
Change-Id: Ia3c2c560698e043ac2f8900c32e60df47ff9d06e
Denis Kuznetsov [Wed, 12 Apr 2017 15:33:35 +0000 (17:33 +0200)]
DO Disclosures: detailed application lists
Add UI that lists enterprise set default apps for handling important intents
(opening browser, using camera, phone, etc).
Bug:
32692748
Test: m RunSettingsRoboTests
Merged-In: I75bb97d1b3728b1dcb90981b24d12edf510c4b04
Change-Id: I7d0041e4fada48bc56f6a6637614ac4471dba65a
(cherry picked from commit
f0a61dd1126f4b21fb15f1c3d9611ef86fc291a7)
Denis Kuznetsov [Thu, 27 Apr 2017 08:44:21 +0000 (10:44 +0200)]
DO Disclosure: add UI that lists apps that were managed by owner:
- had permissions granted by admin
- were installed by owner via policy
Bug:
32692748
Test: m RunSettingsRoboTests
Change-Id: I365e2f8f351671e68f83cceb7c0ca241d7a5a588
Merged-In: I365e2f8f351671e68f83cceb7c0ca241d7a5a588
(cherry picked from commit
60b2960cbb4df5310d054da57e2ec134b3fca0e6)
Pavel Grafov [Tue, 18 Apr 2017 18:35:39 +0000 (19:35 +0100)]
Disable "Verify apps over usb" according to user restriction.
Bug:
37158436
Test: make ROBOTEST_FILTER=VerifyAppsOverUsbPreferenceControllerTest RunSettingsRoboTests
Change-Id: I52d40f4176ecd660c621ec056649c94fc29f2d4b
Merged-In: I52d40f4176ecd660c621ec056649c94fc29f2d4b
Felipe Leme [Thu, 27 Apr 2017 07:48:38 +0000 (07:48 +0000)]
Merge "Improvements on ACTION_REQUEST_SET_AUTOFILL_SERVICE:" into oc-dev
am:
b21808bd6b
Change-Id: Id3d6bd2f3b76d51ff931b307ad7050b41c1b9d3a
TreeHugger Robot [Thu, 27 Apr 2017 07:40:44 +0000 (07:40 +0000)]
Merge "Improvements on ACTION_REQUEST_SET_AUTOFILL_SERVICE:" into oc-dev
Fan Zhang [Thu, 27 Apr 2017 05:52:28 +0000 (05:52 +0000)]
Merge "Resolve intent before launching from DashboardFragment." into oc-dev
am:
c028a7d976
Change-Id: Ie3f3d6b7e69df8fdb3ff4d7324fc395dccadc003
TreeHugger Robot [Thu, 27 Apr 2017 05:47:29 +0000 (05:47 +0000)]
Merge "Resolve intent before launching from DashboardFragment." into oc-dev
rongrong.x.gao [Thu, 27 Apr 2017 04:12:39 +0000 (04:12 +0000)]
Merge "Fix MUT cannot connect to AP by WPS after rotating MUT" am:
2503ea04fb am:
220e085953
am:
4ccf08c6d4
Change-Id: I252e7b0c491e4eadc3ebb55d8cfdc0ca5f51ecae
rongrong.x.gao [Thu, 27 Apr 2017 04:07:11 +0000 (04:07 +0000)]
Merge "Fix MUT cannot connect to AP by WPS after rotating MUT" am:
2503ea04fb
am:
220e085953
Change-Id: Ia1596c05770c7ecf48830bf37f2f040c20931606
rongrong.x.gao [Thu, 27 Apr 2017 04:05:09 +0000 (04:05 +0000)]
Merge "Fix MUT cannot connect to AP by WPS after rotating MUT"
am:
2503ea04fb
Change-Id: Ic3daed07e1d94ad7f4154affe51855d0462753a6
Treehugger Robot [Thu, 27 Apr 2017 03:56:27 +0000 (03:56 +0000)]
Merge "Fix MUT cannot connect to AP by WPS after rotating MUT"
Felipe Leme [Tue, 25 Apr 2017 23:42:55 +0000 (16:42 -0700)]
Improvements on ACTION_REQUEST_SET_AUTOFILL_SERVICE:
- Moved to proper package.
- Returns right away when:
- AutofillService for package is already selected
- Autofill is not available
Bug:
37576671
Bug:
37673809
Test: manual verification
Test: make RunSettingsRoboTests -j90
Merged-in: Icda260cea1b4ce6cdefd8eff9625b2b768a5ed86
Change-Id: Icda260cea1b4ce6cdefd8eff9625b2b768a5ed86
Maurice Lam [Thu, 27 Apr 2017 03:48:23 +0000 (03:48 +0000)]
Merge "Enable redaction interstitial after setting up pattern" into oc-dev
am:
2fc1fa6c41
Change-Id: Iace2ff261895f32bfbc158140c2002be40c1586f
TreeHugger Robot [Thu, 27 Apr 2017 03:40:17 +0000 (03:40 +0000)]
Merge "Enable redaction interstitial after setting up pattern" into oc-dev
Doris Ling [Thu, 27 Apr 2017 03:28:39 +0000 (03:28 +0000)]
Merge "DO NOT MERGE: Revert "Add summary text to Display->Brightness level."" into oc-dev
am:
024bc8706d
Change-Id: If3adcf59fab58d331e34516fa161d44ae199e64c
TreeHugger Robot [Thu, 27 Apr 2017 03:22:20 +0000 (03:22 +0000)]
Merge "DO NOT MERGE: Revert "Add summary text to Display->Brightness level."" into oc-dev
Jack He [Thu, 27 Apr 2017 00:37:38 +0000 (00:37 +0000)]
Merge "Bluetooth: Dismiss pairing dialog on user click" into oc-dev
am:
fdd8d3f6ae
Change-Id: Ie5d30226ef700f29af206416b8392fd9f6017784
Sudheer Shanka [Thu, 27 Apr 2017 00:34:47 +0000 (17:34 -0700)]
Update ActivityMonitor.onMatchIntent to ActivityMonitor.onStartActivity.
Bug:
37672383
Change-Id: I63adcafc6e8dced173d52f25e8a6521ae897c9aa
Test: builds
TreeHugger Robot [Thu, 27 Apr 2017 00:32:11 +0000 (00:32 +0000)]
Merge "Bluetooth: Dismiss pairing dialog on user click" into oc-dev
Ajay Panicker [Tue, 18 Apr 2017 03:46:29 +0000 (20:46 -0700)]
Limit btsnoop file size (4/8)
Limit btsnoop file size by rotating between snoop files. The rotation occurrs
when a fixed number of packets have been logged and will start overwriting
the older file.
Bug:
35998031
Test: Enable snoop logs from developer options and let logs get large
Merged-In: I94f8f6bc12ab3f7ff406c9392934ecb7209cd635
Change-Id: I94f8f6bc12ab3f7ff406c9392934ecb7209cd635
Doris Ling [Wed, 26 Apr 2017 23:30:47 +0000 (16:30 -0700)]
Refresh the App Info option menu after unintalling app updates.
When we are done uninstalling app updates, invalidate the options menu
so that it will be rebuilt and the correct available menu items will be
shown.
Change-Id: I485fe9ff129ac0b2d75094c3b899bf6553e54c74
Fix:
36407258
Test: make RunSettingsRoboTests
Fan Zhang [Fri, 21 Apr 2017 21:40:11 +0000 (14:40 -0700)]
Resolve intent before launching from DashboardFragment.
Once dashboard tile is displayed, the underlying intent can be disabled.
We will eventually hide the item from UI, but there can be a brief
moment before we are able to hide it. So to prevent user click and
launch a non-exist intent, we will try to resolve it first before
launching anything.
Change-Id: Ic8d790bf3c5d4d269eadb757f789a1641928a7b7
Fix:
36036097
Test: make RunSettingsRoboTests
Doris Ling [Wed, 26 Apr 2017 21:27:53 +0000 (21:27 +0000)]
DO NOT MERGE: Revert "Add summary text to Display->Brightness level."
This reverts commit
03ee2537016e2df94eaec8a8af1c94a57a3b1199.
The change does not work properly and is causing confusion.
Bug:
36650108
Change-Id: I00acced742b20e215c869ed58eb8750c654f5742
Fan Zhang [Wed, 26 Apr 2017 21:10:23 +0000 (21:10 +0000)]
Merge "No autofill password when in PIN settings" into oc-dev
am:
3decc865dc
Change-Id: I927cb611ea6e426bf7a85d949aaae698639eac32
TreeHugger Robot [Wed, 26 Apr 2017 21:05:04 +0000 (21:05 +0000)]
Merge "No autofill password when in PIN settings" into oc-dev
Glen Kuhne [Thu, 13 Apr 2017 22:23:44 +0000 (15:23 -0700)]
Disable submit button when PSK pass is invalid
Modified the logic of when to enable the 'connect'/'save'(submit)
button.
PSK is now also recognized as invalid when over 63 characters in length.
Removed the 'isSavedAp' check that only applied the invalid password
check to new networks. Users must now modify networks with a valid psk.
While I was here: Fixed WifiSettingsUiTest from failing due to invalid
WIFI_PREFERENCES string
Bug:
37152520
Bug:
36709852
Test: runtest WifiSettingsUiTest & m RunSettingsRoboTests pass
Change-Id: I273560cbf9124d16034962a2084f36c93973ee83
Bill Yi [Wed, 26 Apr 2017 19:55:12 +0000 (19:55 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
4bce1569a1 -s ours
Change-Id: I45def8ddf5947cbc924809e147e0b4cdce98e172
TreeHugger Robot [Wed, 26 Apr 2017 19:45:02 +0000 (19:45 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Sundeep Ghuman [Wed, 26 Apr 2017 18:45:09 +0000 (18:45 +0000)]
Merge "Force update APs when enabling wifi in WifiSettings." into oc-dev
am:
9797a39ad7
Change-Id: Ic398fbad1492c19db947462d0c54cf9391de58e3
Sundeep Ghuman [Wed, 26 Apr 2017 18:32:42 +0000 (18:32 +0000)]
Merge "Force update APs when enabling wifi in WifiSettings." into oc-dev
Doris Ling [Tue, 11 Apr 2017 22:35:49 +0000 (15:35 -0700)]
Add summary to special app access.
Get the count of apps that has unrestricted data access and add that to
the summary for Apps & notifications -> Special app access.
Bug:
36376411
Test: make RunSettingsRoboTests
Change-Id: Id80a030e1e066f1391f94114f478091a2a87fcd8
Maurice Lam [Tue, 25 Apr 2017 21:56:22 +0000 (14:56 -0700)]
Enable redaction interstitial after setting up pattern
Test: cd tests/robotests && mma
Bug:
37514884
Change-Id: Ie9342ca0ea893a687284d8b864c6d53a79f88086
Charles He [Wed, 26 Apr 2017 13:35:52 +0000 (13:35 +0000)]
Merge "Turn off QUIET_MODE before changing unified lock credential." into oc-dev
am:
09317a6545
Change-Id: I90022bf37658816f0d8deb9729f2682946389c22
Charles He [Wed, 26 Apr 2017 13:29:42 +0000 (13:29 +0000)]
Merge "Turn off QUIET_MODE before changing unified lock credential." into oc-dev
Fan Zhang [Wed, 26 Apr 2017 00:14:45 +0000 (00:14 +0000)]
Merge "Add search index provider for ConfigureNotificationSettings" into oc-dev
am:
f650c82b16
Change-Id: Ib986a31914727d56ce4b71f360f5dd5f6ebf1dc6
TreeHugger Robot [Wed, 26 Apr 2017 00:06:41 +0000 (00:06 +0000)]
Merge "Add search index provider for ConfigureNotificationSettings" into oc-dev
Bill Yi [Tue, 25 Apr 2017 23:18:44 +0000 (16:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9e0bfb7ce4c27874f4ce613b12e7c9bf7e9a3fed
Auto-generated-cl: translation import
Daniel Nishi [Tue, 25 Apr 2017 22:39:54 +0000 (22:39 +0000)]
Merge "Don't shows Files when storage is adopted." into oc-dev
am:
980155fb30
Change-Id: I90995dd52b20df2c1dcfe4670835bfd3988d6b41
Daniel Nishi [Tue, 25 Apr 2017 22:39:35 +0000 (22:39 +0000)]
Merge "Don't crash on opening ejecting USB." into oc-dev
am:
32f95292bf
Change-Id: Iaceb5e9ec424cf8dc175ab4d2645c50eacc86408
Felipe Leme [Tue, 25 Apr 2017 22:38:20 +0000 (22:38 +0000)]
Merge "Implemented ACTION_REQUEST_SET_AUTOFILL_SERVICE." into oc-dev
am:
c36ed203db
Change-Id: I5c27b2def2e7bea0c0cf575f5ff18db032b4519d
Daniel Nishi [Tue, 25 Apr 2017 22:30:29 +0000 (22:30 +0000)]
Merge "Don't shows Files when storage is adopted." into oc-dev
Daniel Nishi [Tue, 25 Apr 2017 22:30:13 +0000 (22:30 +0000)]
Merge "Don't crash on opening ejecting USB." into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 22:27:08 +0000 (22:27 +0000)]
Merge "Implemented ACTION_REQUEST_SET_AUTOFILL_SERVICE." into oc-dev
Sundeep Ghuman [Fri, 21 Apr 2017 02:59:34 +0000 (02:59 +0000)]
Force update APs when enabling wifi in WifiSettings.
This reverts commit
b2bdc8f17b6148495731e4bfdd9968a6840907eb
and fixes a broken Espresso test case.
Reason for revert: Rolling forward after fix in ag/
2133493, to fix b/
37324736
Bug: b/
37324736
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
Change-Id: I9cdf8cb1043af5d527eccbd9cc56d3b02419d7ac
Julia Reynolds [Tue, 25 Apr 2017 21:56:00 +0000 (21:56 +0000)]
Merge "'Allow sound' = let the app decide" into oc-dev
am:
f9bfab880e
Change-Id: I6f0fa367832a2b02af2b05ce563f59f8cf77ead2
jackqdyulei [Tue, 25 Apr 2017 21:55:34 +0000 (21:55 +0000)]
Merge "Distribute the misc among all the apps" into oc-dev
am:
e494a3e59b
Change-Id: I58dbff46d38402162ce69e49f8d647efcb64fff2
jackqdyulei [Tue, 25 Apr 2017 21:55:10 +0000 (21:55 +0000)]
Merge "Move battery stats loading to AsyncLoader." into oc-dev
am:
d0ea1386ad
Change-Id: Ic9e7b20ab191224061a7c43f2292978daa43582e
TreeHugger Robot [Tue, 25 Apr 2017 21:45:19 +0000 (21:45 +0000)]
Merge "'Allow sound' = let the app decide" into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 21:44:54 +0000 (21:44 +0000)]
Merge "Distribute the misc among all the apps" into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 21:44:05 +0000 (21:44 +0000)]
Merge "Move battery stats loading to AsyncLoader." into oc-dev
Jack He [Tue, 25 Apr 2017 19:53:33 +0000 (12:53 -0700)]
Bluetooth: Dismiss pairing dialog on user click
* Existing pairing dialog should be dismissed when user clicks on Yes/No
* In a pairing session with multiple pairing dialogs, this is necessary
as otherwise the second pairing dialog will not be shown
* Modified unit test to test this behavior
* Launch pairing dialog as UserHandle.CURRENT to avoid Context warnings
Bug:
35833536
Test: make, unit test, pair with Bluetooth devices
Change-Id: I1823b78d287134505f59eab7caca2329ecc3a36f
Felipe Leme [Tue, 25 Apr 2017 01:10:09 +0000 (18:10 -0700)]
Implemented ACTION_REQUEST_SET_AUTOFILL_SERVICE.
Bug:
37673809
Fixes:
37576671
Test: manual verification
Test: make RunSettingsRoboTests -j90
Change-Id: I36170cb715473dfbf598deedd9719a46168aabc8
jackqdyulei [Thu, 13 Apr 2017 18:44:42 +0000 (11:44 -0700)]
Move battery stats loading to AsyncLoader.
It takes 3-4 seconds to load the battery settings page in Ryu. Main
reason is that it takes too long to init BatteryStatsHelper.
This cl moves loading code to AsyncLoader, and we will refresh ui once
the loading part is finished.
Following cl will add animation for the battery header to make it not
so janky
Bug:
37196170
Test: RunSettingsRoboTest
Change-Id: I40dfdde4a072e28a56c8fdf0ec6d671b5109fc6d
Fan Zhang [Tue, 25 Apr 2017 20:22:45 +0000 (20:22 +0000)]
Merge changes I4ae01109,Ib45289c3 into oc-dev
am:
eda3e8c3d9
Change-Id: I897373ce37fd8352edb27ef954b1dc7792ea7026
TreeHugger Robot [Tue, 25 Apr 2017 20:16:19 +0000 (20:16 +0000)]
Merge changes I4ae01109,Ib45289c3 into oc-dev
* changes:
Remove shadow below app info header.
Fix ANR in installed app details.
Fan Zhang [Tue, 25 Apr 2017 19:45:35 +0000 (12:45 -0700)]
Add search index provider for ConfigureNotificationSettings
Change-Id: I1da8e318a8823ffe54b2edd7a83a8c7e31ee34e6
Fix:
37593839
Test: make RunSettingsRoboTests
Ruchi Kandoi [Tue, 25 Apr 2017 19:20:06 +0000 (19:20 +0000)]
Merge "Add searchable index for Bluetooth and Nfc only if the feature exists" into oc-dev
am:
41a858fde1
Change-Id: Ida195181c34d5f53ea544b1a0c81d3154385219e
TreeHugger Robot [Tue, 25 Apr 2017 19:05:42 +0000 (19:05 +0000)]
Merge "Add searchable index for Bluetooth and Nfc only if the feature exists" into oc-dev
Charles He [Tue, 25 Apr 2017 19:01:35 +0000 (19:01 +0000)]
Merge "Prevent fingerprint from bypassing work challenge" into oc-dev
am:
24157209c5
Change-Id: I9d024aa89a2cf5315ef8e70d5bc93a472411d242
Fan Zhang [Tue, 25 Apr 2017 18:59:52 +0000 (18:59 +0000)]
Merge "Properly check wallpaper state before showing suggestion" into oc-dev
am:
db68ddc1cc
Change-Id: I9fb77a7f0b01e694d51a4a08ae6f925dc868ce80
TreeHugger Robot [Tue, 25 Apr 2017 18:59:33 +0000 (18:59 +0000)]
Merge "Prevent fingerprint from bypassing work challenge" into oc-dev
Fan Zhang [Tue, 25 Apr 2017 18:59:34 +0000 (18:59 +0000)]
Merge "Update account sync settings title." into oc-dev
am:
a031636725
Change-Id: I77a1df15ab010b355ff1ccd8eb2da98c99487c32
Fan Zhang [Tue, 25 Apr 2017 18:55:52 +0000 (18:55 +0000)]
Merge "Properly check wallpaper state before showing suggestion" into oc-dev
Fan Zhang [Tue, 25 Apr 2017 18:55:28 +0000 (18:55 +0000)]
Merge "Update account sync settings title." into oc-dev
jackqdyulei [Tue, 25 Apr 2017 18:53:30 +0000 (18:53 +0000)]
Merge "Remove STATE_TOP_SLEEPING from foreground time" into oc-dev
am:
e5fa4cd4b5
Change-Id: Ic54a96a1fe33a8e733762b40cd3c8a1751619ce4
Stephen Chen [Tue, 25 Apr 2017 18:53:07 +0000 (18:53 +0000)]
Merge "Make connected Wi-Fi message multiline to avoid cutoff." into oc-dev
am:
6c85dbaea2
Change-Id: Ie4e338759eb5e926297aa2691161dbf7fe16199c
jackqdyulei [Fri, 21 Apr 2017 20:46:17 +0000 (13:46 -0700)]
Distribute the misc among all the apps
Distribute it in:
1. Battery main page(PowerUsageSummary)
2. Advanced battery page(PowerUsageAdvanced)
Bug:
37487061
Test: RunSettingsRoboTests
Change-Id: Id1810b81a6b380d908bcdc18421530e938578c37
TreeHugger Robot [Tue, 25 Apr 2017 18:36:00 +0000 (18:36 +0000)]
Merge "Remove STATE_TOP_SLEEPING from foreground time" into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 18:33:49 +0000 (18:33 +0000)]
Merge "Make connected Wi-Fi message multiline to avoid cutoff." into oc-dev
Fan Zhang [Sat, 22 Apr 2017 00:03:18 +0000 (17:03 -0700)]
No autofill password when in PIN settings
Change-Id: I1a629e296c4759496307510307fd907be39bb8c8
Fix:
37244398
Test: manual
Fan Zhang [Tue, 25 Apr 2017 18:18:30 +0000 (11:18 -0700)]
Remove shadow below app info header.
Bug:
37670670
Test: visual
Change-Id: I4ae011098537a970568f9fa72c49847a595a7fe0
Julia Reynolds [Fri, 21 Apr 2017 12:27:06 +0000 (08:27 -0400)]
App & channel notification settings updates
- change 'block all' to an on/off switch bar
- update channel list summary text when notifications are
toggled on/off on app settings page
- Add 'off state' text
- change style of foot items
- change 'importance' from a dropdown to its own page
Bug:
37538972
Bug:
37479730
Fixes:
37541624
Fixes:
37549732
Test: manual
Change-Id: I0e5cc66ba539ce2b76b4ad6541bf6bfb5b58c373
Julia Reynolds [Wed, 19 Apr 2017 15:43:30 +0000 (11:43 -0400)]
'Allow sound' = let the app decide
Bug:
37479730
Test: manual
Change-Id: Ia5073dd0ef79664229c5aff0b89e7ef36edb68ee
Charles He [Mon, 24 Apr 2017 17:05:48 +0000 (18:05 +0100)]
Turn off QUIET_MODE before changing unified lock credential.
For FBE-enabled devices, the work profile disk encryption key is evicted
when the the profile is turned off (i.e. QUIET_MODE is on). If the user
attempts to change the profile's lock screen credentials in this state,
the profile will get into an unrecoverable state as vold does not have
the current encryption key.
Currently, separate work challenge does not suffer from this issue as
QUIET_MODE must be turned off before the change credentials flow could
be initiated in Settings. In this CL, we fix the issue for unified work
challenge as well by adopting the same approach.
This is temporary and should be removed when vold no longer relies on
the current key for resetting the password.
Bug:
35930129
Test: manually resetting unified PIN when work mode is off
on both sailfish (FBE) and angler (no FBE)
Test: make SettingsRoboTests
Change-Id: Ibb4b1c40a9cad8a473e08cf0c294699406108cd9
OSDN Git Service
