Commit Graph

27690 Commits

Author SHA1 Message Date
Bonian Chen
b61f54519b Merge "IMS: Grey out Wifi calling option when either sub is having call." am: 262b4f7434
am: 37e02742a4

Change-Id: I81eac0ecd2948e7b5bd6b92ae90b349ab46675e7
2019-11-26 17:49:06 -08:00
Bonian Chen
37e02742a4 Merge "IMS: Grey out Wifi calling option when either sub is having call."
am: 262b4f7434

Change-Id: I59a18265dc053386854c6c4b4b30e90c287b34e8
2019-11-26 17:46:38 -08:00
Bonian Chen
262b4f7434 Merge "IMS: Grey out Wifi calling option when either sub is having call." 2019-11-27 01:35:23 +00:00
Bonian Chen
42eec15834 Merge "[Setting] Fix merge conflict" am: 67805d8e5e
am: ec4e1a14e0

Change-Id: I716436a78316eb111fa53bb6834d81934f7830f1
2019-11-26 02:11:19 -08:00
Bonian Chen
ec4e1a14e0 Merge "[Setting] Fix merge conflict"
am: 67805d8e5e

Change-Id: Ie7f67b9a80efdceb1e3c5fd3054dd4eb71c4dcd8
2019-11-26 02:02:03 -08:00
Bonian Chen
67805d8e5e Merge "[Setting] Fix merge conflict" 2019-11-26 08:45:05 +00:00
Raff Tsai
14990a1901 Merge "Prevent null point exception" am: 45b03edd00
am: bfa1f2979e

Change-Id: Ib0afc6d71113b52fc63caf5b960ca7239a5c364c
2019-11-26 00:04:15 -08:00
Raff Tsai
bfa1f2979e Merge "Prevent null point exception"
am: 45b03edd00

Change-Id: Ifbcf83606e115cb1a759382b38949f49af4e4112
2019-11-26 00:02:27 -08:00
Bonian Chen
dfba6f8720 [Setting] Fix merge conflict
Fix merge conflict for I367ae3a5f97ff92e03312bed6fe37727ae3798ab

Bug: 144960427
Test: build pass
Change-Id: I24d684b4e695e8ab777f2ba7811b93f6028260d9
Merged-In: I5dfb71ceb87a8f658ef7fbceacf460ef8d35593a
2019-11-26 07:20:30 +00:00
Raff Tsai
0e8a45a7f5 Prevent null point exception
Test: Settings -> click search bar, not seeing null point exception
Change-Id: Ib9df9d97b374246fa36c79f531760b57d7c6c508
2019-11-26 12:05:58 +08:00
Bonian Chen
8efd95c413 Merge "[Settings] Fix conflict of AOSP merge on wifi call" am: 95e1c8d099
am: d7f0fb6cc1

Change-Id: Ic6268671ff092174866dbd6341a9d7113bd2a4bd
2019-11-25 05:53:45 -08:00
Bonian Chen
d7f0fb6cc1 Merge "[Settings] Fix conflict of AOSP merge on wifi call"
am: 95e1c8d099

Change-Id: Ia69e14def5abf09d286d20f7922ea6900e9d61f1
2019-11-25 05:43:18 -08:00
Pooja Jain
812f8e9065 IMS: Grey out Wifi calling option when either sub is having call.
The WifiCallingSettingsForSub was not checking for call state reported
by telephony manager, hence, when call was on other sub, the option was not
getting greyed out.
Use the TelephonyManager API to fetch callstate.

Test: Manual

Bug: 130706399
Change-Id: Ib4b0e1191c83e23377ccf8ed013252728ef9dd95
2019-11-25 12:10:03 +05:30
Jay Aliomer
c2302a3d93 Merge "Revert "Revert "Add settings for scheduling dark theme""" into qt-qpr1-dev
am: 26ce6885c9

Change-Id: If216838715772b9d45624e77213ec81f0c84bd60
2019-11-22 14:42:52 -08:00
Jay Aliomer
53ad4fedc6 Revert "Revert "Add settings for scheduling dark theme""
This reverts commit 50c0fa136c.

Reason for revert: Fixed the error which is code incompatibility
Test: run all settings tests
Change-Id: I8f05b50f8198c4b2565bb9b6f62ddda5029c8365
Merged-In: I8f05b50f8198c4b2565bb9b6f62ddda5029c8365
Bug: 141567787
2019-11-22 20:58:23 +00:00
Bonian Chen
cacf047daa [Settings] Fix conflict of AOSP merge on wifi call
Merge for fixing conflict of Ib4b0e1191c83e23377ccf8ed013252728ef9dd95

Bug: 144960427
Test: build pass
Change-Id: I2979a9a2ee1bc690486e25b7d470cf905cf02d17
Merged-In: Idb063bdab3d3b11c348804c1c0ecb268cca3068e
2019-11-22 20:38:13 +00: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
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
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
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
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
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