Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,005 Commits 1 Branch 0 Tags
14990a19015ebff77429161e75afd9ee5fc25127
Commit Graph

55005 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
45b03edd00 Merge "Prevent null point exception" 2019-11-26 07:10:47 +00: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
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
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
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
Bonian Chen
95e1c8d099 Merge "[Settings] Fix conflict of AOSP merge on wifi call" 2019-11-25 03:07:16 +00:00
Bill Yi
5dd4272ee4 Import translations. DO NOT MERGE 
Change-Id: I0258ef130ec225a374ae445da558755f621556d0
Auto-generated-cl: translation import
 2019-11-24 04:38:04 -08:00
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
26ce6885c9 Merge "Revert "Revert "Add settings for scheduling dark theme""" into qt-qpr1-dev 2019-11-22 22:29:43 +00: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
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