Commit Graph

2547 Commits

Author SHA1 Message Date
TreeHugger Robot
f99922405d Merge "Remove strings for wifi aggressive handover" 2018-01-18 10:59:21 +00:00
TreeHugger Robot
1fc49dc617 Merge "Clean up: remove drawer from root settings layout" 2018-01-18 06:37:27 +00:00
Michael Plass
4cd115aa05 Remove strings for wifi aggressive handover
Bug: 72063774
Test: m RunSettingsRoboTests -j 40
Change-Id: Id5de185870b48a65b2e10106478ac0a9803b2fbc
2018-01-17 17:04:45 -08:00
Fan Zhang
f1c90e54bb Clean up: remove drawer from root settings layout
This doesn't fix the bug about actionbar crash. It's just a cleanup in
the same area.

Bug: 72097389
Test: rebuilds
Change-Id: I5fd3847035c716d935ef9ccef490c074f01431d1
2018-01-17 16:49:23 -08:00
Fan Zhang
0cc6164081 Fix flaky tests caused by WeakReference
Change-Id: I287195a37aeb0ff781420c2839ffff0391942f76
Fixes: 71867776
Test: robotest
2018-01-16 14:31:51 -08:00
TreeHugger Robot
0c154bf670 Merge "Adopt robolectric 3.6.1" 2018-01-10 21:28:41 +00:00
TreeHugger Robot
94bdfdd1ff Merge "Import translations. DO NOT MERGE" 2018-01-10 19:40:27 +00:00
TreeHugger Robot
20c1e5f342 Merge "Remove use of preference-v14 res directory that is removed." 2018-01-10 18:16:24 +00:00
Michael Plass
4422221bd0 Merge "Deprecate WifiManager EXTRA_BSSID, EXTRA_WIFI_INFO" 2018-01-10 16:23:49 +00:00
Bill Yi
7fea03faf8 Import translations. DO NOT MERGE
Change-Id: Id2da745ba565a46818e917d640e59a86eea1afe7
Auto-generated-cl: translation import
2018-01-10 07:28:24 -08:00
jackqdyulei
370551210d Change style for CheckBoxPreference
Bug: 71758308
Test: Screenshot
Change-Id: I6aaacc55aa3eeeed01d9eed1ffc97507a885e202
2018-01-09 12:36:43 -08:00
Aurimas Liutikas
8444c685f2 Remove use of preference-v14 res directory that is removed.
Change-Id: If286158c201b26fc8540a283e9c2ce98b1d0c9ca
Test: None
2018-01-09 00:16:07 +00:00
James Lemieux
0f5bba003b Adopt robolectric 3.6.1
Bug: 71596155
Test: make RunSettingsLibRoboTests
Change-Id: I0f8e538238c42fed89bc4778a6a717f2eddac9b7
2018-01-06 00:28:25 -08:00
TreeHugger Robot
0d2f2d9aae Merge "Bluetooth: Remove strings for enabling inband ringing" 2018-01-05 01:45:14 +00:00
TreeHugger Robot
b5d399c6a3 Merge "Add getSummaryMethod to AbstractPreferenceController" 2018-01-05 00:02:48 +00:00
Jack He
326f1db42c Bluetooth: Remove strings for enabling inband ringing
* As in-band ringing is enabled by default on supported devices, user
  action in development settings should be disabling it instead of
  enabling it
* The new string is added to packages/apps/Settings and the old string
  is hence removed from SettingsLib

Bug: 65383086
Test: make, try toggling the preference and verify in-band ringing's
      behavior
Change-Id: I18858e86f4127f6555cce27d239d2682b6134fe2
2018-01-04 15:49:34 -08:00
Matthew Fritze
3d2fc57a54 Add getSummaryMethod to AbstractPreferenceController
We want a dedicated getSummay method, as summary text
is a fairly important part of the preference framework.

Specifically for preferences with dynamic summaries, having a
method to provide summaries for Slices, and in the future, search
is necessary for correctness.

Change-Id: I435ccab7758d90515583fd8ca10a9b1ef0c858b9
Bug: 71514936
Test: make -j40 RunSettingsRoboTests
2018-01-04 13:47:59 -08:00
TreeHugger Robot
dd312ababe Merge "Move debug log summary to WifiUtils" 2017-12-28 19:24:24 +00:00
Lei Yu
36a6537289 Merge "Read paired device After LocalBtManager is created" 2017-12-22 22:17:28 +00:00
jackqdyulei
9ee9b39eb4 Move debug log summary to WifiUtils
This cl is the first step to clean up the AccessPoint.

