Commit Graph

7604 Commits

Author SHA1 Message Date
Alice Kuo
e3680e211a Show the multiple Mac address for the coordinated set am: 9f11a4cddf am: f0b73dade7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903831

Change-Id: I65a4d227e8f92b155636d8aa51b4e5e83bac2b3d
2021-11-29 02:48:44 +00:00
Alice Kuo
2135db2eac Add the pairing string for CSIP supported device am: f57f720c38 am: 5d1aee76c2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903830

Change-Id: I51ff75f8a8005985a9696616edd1c8c5cdd651fe
2021-11-29 02:48:43 +00:00
Alice Kuo
f0b73dade7 Show the multiple Mac address for the coordinated set am: 9f11a4cddf
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903831

Change-Id: I9a8a0fe9d95a4ff4adc0599ce4c9a35501968f71
2021-11-29 02:29:29 +00:00
Alice Kuo
5d1aee76c2 Add the pairing string for CSIP supported device am: f57f720c38
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903830

Change-Id: I809634c657558da125e72bb1fcbddaf3db46a093
2021-11-29 02:29:27 +00:00
Alice Kuo
9f11a4cddf Show the multiple Mac address for the coordinated set
Show the mac address for all the devices if the device detail combine
with the multiple connections based on CSIP.

Screenshot: https://screenshot.googleplex.com/qQjc2pxNTr3tMUV

Bug: 178981521
Test: pair with the coordinated set, and check the UI
Change-Id: I01e0ec91e5c856481318d6435d174b5a2018d820
Merged-In: I01e0ec91e5c856481318d6435d174b5a2018d820
2021-11-26 13:21:48 +08:00
Alice Kuo
f57f720c38 Add the pairing string for CSIP supported device
Show the pairing dialog with the hint message
that pairing this device will pair all of the
set member of a coordinated set. If the device
supports CSIP, the message will be shown.

Screenshot: https://screenshot.googleplex.com/8WcrdgBoLRgJjHs

Bug: 178981521
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BlueotohPairingDialog
Change-Id: I5432b7264652dd4485e2669f6004caa4f7459238
Merged-In: I5432b7264652dd4485e2669f6004caa4f7459238
2021-11-26 13:13:25 +08:00
ykhung
3c1da6b2af Update "Mobile network standby" attribute label into "Mobile network" am: 13a52a081e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16279909

Change-Id: I7588c48981e0a4f351302fd1b38f8c943509375a
2021-11-17 14:19:22 +00:00
ykhung
13a52a081e Update "Mobile network standby" attribute label into "Mobile network"
Bug: 205051643
Test: make SettingsRoboTests
Change-Id: Ia8f5c3e76d72ffa6fd0601c58b1b3d157b711b30
(cherry picked from commit 22dc875ba7)
2021-11-17 12:35:23 +00:00
TreeHugger Robot
a6c7b5e0f1 Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-dev am: 3e23903ff8 am: 0fd394db07
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101565

Change-Id: I40b5bb4b7be8960cea11ab5521aa36aacf81e7ce
2021-11-03 20:00:55 +00:00
TreeHugger Robot
6cbf225a24 Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-dev am: 3e23903ff8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101565

Change-Id: I84c50d2857869b9b2303467ef465dc29bc1e9119
2021-11-03 19:49:31 +00:00
TreeHugger Robot
0fd394db07 Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-dev am: 3e23903ff8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101565

Change-Id: Id7b8ba483f8b323c0e658d66a62c4c58f6dc17a0
2021-11-03 19:47:39 +00:00
Yanting Yang
9a0c28d911 Rephrase dialog message of clear storage dialog for security concern
Bug: 193890833
Test: visual
Change-Id: I8f0b066de710169ee8b922c44b6519ca21b9c7ef
(cherry picked from commit 0c359da620)
2021-10-25 05:52:02 +00:00
Betty Chang
5a5afba75b Merge "Add String for information about Wi-Fi scanning when Wi-Fi is off." into sc-qpr1-dev am: c0b9f4bdba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16047548

Change-Id: Ifa14bb3bcb79634a06ca53a03a2fb25f882b09b9
2021-10-13 17:01:59 +00:00
Betty Chang
c0b9f4bdba Merge "Add String for information about Wi-Fi scanning when Wi-Fi is off." into sc-qpr1-dev 2021-10-13 16:46:07 +00:00
changbetty
b7509a3079 Add String for information about Wi-Fi scanning when Wi-Fi is off.
Bug: 202323013
Test: make
Change-Id: I22618a57bfecd02508f2d4a53ff6c65071de2fd1
2021-10-13 14:07:27 +00:00
TreeHugger Robot
6d4c35933c Merge "Add more info on the dialog of AllowBindAppWidgetActivity" into sc-qpr1-dev am: 468bad73d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15952458

