Commit Graph

35906 Commits

Author SHA1 Message Date
Alex Salo
2e52b42e3b Location setting now updates summary timely.
Subscribed the LocationPreferenceController to listen to the location
providers changed action. This allows timely summary update. Previous
approach, directly calling the updateSummary method onResume failed in
the scenario when user changed the location settings via the
QuickSettings.

Test: Added robolectric tests, and manually verified the intended
behavior on a device.
Bug: 37956060
Change-Id: I2f81713d59da3384f3c98b327d377d529d440a88
2017-05-09 16:43:53 -07: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
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
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
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
Doris Ling
06b670e4df Merge "Add summary placeholder to data saver preference." into oc-dev
am: a3c4339299

Change-Id: Ia9ab661f1e870764c8e13c945389d734cbee14d4
2017-05-08 21:04:28 +00:00
Fan Zhang
d44cc37e0e Update some rules for suggestions
Bug: 37947647
Test: rerun settingslib/settings robotests

Change-Id: Ie5278a2cb86c4d2dd7568b9c800db461ee3c1f04
2017-05-08 13:55:05 -07:00
TreeHugger Robot
fc8e64eccb Merge "Prevent race conditions after dropping database" into oc-dev 2017-05-08 20:51:04 +00:00
TreeHugger Robot
f7980fc3cb Merge "Fix Disallow config Wi-Fi message for AFW Do mode." into oc-dev 2017-05-08 20:44:12 +00:00
TreeHugger Robot
a3c4339299 Merge "Add summary placeholder to data saver preference." into oc-dev 2017-05-08 20:43:56 +00:00
Fan Zhang
966be254ab Remove placeholder summary text in auto-rotate preference
- Remove the %s from xml and set it in code instead.
- This is hack to make search stop display %s. It's fixed properly in
  master but we don't want to cherry-pick the master change because of its
  size and risk.

Bug: 36101902
Test: rerun robotests
Change-Id: I0e03957532b265c15d5cc0754396aea26e5cd8a1
Merged-In: If42cceb74296814311eb0eff8e26b4a48a1c4d29
2017-05-08 13:37:07 -07:00
jackqdyulei
e407e67a3b Create RestrictedDashboardFragment.
RestrictedDashboardFragment has all the same logic coming from
RestrcitedSettingsFragment but extends from DashboardFragment.
As a result, we could use preferenceController in child class of
RestrictedDashboardFragment.

This cl also make DeviceListPreferenceFragment as child of
RestrictedDashboardFragment, which enfluences the bluetooth page.

Bug: 38041586
Test: Build
Change-Id: I01395d506176c5cc584948478f7ca16c1c7c7045
2017-05-08 13:34:54 -07:00
Fan Zhang
86d4d51b62 Fix PrefCategory layout to align text with actionbar title
Change-Id: I2716a92e2802e3ff01d4e550dae96e689d4370ff
Fix: 38011653
Test: visual
2017-05-08 13:03:46 -07:00
Fan Zhang
8b422ba448 Merge "Remove summary template in sleep timeout setting." into oc-dev am: 014ff46fa6
am: f7ba1e7209

Change-Id: I867a5237475be372bcc183b038c9539a3c4a8087
2017-05-08 19:14:59 +00:00
Svetoslav Ganov
77590cd1fc Merge "Report normalized package name as default key" into oc-dev am: 0560127e9d
am: bf3ad99a38

Change-Id: Id4d90c665262151bc4413a8143cd131c1d069543
2017-05-08 19:14:28 +00:00
Fan Zhang
f7ba1e7209 Merge "Remove summary template in sleep timeout setting." into oc-dev
am: 014ff46fa6

Change-Id: I9f9e924be57552eebfe5d8bff5463182463f6845
2017-05-08 19:08:20 +00:00
Svetoslav Ganov
bf3ad99a38 Merge "Report normalized package name as default key" into oc-dev
am: 0560127e9d

Change-Id: Id09f3e8efd951de0a96a604cab336cef0bdcd265
2017-05-08 19:07:55 +00:00
TreeHugger Robot
014ff46fa6 Merge "Remove summary template in sleep timeout setting." into oc-dev 2017-05-08 18:57:57 +00:00
Svetoslav Ganov
0560127e9d Merge "Report normalized package name as default key" into oc-dev 2017-05-08 18:57:23 +00:00
Svet Ganov
7d3fb0481d Report normalized package name as default key
Test: make RunSettingsRoboTests -j90

bug:36978445

Change-Id: I593de89c4fa4e9c63a86b9844736e38dce30a258
2017-05-08 18:56:47 +00:00
Matthew Fritze
ab0b3f6790 Prevent race conditions after dropping database
Block all loaders from accessing the database
before indexing is complete.

Bug: 37501479
Test: make RunSettingsRoboTests
Change-Id: I2af98dcf6bceacbeffa70bd40879c97bb0cbc828
Merged-In: I02f8423c0ffc27abbb8ceb61a8c47d2f0796d0bb
2017-05-08 18:48:04 +00:00
TreeHugger Robot
fa4f30e09f Merge "Use a SwitchPreference for auto-rotate instead" 2017-05-08 18:22:30 +00:00
Daniel Sheng
e18b787084 Merge "Camera lift preference now saves correctly" 2017-05-08 18:07:05 +00:00
TreeHugger Robot
0ba42b0eac Merge "Use framework pref layout for SwitchPreference" 2017-05-08 17:31:10 +00:00
Amin Shaikh
f577c3250f Merge "Show "Forget" button for ephemeral networks." into oc-dev am: 3f303d5fd8
am: 293a0f003a

Change-Id: Id7c648e3d3b80ff1e983f992c553ef81df964b99
2017-05-08 17:14:51 +00:00
Amin Shaikh
293a0f003a Merge "Show "Forget" button for ephemeral networks." into oc-dev
am: 3f303d5fd8

Change-Id: Ic8c5028ac48b36a03871423cb867518fd5d38dc4
2017-05-08 17:11:48 +00:00
TreeHugger Robot
3f303d5fd8 Merge "Show "Forget" button for ephemeral networks." into oc-dev 2017-05-08 17:07:33 +00:00
Daniel Nishi
708ee39aa7 Merge "Fix Settings crash in Storage settings." into oc-dev am: 816956d249
am: bc628dfdd9

Change-Id: I47b9bd56c6a7bb6f2a640ae067623a4f5395d455
2017-05-08 16:53:21 +00:00