Commit Graph

35930 Commits

Author SHA1 Message Date
Fan Zhang
59fd017ce5 Revert "Revert "Filter and display top 3 suggestions for exclusive type""
This reverts commit 184ae963e7.

Change-Id: Iac60fc52a5b0c153945c22b97394546a529d3bb4
2017-05-12 18:12:58 +00:00
Fan Zhang
184ae963e7 Revert "Filter and display top 3 suggestions for exclusive type"
This reverts commit 70b634adcf.

Change-Id: I6de213d4c276696c6ccc9e992ff088cf507aa7ce
2017-05-12 18:03:58 +00:00
Fan Zhang
70b634adcf Filter and display top 3 suggestions for exclusive type
Change-Id: Ief4c2f02fcf1064dac3659502bd7511b09a2a7df
Fix: 37947647
Test: make RunSettingsRoboTests
2017-05-12 08:47:39 -07:00
Matthew Fritze
ff18ec37dc Merge "Remove accessibility duplicates in settings search" into oc-dev am: 8fc602fed8
am: bdba7ab697  -s ours

Change-Id: I4e2fe671fefdd52df95bec2d35d6f26e33c7388a
2017-05-10 05:40:55 +00:00
Matthew Fritze
bdba7ab697 Merge "Remove accessibility duplicates in settings search" into oc-dev
am: 8fc602fed8

Change-Id: Id19a964f26287a8f35a30ea33cf784deab088921
2017-05-10 05:24:56 +00:00
TreeHugger Robot
8fc602fed8 Merge "Remove accessibility duplicates in settings search" into oc-dev 2017-05-10 05:07:53 +00:00
Fan Zhang
7517975834 Merge "Update setting icon paddings to align with actionbar title" into oc-dev am: 8ff8b5e95b
am: 1b628ea972

Change-Id: I9ee3528030f56d2a7acab0d599c71c595ab87031
2017-05-10 03:18:53 +00:00
Doris Ling
f4cd59a5b1 Merge "Fix crash when silencing condition." into oc-dev am: ba2f3ee3ba
am: ce5e0c3dc6

Change-Id: I9e5c4f0f9f8ee4cdced52bf1f9d79b28912bb154
2017-05-10 03:18:21 +00:00
Fan Zhang
1b628ea972 Merge "Update setting icon paddings to align with actionbar title" into oc-dev
am: 8ff8b5e95b

Change-Id: I60efa39b81e3f54f6e3e9c37f45c751dbb48966c
2017-05-10 03:02:21 +00:00
TreeHugger Robot
8ff8b5e95b Merge "Update setting icon paddings to align with actionbar title" into oc-dev 2017-05-10 02:57:19 +00:00
TreeHugger Robot
95e60e9816 Merge "Add support to show first impression type suggestions" 2017-05-10 01:53:32 +00:00
Doris Ling
ce5e0c3dc6 Merge "Fix crash when silencing condition." into oc-dev
am: ba2f3ee3ba

Change-Id: Iee2ce7c27469008142862ab866bf53e9e02d74e1
2017-05-10 01:45:17 +00:00
TreeHugger Robot
ba2f3ee3ba Merge "Fix crash when silencing condition." into oc-dev 2017-05-10 01:40:35 +00:00
Fan Zhang
031c838162 Update setting icon paddings to align with actionbar title
Change-Id: I2aaf37c61ee6098329a9dd5695c516f3db970ada
Fix: 38011653
Test: visual
2017-05-10 00:48:24 +00:00
Matthew Fritze
a844469037 Merge "Prevent non-blocking whitespaces from showing up in search" into oc-dev am: 120ec5d1eb
am: ec6cfe32fd  -s ours

Change-Id: I788be238c6319201b2be91633d67e02076d169f9
2017-05-09 23:23:23 +00:00
Bill Yi
599e3f8e46 Merge "Import translations. DO NOT MERGE" into oc-dev am: 4a0abee70e -s ours
am: 6d75c92f32  -s ours

Change-Id: I5b6d3319a7109cf9b207daf5345e97fbeb039273
2017-05-09 23:22:24 +00:00
Matthew Fritze
ec6cfe32fd Merge "Prevent non-blocking whitespaces from showing up in search" into oc-dev
am: 120ec5d1eb