Bug: 70983952
Test: RunSettingsLibRoboTests
Change-Id: I23b5b4bee6f4533ea7e59ede3dc9c66af80bf0b6
2017-12-22 11:42:40 -08:00
jackqdyulei
65d113653c Read paired device After LocalBtManager is created
After this cl, it could guarantee that device list always has
saved devices:
1. Even though in onCreate(Fix flaky UI)
2. Even though there is no other bluetooth event to trigger it
(e.g. no device is connecting)

Fixes: 70934171
Fixes: 63910184
Test: Build
Change-Id: Iec628d455690a68d92f201f6eac9cd97b555b2b4
2017-12-22 10:32:44 -08:00
TreeHugger Robot
7ac84ce422 Merge "Move ServiceListing to SettingsLib and add tests" 2017-12-21 19:44:38 +00:00
Tony Mantler
47394cdbb8 Move ServiceListing to SettingsLib and add tests
Bug: 70902607
Test: RunSettingsLibRoboTests
Change-Id: I172092f8c249e76667136442080d5fd7a6a6ef01
2017-12-21 09:49:30 -08:00
TreeHugger Robot
af5bac3d23 Merge "Profile lock timeout." 2017-12-21 13:37:42 +00:00
Michael Plass
702bae490b Deprecate WifiManager EXTRA_BSSID, EXTRA_WIFI_INFO
These extras are no longer sent on the android.net.wifi.STATE_CHANGE broadcast.

Bug: 69974497
Test: Wifi unit tests
Test: Wifi sanity

Change-Id: I5bd6329d3ba822e018965335c7c21dbde5924b9c
2017-12-20 16:36:44 -08:00
Maggie Wang
88ca0d1f36 Merge "Sort "Recent Location Requests" by recency." 2017-12-20 22:31:43 +00:00
Maggie
704c423ca3 Sort "Recent Location Requests" by recency.
The list of apps with recent location requests is currently displayed in
alphabetical order on device (Settings -> Security & Location ->
Location). Sort this list by recency: (1) apps that are currently
requesting location are displayed  on the top. (2) For apps that are not currently
requesting location, the ones with most recent location request finish
time come first.

Bug: 70350519
Test: Robolectric
Test: manual
Change-Id: I5c757defcd7645d254c9c47e3c83f7e323247a71
2017-12-20 13:56:59 -08:00
Joachim Sauer
09ea291ff2 Make getGmtOffsetText public.
Change getGmtOffsetText() from private to public to allow callers more
granular control over generated text.

Bug: 62255208
Test: builds
Change-Id: Idaf602ac20765a21719d4140a6e8ea30dec8672a
2017-12-19 23:36:54 +00:00
TreeHugger Robot
bf90b7c3d4 Merge "Import translations. DO NOT MERGE" 2017-12-19 07:12:23 +00:00
Bill Yi
9b6ee2c3a1 Import translations. DO NOT MERGE
Change-Id: I221002ba36f7421b5f894f4db4ef05ecf5e4e16f
Auto-generated-cl: translation import
2017-12-18 19:44:46 -08:00
Tony Mantler
e105512555 Merge changes from topics "tv-settings-manage-power", "applicationsstate-lifecycle"
* changes:
  Move PowerWhitelistBackend to SettingsLib
  Move ApplicationsState to support lib Lifecycle
2017-12-18 19:45:53 +00:00
James Lemieux
0189ce1b17 Adopt robolectric 3.5.1
Bug: 70581603
Test: make RunSettingsLibRoboTests
Change-Id: I18dd5d74dae0570d2909998a0bab1d812b9f8f6e
2017-12-15 17:49:49 -08:00
Tony Mantler
70676c1c00 Move PowerWhitelistBackend to SettingsLib
Bug: 70716754
Test: RunSettingsLibRoboTests
Change-Id: Ia6f94ff643080499a7631f69b08bc6d525a35162
2017-12-15 15:53:07 -08:00
Tony Mantler
f11c5d4093 Move ApplicationsState to support lib Lifecycle
Bug: 70716628
Test: m -j RunSettingsLibRoboTests
Change-Id: I680a7677c8c33bac45928ca599f06e19ed5cd325
2017-12-15 12:58:34 -08:00
Michael Plass
992588ca30 Fix flaky WifiTrackerTest
The rssiChangeBroadcastShouldUpdateConnectedAp uses two CountDownLatch instances to
synchronize the events on the main thread and the handler thread. The "latch" informs
the main thread that mockWifiManager.getConnectionInfo() has been called and allows it
to proceed, and "mAccessPointsChangedLatch" notes that onAccessPointsChanged is called.
But mAccessPointsChangedLatch was assigned after "latch" released the main thread,
so that on occasion the main thread could try to use it before this assignment, causing
the timeout.

Move the assignment of mAccessPointsChangedLatch to before the body of the test
to prevent this race.