Change-Id: I5d3ee4751264b436a3e1bc9d9ff7f90037a92102
2021-10-01 23:44:05 +00:00
Sunny Shao
f25e8aa74c Add more info on the dialog of AllowBindAppWidgetActivity
- Show the label of the bound widget on the dialog of the AllowBindAppWidgetActivity.

Bug: 184676316
Test: manual test
Change-Id: Idf1f73bc1cdb8ef9ce632bfe4722b1469a6b8531
Merged-In: Idf1f73bc1cdb8ef9ce632bfe4722b1469a6b8531
(cherry picked from commit 1564ef5ca1)
2021-10-01 05:45:49 +00:00
Joshua Mccloskey
8aeeb6cd45 Merge "Updated settings preference title for work profile" into sc-qpr1-dev am: 21ad438f6a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15848923

Change-Id: Ib9d449b5e3b4565a6bad54141ccad8491bfb6630
2021-09-21 22:52:34 +00:00
Joshua Mccloskey
9f7c4cedea Updated settings preference title for work profile
Test: Verified string apperas in regular work settings.
Fixes: 193258818
Change-Id: I89671820a0bf900014567087e1e553e3ad7fe472
2021-09-17 02:07:53 +00:00
Joe Bolinger
3452769f1e Merge "Add string ids to the result bundle for parental consent." into sc-qpr1-dev am: 63786513fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15759863

Change-Id: I3dbb1da09fe9ea625b37cce6ae85262893900e30
2021-09-14 22:23:25 +00:00
Joe Bolinger
63786513fc Merge "Add string ids to the result bundle for parental consent." into sc-qpr1-dev 2021-09-14 22:08:23 +00:00
Joe Bolinger
8b3792d65b Add string ids to the result bundle for parental consent.
Bug: 198491515
Test: N/A (builds)
Change-Id: Id120f5f7a7e923f9d3ce7dd38d3e5214296ca219
2021-09-14 19:54:27 +00:00
TreeHugger Robot
63a22fd735 Merge "Enhance battery settings limit charge tip" into sc-qpr1-dev am: daaf1728b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747143

Change-Id: Id85a00a0673b59ae514b56a8f197aaa65ddd32e6
2021-09-09 15:40:11 +00:00
TreeHugger Robot
daaf1728b4 Merge "Enhance battery settings limit charge tip" into sc-qpr1-dev 2021-09-09 15:28:01 +00:00
Wesley.CW Wang
083ace54d5 Enhance battery settings limit charge tip
- Add dialog for limit charge tips
 - Add action button to make limit charge tips can bypass charge limited
 - Fix layout typo
 Screenshot: https://screenshot.googleplex.com/5ngtD2sJAKSQZD3.png

Bug: 196315151
Bug: 197769934
Test: make SettingsRoboTests
Change-Id: I0901c56ae93691c984376852da78cde9078caaf0
Merged-In: I0901c56ae93691c984376852da78cde9078caaf0
2021-09-09 22:13:33 +08:00
SongFerng Wang
5bcabf3a78 Merge "[VoNR] VoNR settings" into sc-qpr1-dev am: 9354a7e81c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15737579

Change-Id: I5b5d99714ac24977c7a74926ae859bdb0bc0e94e
2021-09-08 03:51:39 +00:00
SongFerng Wang
9354a7e81c Merge "[VoNR] VoNR settings" into sc-qpr1-dev 2021-09-08 03:38:02 +00:00
TreeHugger Robot
fb39c456a8 Merge "Add 'snoozing' to NLS consent dialog" into sc-qpr1-dev am: ec9a292393
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15777104

Change-Id: I5b8af0112efa816d38d08a9a84e10b9ebb016531
2021-09-07 20:42:23 +00:00
Julia Reynolds
520c80d649 Add 'snoozing' to NLS consent dialog
Test: manual
Bug: 195031401
Change-Id: I93226e89f033689d9731b6d3efd79bb9fdf628b4
2021-09-07 13:17:49 +00:00
SongFerngWang
eaa71ac6de [VoNR] VoNR settings
Allow user to enable or disable voice over NR.

Bug: 191203577
Test: atest
com.android.settings.network.telephony.NrAdvancedCallingPreferenceControllerTest