Change-Id: Ic9bf5fc2aaa99592c362a3159aea0b11cb7ec950
2017-05-09 21:41:39 +00:00
Bill Yi
6d75c92f32 Merge "Import translations. DO NOT MERGE" into oc-dev
am: 4a0abee70e  -s ours

Change-Id: Ifc6b44fa916a03435be579d49c56362d4b71f576
2017-05-09 21:34:01 +00:00
Fan Zhang
7afbf0f3a2 Add support to show first impression type suggestions
- Add FIRST_IMPRESSION type in suggestion order list.
- Make rule changes for a few suggestions.

Bug: 37947647
Test: manual

Change-Id: I2101f5e0f6424723bacc9f5febf2ffaab9398896
2017-05-09 14:20:43 -07:00
TreeHugger Robot
120ec5d1eb Merge "Prevent non-blocking whitespaces from showing up in search" into oc-dev 2017-05-09 19:59:58 +00:00
TreeHugger Robot
4a0abee70e Merge "Import translations. DO NOT MERGE" into oc-dev 2017-05-09 18:25:53 +00:00
TreeHugger Robot
531163412c Merge "Import translations. DO NOT MERGE" 2017-05-09 18:09:39 +00:00
TreeHugger Robot
33b55ef1ba Merge "Remove accessibility duplicates in settings search" 2017-05-09 18:07:42 +00:00
TreeHugger Robot
9a0c200848 Merge "Prevent non-blocking whitespaces from showing up in search" 2017-05-09 18:07:11 +00:00
Bookatz
64ac70d257 Merge "Add BLE results counter to batterystats" into oc-dev am: b296697e8e
am: 9b54572992

Change-Id: Ia4ea1a7e24267457ae659c8a67ff15c24c1b0a46
2017-05-09 17:39:50 +00:00
Bookatz
9b54572992 Merge "Add BLE results counter to batterystats" into oc-dev
am: b296697e8e

Change-Id: Ic5fca069ab56fd2b9bebb12f27c13a27b7f94b35
2017-05-09 17:08:16 +00:00
Matthew Fritze
9615f82abf Prevent non-blocking whitespaces from showing up in search
When search results use the placeholder summary text,
it becomes non-breaking whitespace. If that is the
summary, set the visibility to gone.

Change-Id: Ic3987a0990c33b6cc5aabffa0782ece6c553784a
Merged-In: Ifefa785b6c56d56da73ca78d874f46efcb9e991f
Fixes: 38029215
Test: make RunSettingsRoboTests
2017-05-09 16:42:40 +00:00
Matthew Fritze
0e798baf45 Prevent non-blocking whitespaces from showing up in search
Merge from: ag/2217040

Bug: 38029215
Test: make RunSettingsRoboTests
Change-Id: Ifefa785b6c56d56da73ca78d874f46efcb9e991f
2017-05-09 09:29:47 -07:00
Matthew Fritze
6ad5848775 Remove accessibility duplicates in settings search
Merge for: ag/2148817

Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: Idda6d2f98cb8d2cb91a9a4721b2ef84921f9056a
2017-05-09 09:17:13 -07:00
TreeHugger Robot
b296697e8e Merge "Add BLE results counter to batterystats" into oc-dev 2017-05-09 16:03:28 +00:00
Bill Yi
d8f1255323 Import translations. DO NOT MERGE
Change-Id: I52f644bcc6958725b0a600a46a7b27b1b8b000d7
Auto-generated-cl: translation import
2017-05-09 04:07:09 -07:00
Bill Yi
2bb189fe55 Import translations. DO NOT MERGE
Change-Id: I8bfce7755242dc89bb6a2ab277e874b3f92a1450
Auto-generated-cl: translation import
2017-05-09 03:56:50 -07:00
Fan Zhang
a88d4a409a Merge "Remove placeholder summary text in auto-rotate preference" into oc-dev am: ce7f36c799
am: b3afa6e84f  -s ours

Change-Id: I0ec721881dcd6c75b90f26f2f322a7a445c2948a
2017-05-09 01:55:42 +00:00
Fan Zhang
b3afa6e84f Merge "Remove placeholder summary text in auto-rotate preference" into oc-dev
am: ce7f36c799