Bug: 70163367
Test: runtest --path frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Change-Id: I62c1ef9a2155ffbd08b5e07e94723b28102d1f6d
2017-12-14 05:44:28 +00:00
TreeHugger Robot
83297f29c0 Merge "Fix WifiTrackerTest stopTrackingShouldRemove . . ." 2017-12-14 01:10:07 +00:00
Philip P. Moltmann
dd87268e33 Merge "Switch to modern ArgumentMatchers" 2017-12-13 23:40:20 +00:00
TreeHugger Robot
f3f422e8dd Merge "Import translations. DO NOT MERGE" 2017-12-13 12:43:40 +00:00
Hemant Gupta
997d559161 Merge "Bluetooth: Add support for PBAP UI preference" am: 045d34ce76 am: cbfae42c3c
am: 3a670c3c04

Change-Id: Iac4dc53ca9c5e3ebdd0b68590de729e7c76d919d
2017-12-13 02:24:30 +00:00
Hemant Gupta
3a670c3c04 Merge "Bluetooth: Add support for PBAP UI preference" am: 045d34ce76
am: cbfae42c3c

Change-Id: I16d491889a4877e6b5b9e602f29d35f83063cf61
2017-12-13 01:56:18 +00:00
Treehugger Robot
045d34ce76 Merge "Bluetooth: Add support for PBAP UI preference" 2017-12-13 00:30:42 +00:00
Bill Yi
46bbcf6cd6 Import translations. DO NOT MERGE
Change-Id: I2085196668d52c99a3536682d5ffc78cbd5b20ad
Auto-generated-cl: translation import
2017-12-12 15:23:49 -08:00
Philip P. Moltmann
68366073e4 Switch to modern ArgumentMatchers
Test: - adb shell am instrument -w -e class com.android.mediaframeworktest.unit.MediaInserterTest com.android.mediaframeworktest/android.support.test.runner.AndroidJUnitRunner
      - atest com.android.settingslib.users.AppRestrictionsHelperTest
      - atest com.android.server.NetworkScorerAppManagerTest com.android.server.accessibility.MotionEventInjectorTest com.android.server.webkit.WebViewUpdateServiceTest
Change-Id: I6d4c543541d3bebcd65e5aa9e3f4d9a0152d5583
2017-12-12 13:06:18 -08:00
Hansong Zhang
57365515d5 Merge "Make BluetoothPbap implement BluetoothProfile (1/3)" am: 5b6b73800c am: 64d81fbf33
am: 9c6044771f

Change-Id: I0390d33d0d56b29e3632a4fe78106fcae4fcfb32
2017-12-12 19:35:42 +00:00
Hansong Zhang
9c6044771f Merge "Make BluetoothPbap implement BluetoothProfile (1/3)" am: 5b6b73800c
am: 64d81fbf33

Change-Id: I1be05324ec0134c801de08e0f60139c341261f33
2017-12-12 19:22:12 +00:00
Treehugger Robot
5b6b73800c Merge "Make BluetoothPbap implement BluetoothProfile (1/3)" 2017-12-12 19:02:25 +00:00
Paul Duffin
4ae4005bde Merge "Remove LOCAL_STATIC_SHARED_LIBRARY usage" am: 60f0b06d19 am: 6ff2ad3044
am: 1c091ba045

Change-Id: I1a6d1130de87ef0a69727a7c7a7950704df47c04
2017-12-12 13:32:38 +00:00
Paul Duffin
1c091ba045 Merge "Remove LOCAL_STATIC_SHARED_LIBRARY usage" am: 60f0b06d19
am: 6ff2ad3044

Change-Id: I7ec4ac17b4fead69b3ffbd754cd3ce33978c64cb
2017-12-12 13:19:26 +00:00
Michael Plass
fd4a90db22 Fix WifiTrackerTest stopTrackingShouldRemove . . .
Fix a race condition in
com.android.settingslib.wifi.WifiTrackerTest#stopTrackingShouldRemoveWifiListenerCallbacks

Bug: 70171301
Test: runtest --path frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Test: repeat the test lots of times - failure rate was < 1% before fix.
Change-Id: Ib9c9cb3dbfb3413484530be5fc0c2e20fd470b97
2017-12-11 22:59:52 +00:00
Hansong Zhang
fef6d81156 Make BluetoothPbap implement BluetoothProfile (1/3)
* BluetoothPbap will implement BluetoothProfile to be consistent with
other profiles
* Changed the method names to match the BluetoothProfile method
signatures
* Removed doesClassMatchSink() as it is never used
* Disable default DEBUG logs

Test: test with carkits
Bug: 69417672
Change-Id: I0766188f77468808d7505780c781f5fd8608af60
2017-12-11 13:36:45 -08:00