Automerger Merge Worker
fd2e26d4aa
Merge "[adb-wireless] Add Wireless Debugging Switch in Developer options." am: 317c9dc2ca
...
Change-Id: I8a1f4c22237436e5e2e262a3723c39ae346a87fa
2020-02-21 16:44:30 +00:00
Joshua Duong
0110afcc46
[adb-wireless] Add Wireless Debugging Switch in Developer options.
...
Bug: 111434128
Bug: 119492574
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WirelessDebugging
Change-Id: I188badb43035172642cf235bb27e56d3a1dea169
Merged-In: I188badb43035172642cf235bb27e56d3a1dea169
2020-02-20 06:13:15 +00:00
Benedict Wong
9d5397ab42
Merge "Add IKEv2/IPsec VPN options"
...
am: b189ffb318
Change-Id: I865a04f4453fc0304ddc3daf9be47ebf2e8a1c3c
2020-01-22 22:09:59 -08:00
Benedict Wong
b189ffb318
Merge "Add IKEv2/IPsec VPN options"
2020-01-23 05:11:47 +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
9494af9634
Merge "Modify 5G RAT into Bearer field." am: 79977fadca am: 7664d08e28
...
Change-Id: I5410a38cf933c4f661731d2a810b5e7a00637763
2019-12-26 11:46:46 +00:00
Daniel Huang
79977fadca
Merge "Modify 5G RAT into Bearer field."
2019-12-26 11:29:13 +00:00
danielwbhuang
957526abca
Modify 5G RAT into Bearer field.
...
Only keep NR in here, remove GSM, TD_SCDMA, IWLAN and LTE_CA.
Bug: 143995814
Test: 1. Build pass.
2. make RunSettingsRoboTests ROBOTEST_FILTER=ApnEditorTest
3. check UI:
3-1. Open APN settings page: Settings > Network & Internet > Mobile Network > Advanced > Access Point Names.
3-2. Click the 3 dots at the up corner, and then select "New APN" > "Bearer"
Change-Id: I9b8efbe26c2702696f720f0f221f3d65f785e644
2019-12-26 12:08:31 +08: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
36eb9829d5
Merge "Use floats for face enrollment dimensions" am: 59baff6ef9 am: fd493b221a
...
Change-Id: Ia4ac6e428666fb82f39e6b43620623e141f716c0
2019-12-20 03:18:56 +00:00
Ilya Matyukhin
ad1b76ce3b
Use floats for face enrollment dimensions
...
Test: compiles and runs correctly on a device
Change-Id: I64cb905b06aa2ca2b0703d83ed9a495c7a85cf94
2019-12-19 17:21:04 -08:00
Automerger Merge Worker
d21a3207ef
Merge "Add 5G RAT into Bearer field." am: 5f6a4b1dae am: 3350d4d05d
...
Change-Id: If6bb822fa55a0c477172348ea7dc10112c3b36df
2019-12-19 12:24:22 +00:00
Daniel Huang
5f6a4b1dae
Merge "Add 5G RAT into Bearer field."
2019-12-19 11:24:41 +00:00
danielwbhuang
db59528d84
Add 5G RAT into Bearer field.
...
Within APN editor, 5G RAT need to be added into Bearer field.
Bug: 143995814
Test: 1. Build pass.
2. make RunSettingsRoboTests ROBOTEST_FILTER=ApnEditorTest
3. check UI:
3-1. Open APN settings page: Settings > Network & Internet > Mobile Network > Advanced > Access Point Names.
3-2. Click the 3 dots at the up corner, and then select "New APN" > "Bearer"
Change-Id: If09afd00cf7860c3bbb40be748ca04c9a55ee5b8
2019-12-19 17:17:10 +08: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
Benedict Wong
50eec3d408
Add IKEv2/IPsec VPN options
...
This change adds the relevant (English) strings for the IKEv2/IPsec
VPNs.
Bug: 143486740
Test: Compiles, new strings visible
Change-Id: I9b1914c80b453bab951a8eddc55546d0746fba91
2019-12-11 03:42:51 +00:00
Automerger Merge Worker
edb8dd6140
Merge changes from topic "update_battery_icon" into qt-qpr1-dev am: c08f70b7dd
...
Change-Id: I73ebb69f6bfcff8c3c09b8768dd48c9124d67594
2019-12-06 01:21:32 +00:00
Automerger Merge Worker
835fa1fd59
Battery icon is too large am: b6b29c1af0
...
Change-Id: I799cccf2808289b8f080cfa339b3bb35bef2690a
2019-12-06 01:21:24 +00:00
TreeHugger Robot
c08f70b7dd
Merge changes from topic "update_battery_icon" into qt-qpr1-dev
...
* changes:
Sync dimen from SystemUI
Battery icon is too large
2019-12-06 01:05:30 +00:00
timhypeng
953eb229c0
Sync dimen from SystemUI
...
Bug: 141139595
Test: manual
Change-Id: Ifa9a31750b9a926e09aec9262aa89e8de66c91e2
(cherry picked from commit 3dd4f2cc19 )
Merged-In: Ifa9a31750b9a926e09aec9262aa89e8de66c91e2
2019-11-26 12:39:43 +08:00
timhypeng
b6b29c1af0
Battery icon is too large
...
-sync layout from SystemUI
Bug: 141139595
Test: make -j42 RunSettingsRoboTests
Change-Id: I5e165e953682fcfdebf0d06475bb1abd171684d9
(cherry picked from commit c71f996da9 )
Merged-In: I5e165e953682fcfdebf0d06475bb1abd171684d9
2019-11-26 12:35:22 +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
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
Niclas Rokicki
fb084bcee8
Merge "translate="false" -> translatable="false"" am: b333e79df9 am: 90f0230b54
...
am: f72fb5a049
Change-Id: I75dcf19b087d98eb328a33138daecd7bd25b5d1a
2019-10-22 09:56:02 -07:00
Niclas Rokicki
f72fb5a049
Merge "translate="false" -> translatable="false"" am: b333e79df9
...
am: 90f0230b54
Change-Id: Iad740a41439b112ffaff528ac74fccee7eb64150
2019-10-22 09:48:57 -07:00