Doris Ling
387b8c0f8e
Merge "DO NOT MERGE: Revert "Add summary text to Display->Brightness level."" into oc-dev
...
am: 024bc8706d
Change-Id: If3adcf59fab58d331e34516fa161d44ae199e64c
2017-04-27 03:28:39 +00:00
TreeHugger Robot
024bc8706d
Merge "DO NOT MERGE: Revert "Add summary text to Display->Brightness level."" into oc-dev
2017-04-27 03:22:21 +00:00
Jack He
a16bcf17d4
Merge "Bluetooth: Dismiss pairing dialog on user click" into oc-dev
...
am: fdd8d3f6ae
Change-Id: Ie5d30226ef700f29af206416b8392fd9f6017784
2017-04-27 00:37:38 +00:00
TreeHugger Robot
fdd8d3f6ae
Merge "Bluetooth: Dismiss pairing dialog on user click" into oc-dev
2017-04-27 00:32:12 +00:00
Doris Ling
cf4a185aeb
DO NOT MERGE: Revert "Add summary text to Display->Brightness level."
...
This reverts commit 03ee253701
.
The change does not work properly and is causing confusion.
Bug: 36650108
Change-Id: I00acced742b20e215c869ed58eb8750c654f5742
2017-04-26 21:33:16 +00:00
Fan Zhang
c02cbe698b
Merge "No autofill password when in PIN settings" into oc-dev
...
am: 3decc865dc
Change-Id: I927cb611ea6e426bf7a85d949aaae698639eac32
2017-04-26 21:10:23 +00:00
TreeHugger Robot
3decc865dc
Merge "No autofill password when in PIN settings" into oc-dev
2017-04-26 21:05:04 +00:00
Bill Yi
663f6ba460
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: 4bce1569a1
-s ours
Change-Id: I45def8ddf5947cbc924809e147e0b4cdce98e172
2017-04-26 19:55:12 +00:00
TreeHugger Robot
4bce1569a1
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-04-26 19:45:03 +00:00
Sundeep Ghuman
f292f23c0c
Merge "Force update APs when enabling wifi in WifiSettings." into oc-dev
...
am: 9797a39ad7
Change-Id: Ic398fbad1492c19db947462d0c54cf9391de58e3
2017-04-26 18:45:09 +00:00
Sundeep Ghuman
9797a39ad7
Merge "Force update APs when enabling wifi in WifiSettings." into oc-dev
2017-04-26 18:32:48 +00:00
Charles He
4aad6f98f4
Merge "Turn off QUIET_MODE before changing unified lock credential." into oc-dev
...
am: 09317a6545
Change-Id: I90022bf37658816f0d8deb9729f2682946389c22
2017-04-26 13:35:52 +00:00
Charles He
09317a6545
Merge "Turn off QUIET_MODE before changing unified lock credential." into oc-dev
2017-04-26 13:29:44 +00:00
Fan Zhang
07309c8f2a
Merge "Add search index provider for ConfigureNotificationSettings" into oc-dev
...
am: f650c82b16
Change-Id: Ib986a31914727d56ce4b71f360f5dd5f6ebf1dc6
2017-04-26 00:14:45 +00:00
TreeHugger Robot
f650c82b16
Merge "Add search index provider for ConfigureNotificationSettings" into oc-dev
2017-04-26 00:06:42 +00:00
Bill Yi
35c16ec044
Import translations. DO NOT MERGE
...
Change-Id: I9e0bfb7ce4c27874f4ce613b12e7c9bf7e9a3fed
Auto-generated-cl: translation import
2017-04-25 16:18:44 -07:00
Daniel Nishi
23f6fcf90a
Merge "Don't shows Files when storage is adopted." into oc-dev
...
am: 980155fb30
Change-Id: I90995dd52b20df2c1dcfe4670835bfd3988d6b41
2017-04-25 22:39:54 +00:00
Daniel Nishi
3803bb966d
Merge "Don't crash on opening ejecting USB." into oc-dev
...
am: 32f95292bf
Change-Id: Iaceb5e9ec424cf8dc175ab4d2645c50eacc86408
2017-04-25 22:39:35 +00:00
Felipe Leme
999f6a9a29
Merge "Implemented ACTION_REQUEST_SET_AUTOFILL_SERVICE." into oc-dev
...
am: c36ed203db
Change-Id: I5c27b2def2e7bea0c0cf575f5ff18db032b4519d
2017-04-25 22:38:20 +00:00
Daniel Nishi
980155fb30
Merge "Don't shows Files when storage is adopted." into oc-dev
2017-04-25 22:30:29 +00:00
Daniel Nishi
32f95292bf
Merge "Don't crash on opening ejecting USB." into oc-dev
2017-04-25 22:30:14 +00:00
TreeHugger Robot
c36ed203db
Merge "Implemented ACTION_REQUEST_SET_AUTOFILL_SERVICE." into oc-dev
2017-04-25 22:27:09 +00:00
Sundeep Ghuman
87bf49a436
Force update APs when enabling wifi in WifiSettings.
...
This reverts commit b2bdc8f17b
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
2017-04-25 15:12:00 -07:00
Julia Reynolds
bcf0c83ae2
Merge "'Allow sound' = let the app decide" into oc-dev
...
am: f9bfab880e
Change-Id: I6f0fa367832a2b02af2b05ce563f59f8cf77ead2
2017-04-25 21:56:00 +00:00
jackqdyulei
0fbccaa30b
Merge "Distribute the misc among all the apps" into oc-dev
...
am: e494a3e59b
Change-Id: I58dbff46d38402162ce69e49f8d647efcb64fff2
2017-04-25 21:55:34 +00:00
jackqdyulei
303672f1d3
Merge "Move battery stats loading to AsyncLoader." into oc-dev
...
am: d0ea1386ad
Change-Id: Ic9e7b20ab191224061a7c43f2292978daa43582e
2017-04-25 21:55:10 +00:00
TreeHugger Robot
f9bfab880e
Merge "'Allow sound' = let the app decide" into oc-dev
2017-04-25 21:45:20 +00:00
TreeHugger Robot
e494a3e59b
Merge "Distribute the misc among all the apps" into oc-dev
2017-04-25 21:44:55 +00:00
TreeHugger Robot
d0ea1386ad
Merge "Move battery stats loading to AsyncLoader." into oc-dev
2017-04-25 21:44:06 +00:00
Jack He
2a67cf0465
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
2017-04-25 14:13:26 -07:00
Felipe Leme
db2b55a244
Implemented ACTION_REQUEST_SET_AUTOFILL_SERVICE.
...
Bug: 37673809
Fixes: 37576671
Test: manual verification
Test: make RunSettingsRoboTests -j90
Change-Id: I36170cb715473dfbf598deedd9719a46168aabc8
2017-04-25 13:30:05 -07:00
jackqdyulei
106dc459e0
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
2017-04-25 13:26:17 -07:00
Fan Zhang
7d04b2dab0
Merge changes I4ae01109,Ib45289c3 into oc-dev
...
am: eda3e8c3d9
Change-Id: I897373ce37fd8352edb27ef954b1dc7792ea7026
2017-04-25 20:22:45 +00:00
TreeHugger Robot
eda3e8c3d9
Merge changes I4ae01109,Ib45289c3 into oc-dev
...
* changes:
Remove shadow below app info header.
Fix ANR in installed app details.
2017-04-25 20:16:20 +00:00
Fan Zhang
a25bc6983e
Add search index provider for ConfigureNotificationSettings
...
Change-Id: I1da8e318a8823ffe54b2edd7a83a8c7e31ee34e6
Fix: 37593839
Test: make RunSettingsRoboTests
2017-04-25 13:01:36 -07:00
Ruchi Kandoi
7094f1d170
Merge "Add searchable index for Bluetooth and Nfc only if the feature exists" into oc-dev
...
am: 41a858fde1
Change-Id: Ida195181c34d5f53ea544b1a0c81d3154385219e
2017-04-25 19:20:06 +00:00
TreeHugger Robot
41a858fde1
Merge "Add searchable index for Bluetooth and Nfc only if the feature exists" into oc-dev
2017-04-25 19:05:42 +00:00
Charles He
9c5e338850
Merge "Prevent fingerprint from bypassing work challenge" into oc-dev
...
am: 24157209c5
Change-Id: I9d024aa89a2cf5315ef8e70d5bc93a472411d242
2017-04-25 19:01:35 +00:00
Fan Zhang
e8411c4454
Merge "Properly check wallpaper state before showing suggestion" into oc-dev
...
am: db68ddc1cc
Change-Id: I9fb77a7f0b01e694d51a4a08ae6f925dc868ce80
2017-04-25 18:59:52 +00:00
TreeHugger Robot
24157209c5
Merge "Prevent fingerprint from bypassing work challenge" into oc-dev
2017-04-25 18:59:34 +00:00
Fan Zhang
c669438450
Merge "Update account sync settings title." into oc-dev
...
am: a031636725
Change-Id: I77a1df15ab010b355ff1ccd8eb2da98c99487c32
2017-04-25 18:59:34 +00:00
Fan Zhang
db68ddc1cc
Merge "Properly check wallpaper state before showing suggestion" into oc-dev
2017-04-25 18:55:53 +00:00
Fan Zhang
a031636725
Merge "Update account sync settings title." into oc-dev
2017-04-25 18:55:29 +00:00
jackqdyulei
1bc54ae5eb
Merge "Remove STATE_TOP_SLEEPING from foreground time" into oc-dev
...
am: e5fa4cd4b5
Change-Id: Ic54a96a1fe33a8e733762b40cd3c8a1751619ce4
2017-04-25 18:53:30 +00:00
Stephen Chen
ae7d423c74
Merge "Make connected Wi-Fi message multiline to avoid cutoff." into oc-dev
...
am: 6c85dbaea2
Change-Id: Ie4e338759eb5e926297aa2691161dbf7fe16199c
2017-04-25 18:53:07 +00:00
jackqdyulei
a245188a65
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
2017-04-25 11:48:24 -07:00
TreeHugger Robot
e5fa4cd4b5
Merge "Remove STATE_TOP_SLEEPING from foreground time" into oc-dev
2017-04-25 18:36:01 +00:00
TreeHugger Robot
6c85dbaea2
Merge "Make connected Wi-Fi message multiline to avoid cutoff." into oc-dev
2017-04-25 18:33:50 +00:00
Fan Zhang
1c78242a5d
No autofill password when in PIN settings
...
Change-Id: I1a629e296c4759496307510307fd907be39bb8c8
Fix: 37244398
Test: manual
2017-04-25 11:23:29 -07:00
Fan Zhang
37b77bd232
Remove shadow below app info header.
...
Bug: 37670670
Test: visual
Change-Id: I4ae011098537a970568f9fa72c49847a595a7fe0
2017-04-25 11:18:30 -07:00