Commit Graph

5889 Commits

Author SHA1 Message Date
Treehugger Robot
110d7ff721 Merge "Revise strings as per string UX review" 2020-05-06 03:06:40 +00:00
Treehugger Robot
44146c8e3b Merge changes I6194592d,I5a02f847
* changes:
  Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter
  Define a helper link for 5G limitation in DSDS footer.
2020-04-30 02:56:34 +00:00
Grace Jia
7098379555 Disable 'Mobile data' selection after removing SIM
Bug: 153895858
Test: Manually remove SIM and test
Change-Id: I5934b01c047172ae2269e77e2fe0945aacba4ca1
Exempt-From-Owner-Approval: Telephony settings
2020-04-29 22:34:29 +00:00
Malcolm Chen
5e68080b1f Define a helper link for 5G limitation in DSDS footer.
Bug: 152786064
Test: manual
Change-Id: I5a02f847531988217cc6ab47e3b35ed319c1027c
Merged-In: I5a02f847531988217cc6ab47e3b35ed319c1027c
2020-04-27 18:14:46 -07:00
Brad Ebinger
c973423a34 Revise strings as per string UX review
Fixes: 154148793
Fixes: 155098265
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony
Merged-In: Ia510ce5262fbe576718b0785175c0a82acb3c722
Change-Id: Ia510ce5262fbe576718b0785175c0a82acb3c722
2020-04-27 18:00:29 -07:00
Brad Ebinger
a7bf6a3046 Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" 2020-04-20 20:40:50 +00:00
Brad Ebinger
6b87fa6705 Set the CHAR_LIMIT to 110 in order to support more translations.
Increase the CHAR_LIMIT for contact_discovery_opt_in_summary.

Fixes: 153376000
Fixes: 150941009
Test: manual
Merged-In: Ia71c87b47ed8b5b738f6d5a9b2693e7943f6797c
Change-Id: Ia71c87b47ed8b5b738f6d5a9b2693e7943f6797c
2020-04-20 12:08:58 -07:00
Brad Ebinger
f6a1184c0f Change to Contact Discovery Dialog Language based on Privacy Feedback
Fixes: 153376820
Bug: 141950843
Test: verify text
Merged-In: Iadc46ac18c1ec8e63cfe0d4d162e7222bfbc9a12
Change-Id: Iadc46ac18c1ec8e63cfe0d4d162e7222bfbc9a12
2020-04-20 19:08:07 +00:00
Lorenzo Colitti
526741a2f2 Merge "Add Ethernet Tethering settings" 2020-04-06 15:11:31 +00:00
Yuuki Habu
8e177ae1c7 Add Ethernet Tethering settings
Add Ethernet Tethering settings
 - Show prefernce if config_ethernet_iface_regex is set
 - Activate if tethered ethernet interface is exist

Bug: 148824036
Test: manual test
 - update prefernce plug-in, plug-out
Change-Id: Ia4f365ddc1a53a926d716046db3e6ac463c978b9
Merged-In: Ia4f365ddc1a53a926d716046db3e6ac463c978b9
2020-03-27 17:45:27 +09:00
Brad Ebinger
f469cac10a Add new DialogFragment and Controller for capability discovery opt-in
Adds a new controller to monitor the capability discovery opt-in
setting as well as a new DialogFragment, which displays a dialog
providing the user with more information before they enable the
setting.

Bug: 111305845
Test: manual
Merged-In: I70821964bc618c3c389c9039cd7f5028e34c7ebb
Change-Id: I70821964bc618c3c389c9039cd7f5028e34c7ebb
2020-03-25 16:19:54 +00:00
Andrei-Valentin Onea
e89b34a366 Merge "Fix strings in PlatformCompatDashboard"
am: a9f0446ce8

Change-Id: I56cb47ccfe8278e722556fb6f9d4d08f0ac35d52
2020-01-20 05:25:45 -08:00
Andrei Onea
e2f4619602 Fix strings in PlatformCompatDashboard
Be more specific, by referring to 'target SDK', instead of just 'SDK'.

Test: atest PlatformCompatDashboardTest
Bug: 138280620
Change-Id: Ied8dd5d682ed20962040bf81e9b3b3b45166ea46
2020-01-17 16:41:46 +00:00
Automerger Merge Worker
7e1e2b7d7d Dark theme settings text am: 176d4ea28e
Change-Id: I57dc5d3dcb8cc96e4ad61259372360edebe14d9e
2020-01-09 23:21:23 +00:00
Jay Aliomer
176d4ea28e Dark theme settings text
Dark theme text should be appropriate for all types of screens and
not only OLED types

