Commit Graph

57138 Commits

Author SHA1 Message Date
TreeHugger Robot
dff37d694d Merge "Minor code simplification." 2019-11-27 07:24:51 +00:00
TreeHugger Robot
190860a35e Merge "Focus remains on the button after turning on/off" 2019-11-27 05:01:09 +00:00
Bonian Chen
a6a4fb2c37 Merge "IMS: Grey out Wifi calling option when either sub is having call." am: 262b4f7434 am: 37e02742a4
am: b61f54519b

Change-Id: Ia60aa3828cb0b4a28e72ae43fb47a09982ae0b5f
2019-11-26 17:51:38 -08:00
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
Roshan Pius
9f5fc3c6da Merge "Revert "Settings(wifi): Allow mainline wifi stack to use network request dialog"" 2019-11-26 19:22:18 +00:00
Jay Aliomer
c6dec5780a Merge "Fix Master: Add settings for scheduling dark theme" 2019-11-26 15:44:20 +00:00
Beverly
a30cb1158f Focus remains on the button after turning on/off
Test: manually test talkback
Fixes: 145181672
Change-Id: I16ceb81dd686e4a18354dfd464c7683ba94df79d
2019-11-26 15:37:42 +00:00
Alan Stokes
86cc060515 Minor code simplification.
Test: atest VerifyAppsOverUsbPreferenceControllerTest
Bug: 135751498
Change-Id: I51696147a211792e53cc6178e0912c760d667034
2019-11-26 11:39:22 +00:00
TreeHugger Robot
66b82d06ab Merge "Add new bit per sample dialog layout for new Bluetooth developer option" 2019-11-26 10:44:04 +00:00
Bonian Chen
573cda658e [automerger skipped] Merge "[Setting] Fix merge conflict" am: 67805d8e5e am: ec4e1a14e0
am: 42eec15834 -s ours
am skip reason: change_id I5dfb71ceb87a8f658ef7fbceacf460ef8d35593a with SHA1 0f844d168b is in history

Change-Id: I8254182adcae306506742d4f67cc03a1465c3293
2019-11-26 02:14:42 -08: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
TreeHugger Robot
50eb686fbd Merge "Add new LDAC quality dialog layout for new Bluetooth developer option" 2019-11-26 09:39:26 +00:00
Bonian Chen
67805d8e5e Merge "[Setting] Fix merge conflict" 2019-11-26 08:45:05 +00:00
Raff Tsai
8f962122a7 Merge "Prevent null point exception" am: 45b03edd00 am: bfa1f2979e
am: 14990a1901

Change-Id: I5ef5583fb0c1a0943941a378d4421bedec703371
2019-11-26 00:07:40 -08: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
TreeHugger Robot
1590910490 Merge "Add FutureTask approach in DashboardFragment" 2019-11-26 07:22:53 +00: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
Treehugger Robot
45b03edd00 Merge "Prevent null point exception" 2019-11-26 07:10:47 +00:00
Bonian Chen
1a359b5b22 Merge "[Settings] Fix test case" am: 9d66571966 am: 1aac3bb569
am: 5b6dcf42af

Change-Id: Ia68856654d377c38444299282a7d4e1bb5c4c6e5
2019-11-25 21:48:54 -08:00
Bonian Chen
5b6dcf42af Merge "[Settings] Fix test case" am: 9d66571966
am: 1aac3bb569

Change-Id: I699e94aef7180509ca1f8bf4dd8d4f6ade7413fd
2019-11-25 21:46:21 -08:00
Bonian Chen
1aac3bb569 Merge "[Settings] Fix test case"
am: 9d66571966

Change-Id: Ieea99bd4da19962a6d7bd826b6678168e755cf2f
2019-11-25 21:43:52 -08:00
Bonian Chen
9d66571966 Merge "[Settings] Fix test case" 2019-11-26 05:32:00 +00:00
Bonian Chen
747e7e1fa2 Merge "[Settings] Re-enable test case" 2019-11-26 05:31:39 +00:00
Raff Tsai
468a8c79f7 Merge "Remove shadow below the actionbar" 2019-11-26 05:31:36 +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
Sunny Shao
3351c78b74 Add FutureTask approach in DashboardFragment
- Use the multiple tasks to enhance the controllers loading.

Bug: 137558156
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.dashboard
Change-Id: I629ff5dc81347cddf9762a87015b9b86b6a46e50
2019-11-26 11:27:03 +08:00
Raff Tsai
290aa7345b Remove shadow below the actionbar
Bug: 141601408
Test: manual
Change-Id: Iaa196ff3b67dbc274116b5215ef48e126099edb9
2019-11-26 11:20:52 +08:00
Jay Aliomer
a377b5c4aa Fix Master: 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: Iee5d020ac6ea093be712a4f191d4601c9d4617fa
2019-11-25 18:03:29 -05:00
Bill Yi
01cf29b958 [automerger skipped] Import translations. DO NOT MERGE am: 5dd4272ee4 -s ours
am: 2245b41b31 -s ours
am skip reason: subject contains skip directive