Change-Id: I4bf3958e80286634dfc7d23f4133174d221be3b4
2017-05-09 01:44:00 +00:00
TreeHugger Robot
ce7f36c799 Merge "Remove placeholder summary text in auto-rotate preference" into oc-dev 2017-05-09 01:25:18 +00:00
Stephen Chen
41aa446c7f Merge "Added WifiSettings Espresso tests." into oc-dev am: 6c0f337d52
am: 95a98f0686

Change-Id: I03d14cabee02252e69ca0c5c0057489446866d4e
2017-05-08 23:45:32 +00:00
Stephen Chen
95a98f0686 Merge "Added WifiSettings Espresso tests." into oc-dev
am: 6c0f337d52

Change-Id: I91235f3fc1754539d055a4e24e395705c7b8f967
2017-05-08 23:42:59 +00:00
TreeHugger Robot
6c0f337d52 Merge "Added WifiSettings Espresso tests." into oc-dev 2017-05-08 23:39:22 +00:00
Fan Zhang
0498d4e864 Merge "Fix PrefCategory layout to align text with actionbar title" into oc-dev am: 2dbc30dc58
am: df2ecdf3f0

Change-Id: Ie616f506702d2732d62b8a2ea02a4b7d52bdf0eb
2017-05-08 23:15:04 +00:00
Fan Zhang
df2ecdf3f0 Merge "Fix PrefCategory layout to align text with actionbar title" into oc-dev
am: 2dbc30dc58

Change-Id: I0359be4c3f7dbc6093d74b56beb7b11f71dbb1d0
2017-05-08 23:08:31 +00:00
TreeHugger Robot
2dbc30dc58 Merge "Fix PrefCategory layout to align text with actionbar title" into oc-dev 2017-05-08 22:59:06 +00:00
Matthew Fritze
69c84cfa2e Merge "Prevent race conditions after dropping database" into oc-dev am: fc8e64eccb
am: 43171ef58a  -s ours

Change-Id: I9b250e7420e2bf143a69c9a54f340bed040cc32b
2017-05-08 22:56:50 +00:00
Stephen Chen
8108dba4e3 Merge "Fix Disallow config Wi-Fi message for AFW Do mode." into oc-dev am: f7980fc3cb
am: 95640767d1

Change-Id: I5b4374a51dfa73b3a8b17bad0a6de473a6808627
2017-05-08 22:56:17 +00:00
Doris Ling
56428a599f Merge "Add summary placeholder to data saver preference." into oc-dev am: a3c4339299
am: 06b670e4df

Change-Id: I1746fbdfeea5a1f807bfe3b7bf7b5847a298aa2e
2017-05-08 22:55:50 +00:00
TreeHugger Robot
2f6b558699 Merge "Update some rules for suggestions" 2017-05-08 22:34:50 +00:00
Doris Ling
b72163b9d0 Fix crash when silencing condition.
- check if the broadcast receiver is being registered before trying to
un-regist it.

Change-Id: I6af215f393d16173f317c9e5bc05237c935e7133
Fix: 38131851
Test: make RunSettingsRoboTests
2017-05-08 15:28:33 -07:00
TreeHugger Robot
ff174c73b2 Merge "Create RestrictedDashboardFragment." 2017-05-08 22:14:21 +00:00
Stephen Chen
db332d4aa7 Added WifiSettings Espresso tests.
Added test cases for toggling Wi-Fi state, connected access points, and
saved network preferences.

Bug: 35322629
Bug: 35322690
Bug: 35322875
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java

Change-Id: Iaba7fb2fa90cf0f37538c4b1ef141cf6b15d7f52
2017-05-08 14:48:01 -07:00
Matthew Fritze
43171ef58a Merge "Prevent race conditions after dropping database" into oc-dev
am: fc8e64eccb

Change-Id: I4cb1f8685c5d1f43aa5ce5b5b5e124d1240e43bd
2017-05-08 21:05:20 +00:00
Stephen Chen
95640767d1 Merge "Fix Disallow config Wi-Fi message for AFW Do mode." into oc-dev
am: f7980fc3cb

Change-Id: I0b9866922e764afba8f0b642fa16531cd48b73c0
2017-05-08 21:04:55 +00:00