Commit Graph

3649 Commits

Author SHA1 Message Date
Automerger Merge Worker
d0401b1883 Merge "MAP: Add developer option to control map version" am: a24f03d58e am: d8e0b57e3a
Change-Id: I91537221abd287ca66fbc5b1d945b8a464b3e3de
2020-01-09 03:46:22 +00:00
Chienyuan
01f4f8432e MAP: Add developer option to control map version
Bug: 146916756
Test: manual
Change-Id: I6015e5dae8e2c19549babe556b84a2c5b24dd669
Merged-In: If32db03072e02b7b2477c7da943b6b0e6a9be260
2020-01-08 17:04:25 +08:00
Automerger Merge Worker
4b6beab35e Remove permission bar chart in Privacy setting am: 8e58e2c7a5
Change-Id: Id55e0078ce0eccc85a0ef15706ba07b26da5c3ab
2019-12-20 10:31:03 +00:00
Tsung-Mao Fang
8e58e2c7a5 Remove permission bar chart in Privacy setting
- Because permission hub is already postponed,
we don't need to show this UI in privacy settings.

Test: Rebuild, visual, robotest
Change-Id: I51aca52bc605a3c6b0cafc084e8e491c280d770f
Fix: 143447873
Merged-In: I51aca52bc605a3c6b0cafc084e8e491c280d770f
(cherry picked from commit ab914adc00)
2019-12-19 16:51:58 +08:00
Automerger Merge Worker
a07760377e Merge "Added horizontal seperator in Face Settings" into qt-qpr1-dev am: 30bf9e2e5e
Change-Id: Iacdac6e3fc2f8ba03f5cd3a590f52c5c990e1226
2019-12-18 06:27:02 +00:00
joshmccloskey
2e57bc47b2 Added horizontal seperator in Face Settings
Test: Manual.
Bug: 140965037
Change-Id: I05bfa9b1826c5d4dfcbba6cbe2d2e320014950e3
Merged-In: I05bfa9b1826c5d4dfcbba6cbe2d2e320014950e3
2019-12-18 04:54:27 +00:00
Automerger Merge Worker
b4fd6cf8c9 Merge "[Setting] Code cleanup" am: 126df6441b am: 9d556441b4
Change-Id: I956cb317ec98a5f6e9083b46f949451cf7e84613
2019-12-16 08:15:03 +00:00
Bonian Chen
493dbc7aa7 [Setting] Code cleanup
Remove unused code.

Bug: 146309503
Test: build pass
Change-Id: I272ef1fa82877c8ac6b580fadd8d9baf1da2d5d4
2019-12-16 10:53:11 +08:00
Automerger Merge Worker
00d32abf06 Merge "Revert "[Setting] Cleanup Unused SimSettings"" am: 487c94c11a am: 74a7a3cfb2
Change-Id: I02216936cd583e0a9a015287decdcb9f849ca45c
2019-12-14 01:23:03 +00:00
Automerger Merge Worker
cc63645bb2 Merge "[RadioInfo] Remove from Settings (into Telephony)" am: 0aac2dfab6 am: cfb6e23b21
Change-Id: I8c589476f6f365c2695bbacb026beebc4ea1c8db
2019-12-14 01:04:19 +00:00
Bonian Chen
487c94c11a Merge "Revert "[Setting] Cleanup Unused SimSettings"" 2019-12-14 01:01:38 +00:00
Bonian Chen
0aac2dfab6 Merge "[RadioInfo] Remove from Settings (into Telephony)" 2019-12-14 00:44:43 +00:00
Pinyao Ting
e6c023bed4 Revert "[Setting] Cleanup Unused SimSettings"
This reverts commit 0d9d341932.

Reason for revert: Potential culprit for b/146229292 - verifying through Forrest before revert submission

Change-Id: I29a3ed1a44ea324e0fa88cda2e5baecb441f7922
2019-12-13 23:44:06 +00:00
Automerger Merge Worker
14b406fd8f Merge "[Setting] Cleanup Unused SimSettings" am: 64b5882f9e am: a9692bdf36
Change-Id: I58672eccd38cae6eb2af2fae6ef57bdb432dc0e2
2019-12-13 18:05:19 +00:00
Bonian Chen
0d9d341932 [Setting] Cleanup Unused SimSettings
There's no entry to access SimSettings.
Remove this unused UI.

