Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
112,295 Commits 1 Branch 0 Tags
2bb637fcc2bb6736cdefbf7aa159a1ccd8092ecf
Commit Graph

27034 Commits

Author SHA1 Message Date
Zaiyue Xue
c6d11de87e Merge "String change to highlight calculation stopped at last even hour" into tm-qpr-dev am: 6aba166376 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22635696

Change-Id: I4cb41677f4c7bd55cd92440e6a0e59a8d3a878eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 03:18:27 +00:00
Zaiyue Xue
6aba166376 Merge "String change to highlight calculation stopped at last even hour" into tm-qpr-dev 2023-04-28 02:43:00 +00:00
Treehugger Robot
33837c6766 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-04-25 16:17:03 +00:00
Bill Yi
ca18853bab Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If34cd71ef08b67f4463d83cd1afd5361bae4b873
 2023-04-21 17:17:53 -07:00
Presubmit Automerger Backend
56c8b39d51 [automerge] Replace the SlicePreference with Preference 2p: 794fc58235 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22755956

Bug: 270544054
Change-Id: I88bb34649b2a1da21e6a3a36d90bd32c17ffb5ae
 2023-04-21 15:08:44 +00:00
SongFerngWang
794fc58235 Replace the SlicePreference with Preference 
The Settings' 2 panel did not support SlicePreference, since it
always open activity with NEW_TASK and it casues the settings can't
set new page at right side.

Bug: 270544054
Test: build pass. local test: the phone pair the buds with fastpair, and
then check the slice preferences.
atest BlockingPrefWithSliceControllerTest (pass)

Change-Id: I0e8abfd284492f04ab322a5bed13741fc6b25b34
 2023-04-21 23:08:06 +08:00
Bill Yi
367bedb886 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-04-19 17:59:16 +00:00
Bill Yi
4ff10a38f4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1c1512d129c76bdf99c95f921b05177f361736a7
 2023-04-17 21:33:14 -07:00
Bill Yi
26ca87ddff Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie1f7a198b79b22f7e52cda13589a55549189524a
 2023-04-17 21:20:25 -07:00
Zaiyue Xue
205d8249a7 String change to highlight calculation stopped at last even hour 
Bug: 278022447
Fix: 278022447
Test: manual
Change-Id: Ia04ae7c7cb4c7ebdd40f4aa3df05b34d2ce66628
Merged-In: Ia08dea791bb72113719fd1316e8e9587a96eaef1
 2023-04-17 14:58:48 +08:00
Bill Yi
c7550f62e7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5cbdfde1f4c34ad1d233e79f9b1464679d12bf3d
 2023-04-10 23:59:36 -07:00
Bill Yi
a568dc677b Import translations. DO NOT MERGE ANYWHERE 
BUG:271250248

Auto-generated-cl: translation import
Change-Id: I07d10fb2cb1cb267bc78b0be2c930d7dec9d9c76
 2023-04-06 20:54:16 -07:00
Bill Yi
aca33b33aa Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-04-06 13:50:19 +00:00
Bill Yi
3cc4247a1a Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-04-06 13:50:19 +00:00
TreeHugger Robot
33affdae8e Merge "Add "for work" in work profile biometrics string" into tm-qpr-dev am: cb00b2bd0c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22478282

Change-Id: Ic00eb13b2c51f78b528ddd4da198179047111445
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 13:35:23 +00:00
Bill Yi
a5ef604de7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibda77f75cc4865437dd8dc5f52260b62b9d6f00b
 2023-04-05 18:05:09 -07:00
Bill Yi
37114bb2b0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4b1f4ec2b736b8123de1ee218b367083163d737e
 2023-04-05 18:03:09 -07:00
Prabal Singh
a53a89d370 Add "for work" in work profile biometrics string 
JUSTIFICATION: Around 8 users reporting this issue in b/271250248
RISK: This change is a cherrypick from a fix already made in Android U where no issue has been reported after a few months.
Bug: 271250248
Test: manually tested
Change-Id: Ib16b2d045f4695883276749fcce6ccce60688c09
(cherry picked from commit a9231555e4)
 2023-04-05 17:16:22 +00:00
Bill Yi
fa4e2c72af Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia388647234a08b6a569c4fb853ae6702eba75927
 2023-04-03 15:43:43 -07:00
Bill Yi
179fdda8d3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9687e3f6e8e0adb69d87cedd36926f91f0fd732c
 2023-04-02 17:52:31 -07:00
Bill Yi
a3af1db910 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-04-02 18:22:50 +00:00
Bill Yi
a2f4c8bd49 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie5e4ab0bbea59e5f05353776da8d5ae625767d93
 2023-03-31 17:03:07 -07:00
Bill Yi
5847bd476f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9609f118fd4a653fd4a5a62fe786691d489e1d83
 2023-03-31 16:56:15 -07:00
Treehugger Robot
06bca85c6a Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" am: 60d9be5a0a am: 7871a9e9bd 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2516935

Change-Id: I77867e2c59c5745cf8b705072e5b0b35c455f399
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 09:34:23 +00:00
Treehugger Robot
60d9be5a0a Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" 2023-03-31 08:20:36 +00:00
Patty Huang
b79d64ee90 Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio" 
Bug: 275388899
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioAllowListPreferenceControllerTest
Change-Id: Ic936eb22aa4f6efd97d3a84b23a44fab83dd09a0
 2023-03-31 12:43:14 +08:00
