Commit Graph

35941 Commits

Author SHA1 Message Date
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
jackqdyulei
0dce3c0764 Add framework for anomaly detection flags
This cl adds isAnomalyDetectorEnabled(type), which decides whether
to turn on specific check with that type.

Added method is used in AnomalyLoader.

Bug: 36924669
Test: RunSettingsRoboTests
Change-Id: I71c6acb1c58c24453a1936c5c36f59fe4e86cfd4
2017-05-08 14:19:09 -07:00
Daniel Nishi
24077d899f Add the badged icon for Movies & TV.
The work profile was missing the icon.

Change-Id: I005cc2baecfe86479156e19e0c4ec4b586336cff
Fixes: 38132211
Test: Settings robotest
2017-05-08 14:13:13 -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
Matthew Fritze
7ae3c078b6 Remove accessibility duplicates in settings search
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I46e79051d10c4cae851f8e76304e6cfe0a3f73d4
Merged-In: Idda6d2f98cb8d2cb91a9a4721b2ef84921f9056a
2017-05-08 18:34:43 +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
Daniel Nishi
bc628dfdd9 Merge "Fix Settings crash in Storage settings." into oc-dev
am: 816956d249

Change-Id: I3bd38a5cd716df4d4c91ab762870ad74c626de6d
2017-05-08 16:50:17 +00:00
Daniel Nishi
816956d249 Merge "Fix Settings crash in Storage settings." into oc-dev 2017-05-08 16:45:07 +00:00
Fan Zhang
670410c04e Use a SwitchPreference for auto-rotate instead
- Change the UI to SwitchPreference
- Remove old string used by DropDownPreference
- Attach listener to monitor setting change

Change-Id: If42cceb74296814311eb0eff8e26b4a48a1c4d29
Fix: 35959797
Test: robotests
2017-05-06 10:42:37 -07:00
Fan Zhang
e1c68df27e Use framework pref layout for SwitchPreference
Test: manual
Change-Id: Id9add8d5669cbb34e93c9bfd2e25e75d9cc56a56
2017-05-06 09:43:25 -07:00
nharold
87dd45a3f1 Merge "Update references to use PhoneConstantConversion" am: 79694e79d1 am: 98f209c6e5 am: 2e4950879a
am: d460c1a6b3

Change-Id: Icdb6c3cb600a65189ce0e7f7dd27a9fe975feb8e
2017-05-06 03:26:23 +00:00
nharold
d460c1a6b3 Merge "Update references to use PhoneConstantConversion" am: 79694e79d1 am: 98f209c6e5
am: 2e4950879a

Change-Id: I656450f32a00f9a761a6d0069d2f3c59b729e0f5
2017-05-06 02:55:47 +00:00
Fan Zhang
db6380973a Merge "Fix crash when there is no emergencybroadcast app on device" into oc-dev am: 4f5b13f97a
am: 779548122b

Change-Id: Ie1f2b075461dc0546cb1cfe2149cbda6254a33af
2017-05-06 02:48:38 +00:00
Fan Zhang
779548122b Merge "Fix crash when there is no emergencybroadcast app on device" into oc-dev
am: 4f5b13f97a

Change-Id: I7166624e96ed82f523545f390457661dfb7c3d42
2017-05-06 02:46:38 +00:00
TreeHugger Robot
4f5b13f97a Merge "Fix crash when there is no emergencybroadcast app on device" into oc-dev 2017-05-06 02:42:38 +00:00
nharold
2e4950879a Merge "Update references to use PhoneConstantConversion" am: 79694e79d1
am: 98f209c6e5

Change-Id: I5c7760471d2e48df20955122507b503ca546954e
2017-05-06 02:07:30 +00:00
nharold
98f209c6e5 Merge "Update references to use PhoneConstantConversion"
am: 79694e79d1

Change-Id: I809133a80c00b932b00637920f2c4c89a5a69a22
2017-05-06 01:57:56 +00:00
nharold
79694e79d1 Merge "Update references to use PhoneConstantConversion" 2017-05-06 01:45:37 +00:00
Roozbeh Pournader
16db0413f1 Merge "Fix bidi direction of dialog and bidi-wrap service name" into oc-dev am: 869d246021
am: 6b06aa1099

Change-Id: I3db0d2e88659b4cd1822a368845b9179521a69e6
2017-05-06 01:41:43 +00:00
Roozbeh Pournader
6b06aa1099 Merge "Fix bidi direction of dialog and bidi-wrap service name" into oc-dev
am: 869d246021

Change-Id: Idb17d5f38526c926ddf2d0ca55d30f806c52d574
2017-05-06 01:39:29 +00:00
TreeHugger Robot
869d246021 Merge "Fix bidi direction of dialog and bidi-wrap service name" into oc-dev 2017-05-06 01:34:47 +00:00