Bug: 131324863
Test: manual
Change-Id: Ic55161ab47ae8673caf774cc49914f3741569fab
Merged-In: I3f50e528eb409215371a125184502d3531bad0a8
2019-12-13 13:46:07 +00:00
Bonian Chen
be5216cacb [RadioInfo] Remove from Settings (into Telephony)
Moving RadioInfo and BandMode to Telephony app.

Bug: 123598192
Test: Manual test
Change-Id: Id32982fe3e6fbf686fafe94ecc6c8549c7a5243c
Merged-In: Id62a2bf4b2c44efcd48319734d1cab6ed969ee06
2019-12-13 07:17:53 +00:00
Automerger Merge Worker
b15374611f Dark theme drop down does not show selected option am: 268d6b092a
Change-Id: I96c2d1253366543685ca9aaf56f55b93488bd27e
2019-12-10 23:39:11 +00:00
Jay Aliomer
268d6b092a Dark theme drop down does not show selected option
a place holder for the summary was updated in commit https://googleplex-android-review.git.corp.google.com/changes/platform%2Fpackages%2Fapps%2FSettings~9818614/revisions/3/files/res%2Fxml%2Fdark_mode_settings.xml/download?parent=1
This change is reverted in this CL

Test: manual
Fixes: 145672617
Change-Id: I41443e7334487e3afac0343333a9ed289d2fe390
2019-12-07 22:19:41 +00:00
Jay Aliomer
5fb68ae95d Battery saver mode should disable dark mode modification
am: f4bc80c45c

Change-Id: Iff4cb52ba46e20bd012f95e9d29917f7952b4259
2019-12-03 09:47:41 -08:00
Jay Aliomer
f4bc80c45c Battery saver mode should disable dark mode modification
disable toggle options and disable the dark theme drop down selection

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: 	145098277
Fixes: 145297188
Fixes: 	145254016
Change-Id: I5c81a295810cc2d9a45657978104647e9c15da46
2019-12-02 18:19:52 +00: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
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
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
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
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
204b82e2e7 Add settings for scheduling dark theme
am: 7141b142df

Change-Id: Ib58ca2eceaea6638e29028126c377802cac9df1d
2019-11-21 13:48:14 -08: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
Felipe Leon
980d003f40 Merge "Settings: fix apn_editor carrier_enabled summaryOff string" am: 9d29833485
am: 6ee2108bdb

Change-Id: I86c907e3899841df85cc7433133d1430be7f7c5e
2019-11-05 10:14:35 -08:00
Felipe Leon
6ee2108bdb Merge "Settings: fix apn_editor carrier_enabled summaryOff string"
am: 9d29833485

Change-Id: Ie05efff7a54b001dbe7c86b03f00091c86245ab0
2019-11-05 09:47:14 -08:00
Treehugger Robot
9d29833485 Merge "Settings: fix apn_editor carrier_enabled summaryOff string" 2019-11-05 17:15:45 +00:00
Kevin Chyn
ca51533d56 Merge "Revert "Remove attention controller"" into qt-qpr1-dev
am: 1876b8c6dd

Change-Id: I5282deec73015da2920c0b429e1e23c5f97d4fbe
2019-11-01 10:06:20 -07:00
Kevin Chyn
eac6fcff2d Revert "Remove attention controller"
Bug: 142979808

This reverts commit 8e1d1ca3ab.

Change-Id: I78b7572bcb384de2984f4d81946aceb03aec6758
2019-10-31 20:50:35 +00:00
Xin Li
c73fd84126 DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
Bug: 142003500
Change-Id: Ibae6b218a616a93cfda05dd77a5ea6f3a2dc4cea
2019-10-30 11:49:56 -07:00
Josh Hou
0fe6fc26ad Merge changes Ibec13fbe,If89c67c0 am: 27bf33e053 am: e8a6c02fd2
am: 03c9ec1223

Change-Id: I8dc1754d631ac16a99e1c92776a2756ca5b8269e
2019-10-28 05:43:11 -07:00
Josh Hou
e2cdd74174 Fix ViLTE is not available when WiFi Calling is disabled
Bug: 141831293
Test: 1. Set carrier config carrier_wfc_ims_available_bool to false,
then verify Wi-Fi calling option is not shown.
      2. Set carrier config carrier_vt_available_bool to false, then
      verify video calling option is not shown.
      3. Set both carrier_wfc_ims_available_bool and
      carrier_vt_available_bool to false, then verify calling category
      is not shown.