TreeHugger Robot
36e511b35e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-03-29 22:22:14 +00:00
Bill Yi
bc45b9f125 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If406f25ee072b3c2a778d2e007abecc99f06caf6
 2023-03-28 17:58:08 -07:00
Bill Yi
113326ed83 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I278cdc816710d5eb2cf8fa3997d55aee0e3efa73
 2023-03-28 17:54:17 -07:00
Betty Chang
df94418ec6 Merge "To fix the footer link is not clickable in the Bluetooth Settings" am: cc7da9e61d am: 6ac664c975 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2507379

Change-Id: Ia05fb646720a4b0aeee71047f1aa9cecd519a6eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-24 15:56:20 +00:00
Betty Chang
cc7da9e61d Merge "To fix the footer link is not clickable in the Bluetooth Settings" 2023-03-24 15:01:48 +00:00
changbetty
d31f12eb4e To fix the footer link is not clickable in the Bluetooth Settings 
- Links are not allowed in footer preference title now. So follow the
   Wi-Fi UX design to add the string "Change". Let the user to click and
   go to the Bluetooth scanninng settings

Bug: 265167737
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=BluetoothSwitchPreferenceControllerTest

Change-Id: If9e666df7b987e0dbe3d550ac0af03b9d79230de
Merged-In: If9e666df7b987e0dbe3d550ac0af03b9d79230de
 2023-03-24 09:23:27 +00:00
Bill Yi
5fb9d8914e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia92d12739bb4d4ff065217c77e7f56bbe2a0cae4
 2023-03-22 12:31:10 -07:00
Wu Ahan
0067e9581b Merge "Use GlifLayout#setDescriptionText in SetupChooseLockGenericFragment" into tm-qpr-dev am: 3a2ef6db2f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22099962

Change-Id: Ibe03950c9d6e02ebd641e93df2cb5cb646dbfb35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 13:44:52 +00:00
Wu Ahan
3a2ef6db2f Merge "Use GlifLayout#setDescriptionText in SetupChooseLockGenericFragment" into tm-qpr-dev 2023-03-22 03:46:30 +00:00
Sally Yuen
1795481a72 Merge "Update Extra dim banner for tablets" into tm-qpr-dev am: 6d6736c1c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22076421

Change-Id: I781c0e19683127e794d63949979b1b5a2eb2ff4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 17:46:07 +00:00
Sally Yuen
6d6736c1c9 Merge "Update Extra dim banner for tablets" into tm-qpr-dev 2023-03-21 16:33:06 +00:00
Ahan Wu
ae84ac3530 Use GlifLayout#setDescriptionText in SetupChooseLockGenericFragment 
1. Use GlifLayout#setDescriptionText to align UX.
2. Remove redundant layout resources.
3. Add two new robotests.

Bug: 236948821
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SetupChooseLockGenericTest
Test: Check UI manually
Change-Id: I85cc984527fcc746e835d8fa508e78c96dfdcb94
 2023-03-21 06:27:51 +00:00
Betty Chang
aa7ec2d5fe Merge "[LE Audio] Set activity for result after scanning the QR code" am: 9541363952 am: 00a7d0788f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2495497

Change-Id: I7f299924d39ddc0952b301e622e4009064e923f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 10:29:38 +00:00
changbetty
7cf90fbe36 [LE Audio] Set activity for result after scanning the QR code 
Bug: 263554347
Bug: 265281156
Bug: 248409874
Test: manual test
Change-Id: Ia252f29ad9dfdc09266e91cc9ecaa32ed8c749c2
Merged-In: Ia252f29ad9dfdc09266e91cc9ecaa32ed8c749c2
 2023-03-20 06:48:36 +00:00
Bill Yi
77b98813c3 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-03-19 20:02:05 +00:00
Bill Yi
5f0516e69b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-03-19 20:02:05 +00:00
Grace Cheng
59992bbbb8 Merge "Update locked device icon in FingerprintEnrollIntroduction" into tm-qpr-dev am: e9c795c96b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22086565

Change-Id: I67dfb8b2e904668b7236187d727f4eae38720888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-18 06:43:39 +00:00
Grace Cheng
e9c795c96b Merge "Update locked device icon in FingerprintEnrollIntroduction" into tm-qpr-dev 2023-03-18 06:18:32 +00:00
Bill Yi
71e954c78b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I79c7f425dac1cd278eface63dc0c3702616bfc88
 2023-03-16 20:45:10 -07:00
Bill Yi
82c23db452 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie8640533b71ecdb1baf669edd91ed6df54df8a4d
 2023-03-16 20:40:36 -07:00
Sally
611d1adff3 Update Extra dim banner for tablets 
The corner radius on top left/bottom right now map to the device frame

Bug: 273553096
Test: manual check of light and dark theme
Change-Id: I8005ecdaa0d96df2e6b73a4e3b791a964f231708
 2023-03-16 17:30:31 +00:00
TreeHugger Robot
827333d9b6 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-03-15 21:24:10 +00:00
Bill Yi
a73552148b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idd94e1c8ca5d1a8f1c46786e83d83a3d6b68493c
 2023-03-14 19:12:19 -07:00
Bill Yi
1de90287e1 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7e52a4acd3f0f22fdc54abc909035f70d82173e9
 2023-03-14 19:03:27 -07:00