Bill Yi
0014dd2d63
[automerger skipped] Import translations. DO NOT MERGE
...
am: adfc51a550
-s ours
am skip reason: subject contains skip directive
Change-Id: Ieddaa832f55b0414da39936c058b95c31d7b3aca
2019-11-22 12:05:37 -08:00
Bill Yi
adfc51a550
Import translations. DO NOT MERGE
...
Change-Id: I64d2c2f4a3053bf7d163962d8a27929fd055b24b
Auto-generated-cl: translation import
2019-11-22 10:44:01 -08:00
Andrei-Valentin Onea
555425a990
Merge "Add compatibility change preference" am: 0e7b8f7a93
...
am: 5f2ee93a4b
Change-Id: I04714e52df6c5e967af744d584f5d2db38cb5680
2019-11-22 06:12:52 -08:00
Andrei-Valentin Onea
5f2ee93a4b
Merge "Add compatibility change preference"
...
am: 0e7b8f7a93
Change-Id: Ied50da0e1cdda7c390603f184ae614dd8584025b
2019-11-22 06:06:39 -08:00
Andrei-Valentin Onea
0e7b8f7a93
Merge "Add compatibility change preference"
2019-11-22 13:02:45 +00:00
Bonian Chen
3f413f1a17
[automerger skipped] Merge "[Settings] Fix conflict of AOSP merge" am: 56385ed9f8
-s ours
...
am: 88594b8bf7
-s ours
am skip reason: change_id I7a86395c86d31fe2ba54c04ac16b1a0ebfc843f3 with SHA1 c7c84d2c87
is in history
Change-Id: I62b7db5b6b08a48b90c3a23f1d72cb97f36a085f
2019-11-22 01:16:57 -08:00
Bonian Chen
88594b8bf7
[automerger skipped] Merge "[Settings] Fix conflict of AOSP merge"
...
am: 56385ed9f8
-s ours
am skip reason: change_id I7a86395c86d31fe2ba54c04ac16b1a0ebfc843f3 with SHA1 c7c84d2c87
is in history
Change-Id: Ifaf20e18a9c5e9e8a890b4d3ffa5040c624dc0dd
2019-11-22 01:13:28 -08:00
Bonian Chen
56385ed9f8
Merge "[Settings] Fix conflict of AOSP merge"
2019-11-22 09:05:29 +00:00
Hai Shalom
59185d0931
Merge "Revert submission" into qt-qpr1-dev
...
am: 775106e40d
Change-Id: I90ea8783da54caf1f3e140b7eb768129d8332f61
2019-11-21 19:57:51 -08:00
Hai Shalom
775106e40d
Merge "Revert submission" into qt-qpr1-dev
2019-11-22 03:46:02 +00:00
Bonian Chen
821a1259e7
[Settings] Fix conflict of AOSP merge
...
Merge for fixing conflict of Ib4b0e1191c83e23377ccf8ed013252728ef9dd95
Bug: 144960427
Test: build pass
Change-Id: I0e8c9b060f23547cec541819e657fc5560d6312c
Merged-In: I7a86395c86d31fe2ba54c04ac16b1a0ebfc843f3
2019-11-22 02:36:11 +00:00
Hai Shalom
40e7c05e53
Revert submission
...
Reason for revert: Incomplete fix that causes additional issues which were not anticipated earlier.
Change-Id: I65868205cc8241f8179006256e6e13698ad79d64
Merged-In: I5f3a6e31dc96fbc016e6ab5f56c3c68eb9e7723f
2019-11-21 23:09:22 +00:00
Preston O'Neal
1a67e3048e
Merge "Revert "Add settings for scheduling dark theme"" into qt-qpr1-dev
...
am: a3e26f10f2
Change-Id: I3ab3f5c219789a2b48d90607c17188e634e0c448
2019-11-21 15:01:23 -08:00
Preston O'Neal
a3e26f10f2
Merge "Revert "Add settings for scheduling dark theme"" into qt-qpr1-dev
2019-11-21 22:41:18 +00:00
Preston O'Neal
50c0fa136c
Revert "Add settings for scheduling dark theme"
...
This reverts commit 7141b142df
.
Reason for revert: This is breaking builds on git_qt-qpr1-dev
Change-Id: I7766826d3fc86a12fc8411b027a52eceb5a66019
2019-11-21 22:09:53 +00:00
Jay Aliomer
29c4d02b92
Merge "DarkUIPreferenceController null exception" into qt-qpr1-dev
...
am: 48f4e5722e
Change-Id: I7877502602c34080d2ac2e93fb14c66b93b7cff9
2019-11-21 13:49:25 -08:00
Jay Aliomer
204b82e2e7
Add settings for scheduling dark theme
...
am: 7141b142df
Change-Id: Ib58ca2eceaea6638e29028126c377802cac9df1d
2019-11-21 13:48:14 -08:00
Jay Aliomer
48f4e5722e
Merge "DarkUIPreferenceController null exception" into qt-qpr1-dev
2019-11-21 21:44:41 +00:00
Jay Aliomer
d385f524f0
DarkUIPreferenceController null exception
...
The DarkUIPreferenceController doesnt need to show dialog in all cases
we added a null check for mFragment
Fixes: 144899194
Test: atest DarkUIPreferenceControllerTest
Change-Id: Ia5ed89bd46f28f4b92d955911223f9157e55c622
(cherry picked from commit c49f266af0
)
2019-11-21 20:07:34 +00:00
Jay Aliomer
7141b142df
Add settings for scheduling dark theme
...
Adding a settings page similar to night light for Dark theme. it will allow the user to schedule
dark mode from sunrise to sunset
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.DarkUIPreferenceControllerTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeActivationPreferenceControllerTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeObserverTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeScheduleSelectorControllerTest"
Fixes: 141567787
Change-Id: I3094b655c04f59c23a95162a1be5ee8260e28a48
(cherry picked from commit 0828e6be9c
)
2019-11-21 20:07:24 +00:00
Andrei Onea
486fd49e87
Add compatibility change preference
...
Add UI for modifying the compatibility change overrides per-app.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=PlatformCompatDashboardTest
Bug: 138280620
Change-Id: I07c7602e7a439e47b0b1fa59b047231afbbc0ab6
2019-11-21 11:48:07 +00:00
Bonian Chen
04b12dd0ae
Merge "[Settings] Fix robotest build breakage" am: 6c9b9f41d6
...
am: 635c2fa095
Change-Id: I2bbd23c7600dc608abd42cb350324cd42cecc00f
2019-11-20 19:14:51 -08:00
Bonian Chen
635c2fa095
Merge "[Settings] Fix robotest build breakage"
...
am: 6c9b9f41d6
Change-Id: I0b52f783c5dd46a06ebfb0a51650666c0e52b961
2019-11-20 19:11:18 -08:00
Bonian Chen
6c9b9f41d6
Merge "[Settings] Fix robotest build breakage"
2019-11-21 02:56:12 +00:00
James Mattis
c03a31c46f
Merge "Swap param order in registerSoftApCallback" am: 76632c01fd
...
am: 1f3415f36e
Change-Id: I67839045cc59d0b8d17da228d0a8c81d1fb09151
2019-11-20 10:40:15 -08:00
James Mattis
1f3415f36e
Merge "Swap param order in registerSoftApCallback"
...
am: 76632c01fd
Change-Id: Id33581fd71070e23a561ca34e76f0623d66e2852
2019-11-20 10:32:44 -08:00
James Mattis
76632c01fd
Merge "Swap param order in registerSoftApCallback"
2019-11-20 18:16:53 +00:00
Bonian Chen
4a1dbccac6
[Settings] Fix robotest build breakage
...
Add annotation library into test build
Bug: 144810473
Test: build pass
Change-Id: Idb4e056fb73a349ac268e5d2292a31fe7d9a6642
2019-11-20 23:05:55 +08:00
Sunny Shao
e565a793be
Merge "Add a dark theme slice" into qt-qpr1-dev
...
am: 713143df37
Change-Id: Ie026d122cb1aedd629d2860143aace2bdd599ae9
2019-11-18 17:38:13 -08:00
TreeHugger Robot
713143df37
Merge "Add a dark theme slice" into qt-qpr1-dev
2019-11-19 01:26:30 +00:00
Hai Shalom
c000b55634
Merge "[WPA3] Hide connect button for cloned networks not in range" into qt-qpr1-dev
...
am: fae6ecbbae
Change-Id: I3095e0b07fb5cc89388e3b8f5b2ad766a82fb4bf
2019-11-18 13:47:04 -08:00
Hai Shalom
fae6ecbbae
Merge "[WPA3] Hide connect button for cloned networks not in range" into qt-qpr1-dev
2019-11-18 21:29:41 +00:00
James Mattis
def3e9f734
Swap param order in registerSoftApCallback
...
Moving executor to be the first argument in registerSoftApCallback.
Bug: 144379300
Test: Manually on pixel 3
Change-Id: I5563c1059cc04014a0fd909e2508f7bf497d708e
Merged-In: I5563c1059cc04014a0fd909e2508f7bf497d708e
2019-11-18 13:16:34 -08:00
Yi-Ling Chuang
f161823c01
Merge "Fix non responding slice toggling" into qt-qpr1-dev
...
am: 80972abd63
Change-Id: I7c1afdf75d554d26c9c78e60d3f3affd93229791
2019-11-15 19:04:44 -08:00
TreeHugger Robot
80972abd63
Merge "Fix non responding slice toggling" into qt-qpr1-dev
2019-11-16 02:04:24 +00:00
Hai Shalom
36b3d9b8cf
[WPA3] Hide connect button for cloned networks not in range
...
Cloned networks are WPA2 or Open networks that have a WPA3 or OWE
cloned networks with the same SSID and credentials. When an AP
in transition mode is in the area, the scan results will only
report the higher security level. In order to prevent a case
where the user forcely connects to the AP with the lower security,
disable this option for those networks. Otherwise, it will look
that Wi-Fi is connected, but Wi-Fi picker will not show a connected
network.
Bug: 143843364
Test: Manual test
Change-Id: Id002b109bd056105ec8335acd298fa3b314c73f3
Merged-In: I7244c41d3bf12ba573c3cfca077d0ac2cfdcf5ed
2019-11-16 01:45:58 +00:00
James Mattis
9df1e7db67
Merge "SoftApCallback using executor vs handler" am: 60bd816476
...
am: ff7d499b18
Change-Id: Ifa47abf1b3c0243cf9212006ef54d8190087dc87
2019-11-15 15:43:50 -08:00
James Mattis
ff7d499b18
Merge "SoftApCallback using executor vs handler"
...
am: 60bd816476
Change-Id: Ie1fa6d76883ed5ee1a9e4390637a8f514e4cdbdf
2019-11-15 15:35:43 -08:00
James Mattis
60bd816476
Merge "SoftApCallback using executor vs handler"
2019-11-15 23:17:54 +00:00
Bill Yi
6a4c0e3676
[automerger skipped] Import translations. DO NOT MERGE
...
am: 60f2a277e0
-s ours
am skip reason: subject contains skip directive
Change-Id: I5b331db1e6443cf5ddf38fbaf98b7f8d454fb262
2019-11-15 14:16:29 -08:00
Bill Yi
60f2a277e0
Import translations. DO NOT MERGE
...
Change-Id: I8c576fcd3e758334750e0fa24253cff9ee95466b
Auto-generated-cl: translation import
2019-11-15 12:09:15 -08:00
Hunter Knepshield
b0b539946f
Merge "Synced the code from master branch" am: 64efbe1240
...
am: 418ef9973e
Change-Id: I430b9c45d007de822c87733b1eb4fc71b36ff23c
2019-11-15 10:54:38 -08:00
Hunter Knepshield
418ef9973e
Merge "Synced the code from master branch"
...
am: 64efbe1240
Change-Id: I042c2bb85876bf67acc98113f01186e831adeae5
2019-11-15 10:45:58 -08:00
Hunter Knepshield
64efbe1240
Merge "Synced the code from master branch"
2019-11-15 18:19:06 +00:00
Sunny Shao
abcbc79d7d
Add a dark theme slice
...
Fixes: 142476879
Test: make RunSettingsGoogleRoboTests -j ROBOTEST_FILTER=com.android.settings.homepage.contextualcards.slices.DarkThemeSliceTest
Change-Id: I4865c3c4a807bc4ac96762a882b193a3e2595019
2019-11-15 13:41:49 +08:00
Sunny Shao
f3865e9264
Synced the code from master branch
...
Fixes: 144364245
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.deviceinfo.PhoneNumberPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.deviceinfo.simstatus.SimStatusDialogControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony.RenameMobileNetworkDialogFragmentTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.homepage.contextualcards.deviceinfo.DeviceInfoSliceTest
Change-Id: Ibb26f5a63a969b28915a226a0197bc4033c91346
Merged-In: I5dfb71ceb87a8f658ef7fbceacf460ef8d35593a
2019-11-14 21:57:12 +08:00
James Mattis
90c23d2fe7
SoftApCallback using executor vs handler
...
Updating classes to support making SoftApCallback methods available to @SystemAPI including
the API for registration of a SoftApCallback which includes a change to
now use executor vs handler.
Bug: 143564153
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherPreferenceControllerTest
Also tested manually on a Pixel 3.
Change-Id: I952ad10dd88b7d97b3cd86b269b8f67b00b1fa15
Merged-In: I952ad10dd88b7d97b3cd86b269b8f67b00b1fa15
2019-11-13 21:39:26 -08:00
Jason Chiu
21e8231523
Fix Settings creating too many threads unexpectedly
...
am: 48a0ff4304
Change-Id: I28068c2c68bffd0d97c1286df4f034a1f4a9825d
2019-11-13 09:40:13 -08:00
James Mattis
1a71177bc8
Merge "Support for hotspot client visibility." am: 2b7c8937de
...
am: 24546e531f
Change-Id: Ie04b18cbf7f9d640cf314f427381ebd102c40d5e
2019-11-13 08:58:40 -08:00
James Mattis
24546e531f
Merge "Support for hotspot client visibility."
...
am: 2b7c8937de
Change-Id: Ib52bd8e9fa9a2affdd02771c1f64e86297c50458
2019-11-13 08:53:37 -08:00