Test: manual
Bug: 147432824
Change-Id: I1e59329064405c72c6f57c92a82b652cd71853a7
(cherry picked from commit d63839afda)
2020-01-09 21:51:47 +00:00
Automerger Merge Worker
c547fc78c7 Merge "Create some strings for RTT setting" into qt-qpr1-dev am: 1cdbed55f9
Change-Id: I8ddf92c23c00c7b2958dbefdf5483e2b609e92c3
2019-12-21 02:34:00 +00:00
Tsung-Mao Fang
0f7b65b512 Create some strings for RTT setting
Test: Rebuild
Bug: 146540478
Change-Id: I26f218caba46273796e52c244c9f022742f0bdeb
Merged-In: I26f218caba46273796e52c244c9f022742f0bdeb
2019-12-20 16:03:27 +00:00
Automerger Merge Worker
619d8b3418 Merge "Add feature provider for face unlock" into qt-qpr1-dev am: 8472279900
Change-Id: I3334a10c25af3b5a8ed125495c7012fe46516485
2019-12-17 05:38:36 +00:00
Kevin Chyn
15f241b296 Add feature provider for face unlock
Bug: 146085546

Test: Builds
Change-Id: If5c7d57c12a3f679d81cee22fb94a53fce1de29a
2019-12-16 18:19:20 -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
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
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
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
Kevin Chyn
3ba07e6fa5 Revert "Update attention string"
am: 44efb41d98

Change-Id: I915a682b72a47256fa1b0e9ea8611fdbca8be89b
2019-11-01 10:06:15 -07:00
Kevin Chyn
44efb41d98 Revert "Update attention string"
Bug: 142979808

This reverts commit 821fbc83a1.

Change-Id: Ibe426d3175b8b44fadaf78316201031f229d736e
2019-10-31 20:49:43 +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
SongFerng Wang
951e9b7742 Merge changes Ifaed6ca8,I4a78e2e7,I945d3c2f,Ia0d1333c,I5dfe4843
am: bc6a65ca32

Change-Id: I3ec33adf894393b43296e83b450f3a894785fc92
2019-10-14 00:34:20 -07:00
SongFerngWang
8cd10f774d RadioInfo network mode list and network mode string add 5G
am: dc5149efef

Change-Id: Id55735d6933965735249e6c25981c137877b00ed
2019-10-14 00:33:54 -07:00
SongFerngWang
7fa128edcd String "CDME" is wrong
Bug: 142376028
Test: build pass
Change-Id: Ifaed6ca8aba8f34ecb27abb863aeaf679132934f
Merged-In: Ifaed6ca8aba8f34ecb27abb863aeaf679132934f
2019-10-14 05:01:18 +00:00
SongFerngWang
dc5149efef RadioInfo network mode list and network mode string add 5G
Bug: 131888757
Test: 1.build pass 2.RadioInfo set network mode work.
Change-Id: I945d3c2fd175f45151bbeee475e388ccc2d67642
Merged-In: I945d3c2fd175f45151bbeee475e388ccc2d67642
2019-10-14 05:01:01 +00:00
SongFerngWang
3146473921 String "CDME" is wrong
am: dfd9aa99e5

Change-Id: I6d3dab30dbd9282a3a6589efebbf5e08a1359c4a
2019-10-11 08:16:03 -07:00
SongFerngWang
dfd9aa99e5 String "CDME" is wrong
Bug: 142376028
Test: build pass
Change-Id: Ifaed6ca8aba8f34ecb27abb863aeaf679132934f
2019-10-10 20:18:30 +08:00
SongFerngWang
ffc927f77d RadioInfo network mode list and network mode string add 5G
am: ec384c2f6f

Change-Id: I280fb1f3e0acddcb3a85eee876112e491bd4f8f4
2019-10-06 09:20:06 -07:00
SongFerngWang
ec384c2f6f RadioInfo network mode list and network mode string add 5G
Bug: 131888757
Test: 1.build pass 2.RadioInfo set network mode work.
Change-Id: I945d3c2fd175f45151bbeee475e388ccc2d67642
2019-10-04 12:39:59 +08:00
Joshua Mccloskey
b288f07bb2 Merge "Added new string." into qt-qpr1-dev
am: 262f5fe91f

Change-Id: If8467461e0963648886c02159353c177e9b88d41
2019-10-01 15:17:26 -07:00