Change-Id: If89fcb13087b6a6c27bbc9e35b77e435b35b24f7
2019-11-25 08:30:37 -08:00
Bonian Chen
a72ff6f7ff [automerger skipped] Merge "[Settings] Fix conflict of AOSP merge on wifi call" am: 95e1c8d099 am: d7f0fb6cc1
am: 8efd95c413 -s ours
am skip reason: change_id Idb063bdab3d3b11c348804c1c0ecb268cca3068e with SHA1 2aafbd38e7 is in history

Change-Id: I55c5c96a2855c56bbc8c3dc46a0afea5909aafbf
2019-11-25 08:26:00 -08:00
Jay Aliomer
b85bd3c15a [automerger skipped] Merge "Revert "Revert "Add settings for scheduling dark theme""" into qt-qpr1-dev am: 26ce6885c9
am: c2302a3d93 -s ours
am skip reason: change_id I8f05b50f8198c4b2565bb9b6f62ddda5029c8365 with SHA1 abf06340cb is in history

Change-Id: I59a988a34d06d6f6a64f3c207b907726f4a7dade
2019-11-25 08:17:29 -08:00
Bill Yi
887de07ffa [automerger skipped] Import translations. DO NOT MERGE am: adfc51a550 -s ours
am: 0014dd2d63 -s ours
am skip reason: subject contains skip directive

Change-Id: I3fdb30af2db3035e4e4a39f4e72e0cf3f950765f
2019-11-25 08:12:33 -08:00
Bill Yi
2245b41b31 [automerger skipped] Import translations. DO NOT MERGE
am: 5dd4272ee4 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibb0fffe0070fe272970636fa012c26900ad4e3e1
2019-11-25 07:32:53 -08:00
Andrei-Valentin Onea
da820e2289 Merge "Add compatibility change preference" am: 0e7b8f7a93 am: 5f2ee93a4b
am: 555425a990

Change-Id: Ifd5e10c2aab269ca67356f68d1adcfeda0938f66
2019-11-25 07:19:21 -08:00
Bonian Chen
9ef7aa1cde [Settings] Re-enable test case
Re-enable MobileNetworkActivityTest

Bug: 144664534
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkActivityTest
Change-Id: I39f96f549b711a628d02d7b112964c851a43bd6f
2019-11-25 22:54:32 +08:00
Bonian Chen
6c25c29464 [Settings] Fix test case
Change annotation library

Bug: 144664534
Test: build pass
Change-Id: Iffafc3a9a7dadc961d180c6a1ef2764c8d72eb2f
2019-11-25 22:28:22 +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
Raff Tsai
056e99b053 Merge "Remove unused string" 2019-11-25 13:09:34 +00:00
Alan Stokes
3596aeeca7 Merge "Stop relying on PACKAGE_VERIFIER_ENABLE." 2019-11-25 11:27:51 +00:00
TreeHugger Robot
fbc8bbf870 Merge "Fix crash while lauching location settings" 2019-11-25 10:10:49 +00:00
TreeHugger Robot
901ba391d3 Merge "[Wi-Fi] Fix unit test fails" 2019-11-25 08:33:35 +00:00
Tsung-Mao Fang
9c8a1b0db9 Fix crash while lauching location settings
Use a regular drawable icon instead.

Change-Id: I53e437c8f68eed1ea64e6fed30c1823c7807d0bf
Fix: 144578394
Test: Rebuild
2019-11-25 16:09:00 +08:00
Arc Wang
0614a7d1ea [Wi-Fi] Fix unit test fails
Bug: 144405885
Test: WifiSettingsTest
      WifiSettings2Test
      WifiDetailPreferenceControllerTest
      WifiDetailPreferenceController2Test

Change-Id: Ib6a34364c3eb47d59a153f07e31c9cddddcf1f8a
2019-11-25 14:46:03 +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
Raff Tsai
2229585e88 Refactor LocationSettings
- Extends BasePreferenceController in LocationBasePreferenceController
which binds preference key based on xml file instead of writing the key
in java code. Then the controller can be used in many xmls.
- Modify LocationServicePreferenceController to support only personal or
profile user.

Bug: 141601408
Test: manual, robolectric
Change-Id: I51ee950dfb87474df84a8dc3db55fb911edcf599
2019-11-25 13:11:12 +08:00