Change-Id: Ibec13fbeb5acf1d62342286687b2ba969beb4e14
Merged-In: Ibec13fbeb5acf1d62342286687b2ba969beb4e14
2019-10-28 11:12:49 +00:00
Felipe Leon
e42ab42c5c Settings: fix apn_editor carrier_enabled summaryOff string
Change-Id: I44ccec73601806dc8facad122f1ab16ff3aca484
Signed-off-by: Felipe Leon <fglfgl27@gmail.com>
2019-09-25 00:43:17 +03:00
Kevin Chyn
88936d4a46 Merge "Remove attention controller" into qt-r1-dev
am: 41aafab963

Change-Id: Ic5e2b13d6246fe7693a8f1c289d82d43d3fc6efd
2019-08-19 19:57:37 -07:00
TreeHugger Robot
41aafab963 Merge "Remove attention controller" into qt-r1-dev 2019-08-20 02:37:20 +00:00
Kevin Chyn
8e1d1ca3ab Remove attention controller
Bug: 139484065

Test: manual
Change-Id: Ideed761c978ba0831b04ed2cc294e9655dddb01c
2019-08-16 16:34:09 -07:00
Edgar Wang
063cc34713 Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev
am: 8e3b202070

Change-Id: Ib1cf35ee24f88a9eae71714349fe40cb982214b0
2019-08-01 22:49:22 -07:00
Edgar Wang
8e3b202070 Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev 2019-08-02 05:38:23 +00:00
Edgar Wang
58a5be4401 Add skip lock screen in Notification & security lock screen settings
Users may have trouble finding this setting in face auth.
Heard this from dogfood/executive feedback and customer support discussion.
So add Skip Lock Screen preference in
Display > Lock screen display > What to show >
and
App & Notifications > Notifications > Lock Screen >

Bug: 138458558
Test: robotest & manual

Change-Id: I10e420821423821743d65b00c8b7e6d4d1224e00
2019-08-01 11:17:05 +08:00
Antony Sargent
ad2f49f851 Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev
am: 4685c785b9

Change-Id: I5792ff5333005e2e0c66fd24d594b79bf67d140c
2019-07-31 15:56:00 -07:00
Antony Sargent
482415d37e Protect entry points to add an eSIM when admin restricted
If the DISALLOW_CONFIG_MOBILE_NETWORKS admin policy is set, we were
accidentally still allowing access to the flow where you add an eSIM
subscription via the "plus" button on the Network & internet page. While
fixing this, I also noticed that the mobile networks list page (which
only becomes available if you have multiple subscriptions) has a link at
the bottom to start the flow as well, and that wasn't being protected.

The fix for the plus button on the Network & internet page was just to
make sure not to call setEnabled(true) if the preference was already
disabled by admin policy, since that has the effect of overriding the
admin-disabling.

The fix for the mobile networks list page just needed to add the
relevant tags in the layout XML, and then we get it for free.

Fixes: 137627845
Test: make RunSettingsRoboTests
Change-Id: I896ac248f50aaeecc157791938a0a0a98265aa07
2019-07-31 12:53:39 -07:00
TreeHugger Robot
2d035ddfa2 Merge "Move channel listing into a pref controller" into qt-qpr1-dev 2019-07-29 18:42:25 +00:00
Julia Reynolds
c400ce3c80 Move channel listing into a pref controller
And a hidden preference category. This makes
hiding/showing the list a lot cleaner and also allows more
of the code to be tested.

Also delete some unused code that no longer complied after
this refactor.

Fixes: 133443871
Test: atest
Change-Id: I4a5fe0e075019bae2df44a0a9dcec26a40ee6d12
(cherry picked from commit a295d71c94)
2019-07-26 19:24:43 +00:00
Jason Chiu
32930dbe4e Fix DISALLOW_AMBIENT_DISPLAY blocks access to all lock screen display settings
"Ambient display" was merged into "Lock screen display", and the entry
was also moved from security page to display page and leveraged the
original user restriction of "Ambient display".

The user restriction should just work on the switch of Ambient display
instead of the "Lock screen display" entry.

Bug: 138177691
Test: robotest, visual
Change-Id: I5db0eb68c3aa6f4f7d8ecd42db2cdc72255b12f7
2019-07-25 16:23:12 +08:00
Kevin Chang
5fc6db2cf7 Merge "Add footer preference into caption preferences" into qt-r1-dev 2019-07-18 06:59:47 +00:00