Change-Id: I9be4716d0cdac5d698c2058be65bfa541495d012
2021-09-07 10:57:34 +08:00
Curtis Belmonte
91cfb2c06c [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3 am: 4f2f0ed6d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Change-Id: I5e527298abe4024bc5a8b1b42682e80a36c1e2a3
2021-09-05 03:48:42 +00:00
Curtis Belmonte
4f2f0ed6d5 [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Bug: 198847997
Change-Id: Id730b3ccfada949186db2ab61046ee57ca0b82dc
2021-09-05 00:11:08 +00:00
Curtis Belmonte
a9c1fa626b [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Bug: 198847997
Change-Id: Ib88caa522f11d1be6bc3ef9479cfdefe4eabf10a
2021-09-05 00:11:06 +00:00
Curtis Belmonte
4592bf62a3 Update char limits for new UDFPS enroll strings
Adds a character limit of 80 for titles and 160 for subtitles to be
shown as part of multi-stage UDFPS enrollment.

Test: Presubmit
Bug: 198847997
Change-Id: Ib85d1dc4f9bb127d641c84411f4dff2736484a5a
2021-09-04 17:08:01 -07:00
Presubmit Automerger Backend
39928c53fc [automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253 am: 8d82ccdc24
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427

Change-Id: I6ea222460fa8c4653943e0c4bc73ea07bb1c2b52
2021-09-04 23:24:30 +00:00
Presubmit Automerger Backend
8d82ccdc24 [automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427

Bug: 198847997
Change-Id: I5ba1c5d10c85b1dec25f4f2438439924585d9c3b
2021-09-04 20:49:34 +00:00
Presubmit Automerger Backend
c1b136b503 [automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427

Bug: 198847997
Change-Id: Iaec5471868501824dbb0aa4cfe76feeff698133c
2021-09-04 20:49:34 +00:00
Curtis Belmonte
c84e18b253 Add new strings for UDFPS 4-stage enrollment
Adds strings that will be shown during the new tip and edge enrollment
stages of the UDFPS enrollment flow.

Test: Presubmit

Bug: 198847997
Change-Id: I11a9889ec0e5079c3531367bfa397a1910f42af6
2021-09-04 13:48:28 -07:00
Android Build Prod User
0b8ff007b7 Merge "[QPR1] Add time unit into battery usage chart and refine some UI" into sc-qpr1-dev am: 33af17ff31
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15516309

Change-Id: Ie0d087c70691e9363126c096625e9ee4aab44a63
2021-08-26 21:59:26 +00:00
Android Build Prod User
33af17ff31 Merge "[QPR1] Add time unit into battery usage chart and refine some UI" into sc-qpr1-dev 2021-08-26 21:42:36 +00:00
Betty Chang
7e7b237092 Merge "Change the Network preference summary for wifi option" into sc-qpr1-dev am: 6a3b697141
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15671537

Change-Id: I4bc6a5d4d5eeccaf23d4c7da0314ebdfaf4965e4
2021-08-26 02:06:50 +00:00
Betty Chang
6a3b697141 Merge "Change the Network preference summary for wifi option" into sc-qpr1-dev 2021-08-26 01:50:56 +00:00
changbetty
b1b2da9aca Change the Network preference summary for wifi option
Bug:192987269
Test: Manual test
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I3892386f8fe2e5c3e29cd7e91f88db65c3693990
Merged-In: I3892386f8fe2e5c3e29cd7e91f88db65c3693990
2021-08-25 02:55:38 +00:00
TreeHugger Robot
e1a95327ea Merge "[Povider Model] Fix string in SIMs" into sc-qpr1-dev am: 8e98df31a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542132

Change-Id: I96c1c2cf4ae52d9fad6c0cdf7d4d20cba013e700
2021-08-23 17:42:50 +00:00
TreeHugger Robot
8e98df31a4 Merge "[Povider Model] Fix string in SIMs" into sc-qpr1-dev 2021-08-23 17:28:43 +00:00
Govinda Wasserman
26f121b673 Merge "Revert "Revert "Add sensitivity configuration to long press power dialog""" into sc-qpr1-dev am: 8351a9a504
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15640673

Change-Id: Ib92603ae0210aaa025f722d0d734b11e6030386c
2021-08-20 17:31:29 +00:00
Govinda Wasserman
3869aac6d3 Revert "Revert "Add sensitivity configuration to long press power dialog""
This reverts commit c4084d4141.

Reason for revert: Dependant change has now successfully been propagated to sc-v2-dev child graphs

Change-Id: I1f6126a423c72540d219b99e20b464b51ef65923
2021-08-20 17:06:40 +00:00
TreeHugger Robot
ef2c734413 Merge "Revert "Add sensitivity configuration to long press power dialog"" into sc-qpr1-dev am: ea4e5a33bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15635257

Change-Id: I9d2819fd3a9a043302295e8f1c6ba9d0e67c86cf
2021-08-20 11:11:08 +00:00
Sam Chang
c4084d4141 Revert "Add sensitivity configuration to long press power dialog"
This reverts commit de2f00df41.

Reason for revert: This CL will cause build break, b/197290948

Change-Id: Ibee2d4bc5e445e863585c291b4b2741bcb4b4c81
2021-08-20 06:46:33 +00:00
Jernej Virag
a4034c602a Add sensitivity configuration to long press power dialog am: de2f00df41
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542611

Change-Id: I0d94e4a5157dc18fdbe454fe0a3e24377dc78d53
2021-08-19 15:16:26 +00:00