Preston O'Neal
a8ebfe6d75
Merge "Revert "Add settings for scheduling dark theme"" into qt-qpr1-dev am: a3e26f10f2
...
am: 1a67e3048e
Change-Id: Ice680ada896b5b0d954e7e4b0c6318a9adfd23d0
2019-11-24 04:57:03 -08:00
Jay Aliomer
1d69613ac1
Merge "DarkUIPreferenceController null exception" into qt-qpr1-dev am: 48f4e5722e
...
am: 29c4d02b92
Change-Id: I6b79b52853605052e08aa744d8f612a2c35d0eba
2019-11-24 04:56:47 -08:00
Jay Aliomer
0c5b37d602
[automerger skipped] Add settings for scheduling dark theme am: 7141b142df
...
am: 204b82e2e7
-s ours
am skip reason: SHA1 204b82e2e7
skipped by user beverlyt
Change-Id: If99426f192005bc1d1a7a430aa6d3c9ef14b8f61
2019-11-24 04:50:16 -08:00
Bill Yi
40785974b5
Merge "Import translations. DO NOT MERGE"
2019-11-22 20:33:46 +00:00
Jay Aliomer
abf06340cb
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: I3094b655c04f59c23a95162a1be5ee8260e28a48
2019-11-22 19:15:12 +00:00
Bill Yi
e3655b3a78
Import translations. DO NOT MERGE
...
Change-Id: Ic2795d74051ea90315a4e74a3de2ef73af8ee049
Auto-generated-cl: translation import
2019-11-22 09:28:51 -08:00
Raff Tsai
6c45ef5328
Merge "Fix navigation to wrong page"
2019-11-22 13:10:19 +00:00
Goven Liu
a9ba39fb16
Merge "[Wi-Fi] Add basic UI structure for adding Wi-Fi for apps feature."
2019-11-22 11:21:07 +00:00
Raff Tsai
be39426d08
Fix navigation to wrong page
...
- Copies fragment argument and pass it to child fragments
Fixes: 144949171
Test: manual
Change-Id: I301d84535d40ad711e0e64d260c3d0d3a98c0314
2019-11-22 17:49:21 +08:00
govenliu
d507b56ad1
[Wi-Fi] Add basic UI structure for adding Wi-Fi for apps feature.
...
Add following changes:
1. Add intent receiver.
2. Add panel UI with icon, title, summary.
3. Add two buttons (save and cancel).
4. Add test case for activity and fragment
Bug: 136472483
Test: Add following test cases for checking button and package name in activity and fragment.
1. AddAppNetworksActivityTest
2. AddAppNetworksFragmentTest
Change-Id: I5515a96fa3feb0e3e6d68159b2c0dec0894c15ee
2019-11-22 17:02:59 +08:00
Raff Tsai
2037d57405
Change string character limit
...
Fixes: 129708436
Test: build pass
Change-Id: I50d6a696bcc6a9b88491af1369cc942510238b73
2019-11-22 13:10:41 +08:00
TreeHugger Robot
d7ba70ee54
Merge "Revert submission"
2019-11-22 01:42:21 +00:00
TreeHugger Robot
632958cfb0
Merge "Remove DEVICE_OUT_ALL_SCO."
2019-11-22 00:52:24 +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
Hai Shalom
979b95777a
Revert submission
...
Reason for revert: Incomplete fix that causes additional issues which were not anticipated earlier.
Change-Id: I5f3a6e31dc96fbc016e6ab5f56c3c68eb9e7723f
2019-11-21 19:25:46 +00:00
Jay Aliomer
42c07accd0
Merge "DarkUIPreferenceController null exception"
2019-11-21 17:29:57 +00:00
Jay Aliomer
c49f266af0
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
2019-11-21 10:48:02 -05:00
TreeHugger Robot
bc78c3e9da
Merge "Refactor common layout"
2019-11-21 08:06:28 +00:00
TreeHugger Robot
e97e65cb76
Merge "Fix items in StorageProfileFragment can not be clicked"
2019-11-21 07:16:24 +00:00
Arc Wang
ade3cc7b49
Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS"
2019-11-21 05:54:12 +00:00
TreeHugger Robot
76756f43db
Merge "[Settings] Support pure switch of inline toggle of Settings Injection v2"
2019-11-21 04:35:29 +00:00
Raff Tsai
b5a56789b3
Fix items in StorageProfileFragment can not be clicked
...
- The root cause is passing wrong userId to StorageProfileFragment
Bug: 141601408
Test: manual
Change-Id: I317109a7d7ee4859ea9b8e3f97f6c9acaaf13256
2019-11-21 12:04:06 +08:00
Bonian Chen
7d2d92df21
Merge "[Settings] Fix robotest build breakage" am: 6c9b9f41d6
am: 635c2fa095
...
am: 04b12dd0ae
Change-Id: Ic98c3165d78897c9c7200c613934137d06b26f8b
2019-11-20 19:18:21 -08: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
TreeHugger Robot
1e714110ca
Merge "Do not hide lock screen settings conditionally"
2019-11-21 03:06:43 +00:00
Bonian Chen
6c9b9f41d6
Merge "[Settings] Fix robotest build breakage"
2019-11-21 02:56:12 +00:00
timhypeng
456285ca5b
Refactor common layout
...
- reuse preference_widget_dialog_radiobutton
Bug: 144746899
Test: manual
Change-Id: Icfba629eb05b9db1dc6802e26c087b30f0fe88ed
2019-11-21 10:42:26 +08:00
TreeHugger Robot
e99b0fbf4d
Merge "Add new audio channel mode dialog layout for new Bluetooth developer option"
2019-11-21 01:59:56 +00:00
TreeHugger Robot
f3e630f3ad
Merge "Fix testcase error"
2019-11-21 01:06:12 +00:00
David Su
f4bb306eec
Merge "Rename WifiSsid.NONE to WifiManager.UNKNOWN_SSID"
2019-11-20 18:57:28 +00:00
James Mattis
ea0b2bfaac
[automerger skipped] Merge "Swap param order in registerSoftApCallback" am: 76632c01fd
am: 1f3415f36e
...
am: c03a31c46f
-s ours
am skip reason: change_id I5563c1059cc04014a0fd909e2508f7bf497d708e with SHA1 33379b361b
is in history
Change-Id: I512d10b0465aee2547a7bac514a0d227403991b9
2019-11-20 10:51:28 -08: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
Lucas Dupin
01c00962a9
Do not hide lock screen settings conditionally
...
Users have reached out to us asking where are their settings and
cannot understand why things disappear.
Test: LockScreenPreferenceControllerTest
Change-Id: I05b182a26724fd14b0a8240e280f216ebf4d43b9
2019-11-20 09:49:23 -08:00
Raff Tsai
21c466ff5b
Fix testcase error
...
Fixes: 144832138
Fixes: 144831580
Test: robolectric
Change-Id: I01efc467cf75b5beb2d2dd23188a8fa7d67f32ed
2019-11-21 01:06:10 +08:00
Jay Aliomer
bb32051ce0
Merge "Add settings for scheduling dark theme"
2019-11-20 16:41:23 +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
TreeHugger Robot
758aae48b0
Merge "Fix NPE in ChooseLockPattern"
2019-11-20 15:02:29 +00:00
Bonian Chen
97f4158cc7
Merge "[Settings] Fix unable to accessing Fi"
2019-11-20 10:18:20 +00:00
timhypeng
873caaa51d
Add new audio channel mode dialog layout for new Bluetooth developer option
...
- new reminder information
Bug: 142227996
Test: manual
Change-Id: I07614b28552cc2eb1fdcb30bf49a395cc17991f7
2019-11-20 16:36:27 +08:00
TreeHugger Robot
b579a9a765
Merge "Add new codec dialog layout for new Bluetooth developer option"
2019-11-20 08:06:39 +00:00