PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
120,619 Commits 1 Branch 0 Tags
28e22dd726dec67b313f91c9236fe7935f1a55b0
Commit Graph

120619 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ykhung
28e22dd726 Update incompatible charging string for different product 
Bug: 271775549
Test: presubmit
Change-Id: Iec7b91b2bcb018f51127b54e500be9c53d75515b
 2023-03-14 00:49:08 +08:00
Paul Wang
eb39a6dbd5 Merge "Avoid disabling LE Audio when BT is off" am: dd3d813ff3 am: d60b851b93 am: d4fbc38279 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2472124

Change-Id: I7817be6bc82ac48127b00d0de8d644450a21711e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 11:35:03 +00:00
Paul Wang
d4fbc38279 Merge "Avoid disabling LE Audio when BT is off" am: dd3d813ff3 am: d60b851b93 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2472124

Change-Id: I2ba651e080ca1f054ff03d3d125848031ced4e51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 10:58:14 +00:00
Paul Wang
d60b851b93 Merge "Avoid disabling LE Audio when BT is off" am: dd3d813ff3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2472124

Change-Id: I231847656a260eff43204306faf8c3908c9fc8e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 10:22:11 +00:00
TreeHugger Robot
85ca6e6a5e Merge "Fix b/273175976: Screen time counts the time before full charge." into udc-dev 2023-03-13 10:15:36 +00:00
Paul Wang
dd3d813ff3 Merge "Avoid disabling LE Audio when BT is off" 2023-03-13 09:55:49 +00:00
Jason Hsu
de202d5307 Merge "The string of "Hearing device shortcut" is displayed wrong when shortcut set to gesture." into udc-dev 2023-03-13 09:34:58 +00:00
Zaiyue Xue
a528f1e382 Fix b/273175976: Screen time counts the time before full charge. 
Use the raw start timestamp instead of the first timestamp in the level
map to query app usage time.

Bug: 273175976
Fix: 273175976
Test: manual
Change-Id: Idb43b2bd5378e2f34ec722354408754f4a439c6d
 2023-03-13 15:59:05 +08:00
Candice Lo
b64632bcf7 [automerger skipped] Merge "Set the settings key when the font size is changed" into tm-qpr-dev am: 91eab671d1 am: 934beb4127 -s ours 
am skip reason: Merged-In I382e4ecd3c335d7b046f157cedc093fc40c3a77a with SHA-1 dbaea0f1c2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21791725

Change-Id: Ib94406415a0913a62c1a93a4a3ab56b25543950e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 07:57:53 +00:00
Candice Lo
934beb4127 Merge "Set the settings key when the font size is changed" into tm-qpr-dev am: 91eab671d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21791725

Change-Id: I0b61473ac3ef0a91e2ed901d7b2deb1e35268866
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 07:22:21 +00:00
Candice Lo
91eab671d1 Merge "Set the settings key when the font size is changed" into tm-qpr-dev 2023-03-13 06:51:27 +00:00
jasonwshsu
2bf80d8bf2 The string of "Hearing device shortcut" is displayed wrong when shortcut set to gesture. 
Root Cause: Did not update dialog when user back to previous page.

Solution: Merge the solution in ToggleFeaturePreferenceFragment.java

Bug: 263451053
Test: manual test
Change-Id: I99513fa70cf44b32a0fb78a5f953e41373e086f4
 2023-03-12 20:47:25 +08:00
Diya Bera
3a4c6feb0a Merge "Remove subtext when enrollment stage changes" into tm-qpr-dev am: 9777ea2fdf am: 9a93c8a00f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21911480

Change-Id: I27b79bf6dcc69e42ea3af7f5b1274173676996fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-11 01:14:57 +00:00
Diya Bera
9a93c8a00f Merge "Remove subtext when enrollment stage changes" into tm-qpr-dev am: 9777ea2fdf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21911480

Change-Id: Iddfaa9baa18e16d3b1f5e06de88d74faf208c811
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 23:26:58 +00:00
Diya Bera
9777ea2fdf Merge "Remove subtext when enrollment stage changes" into tm-qpr-dev 2023-03-10 21:11:09 +00:00
Vania Januar
76452f3a1f Merge "Show single icon layout for unknown device type in advanced header." into udc-dev 2023-03-10 18:15:37 +00:00
Treehugger Robot
a38c972ef0 Merge "Adb is disconnecting during Monkey Test Run." am: 821e70ea59 am: c8a58a249d am: 3c62dd3543 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2348443

Change-Id: If51239c47ffc2ebf9c80ce5b8f2e27d8b187a871
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 17:04:09 +00:00
Treehugger Robot
3c62dd3543 Merge "Adb is disconnecting during Monkey Test Run." am: 821e70ea59 am: c8a58a249d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2348443

Change-Id: I8ec06e45f02f48bfec30051159ed8a931a11e2e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 16:27:37 +00:00
Treehugger Robot
c8a58a249d Merge "Adb is disconnecting during Monkey Test Run." am: 821e70ea59 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2348443

Change-Id: I76493ccb15ff2d58045061ef4c62b20f772aab30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 15:53:41 +00:00
Treehugger Robot
821e70ea59 Merge "Adb is disconnecting during Monkey Test Run." 2023-03-10 15:19:15 +00:00
Marcelo Arteiro
7e2d77a717 Merge "Revert "Automated Token Alignment Android/Material"" into udc-dev 2023-03-10 13:43:23 +00:00
Junyu Lai
3eb30fb31c Merge "Do not crash when duplication found in merged imsi list" am: ae267bae74 am: 0da4abe1db am: 4beef2e82e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2479336

Change-Id: I7323a6fbd1e8f7595fdb7c29e7520cff5ac12a00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 10:48:49 +00:00
Junyu Lai
4beef2e82e Merge "Do not crash when duplication found in merged imsi list" am: ae267bae74 am: 0da4abe1db 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2479336

Change-Id: Ia79b5f286b4269c38fc3a2fa990615251694a020
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 10:12:13 +00:00
Junyu Lai
0da4abe1db Merge "Do not crash when duplication found in merged imsi list" am: ae267bae74 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2479336

Change-Id: I3e55fc5496918d8e2d0c230df74b62e1e6847fb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 09:37:20 +00:00
Junyu Lai
ae267bae74 Merge "Do not crash when duplication found in merged imsi list" 2023-03-10 09:01:44 +00:00
George Chang
541a7153a5 Merge "Update title string for Nfc Tag App Preference" into udc-dev 2023-03-10 05:11:20 +00:00
Ting-Kang Chang
d31de7593e Merge "Add debug logs for updateBatteryStatus and TopLevelBatteryPreferenceController updating." into udc-dev 2023-03-10 02:32:59 +00:00
Marcelo Arteiro
1b599e0232 Revert "Automated Token Alignment Android/Material" 
This reverts commit c9ca4a9014.

Reason for revert: Black Search Box in Settings App (Light Theme)

Change-Id: I936e977ce044b8da41d818d6b3392adc6fd1e4e6
 2023-03-09 23:40:40 +00:00
Dmitry Dementyev
18df885c94 Merge "Use updated lockscreen validation API in Settings." into udc-dev 2023-03-09 22:15:43 +00:00
Weng Su
bcca5ebf1a Add "Speed & compatibility" preference to Wi-Fi hotspot Settings 
- Show 4 speed types in summary
  - 2.4 Ghz
  - 5 Ghz
  - 2.4 and 5 GHz
  - 6 GHz

Bug: 245258763
Test: manual test
atest -c WifiTetherViewModelTest
atest -c WifiHotspotRepositoryTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherSettingsTest

Change-Id: I6deb41cb355b0ceb1f1fd2d84408a83b90433e7d
 2023-03-09 20:06:37 +08:00
Vania Januar
ebf06975e3 Merge "Remove battery event time detection from StylusUpdater." into udc-dev 2023-03-09 10:32:51 +00:00
Junyu Lai
8005bc8f5b Do not crash when duplication found in merged imsi list 
For some unknown reason, the merged imsi list might contain
duplicated items. Deduplication for better error handling.

Test: make RunSettingsRoboTests
Fix: 271298466
Change-Id: I3cbe8f9441769963a16720fc5128db173fa0868b
 2023-03-09 16:55:35 +08:00
YK Hung
16b4fb33e8 Merge "Add configChanges for PowerUsageSummaryActivity for rotation" into udc-dev 2023-03-09 08:50:19 +00:00
ykhung
0c3957db8b Add configChanges for PowerUsageSummaryActivity for rotation 
Add configChanges to avoid the battery settings main page is recreated while rotating the device to improve rotation performance, but we still need to investigate the PowerUsageAdvanced re-create case

Bug: 271380711
Test: presubmit & manual
Change-Id: I7629de89d9d23b08fc82369e1f9f79081e99625a
 2023-03-09 15:22:12 +08:00
Justin Ghan
037eda8910 Merge "Support stylus handwriting in settings search bar" into udc-dev 2023-03-09 07:02:58 +00:00
George Chang
a6addced52 Update title string for Nfc Tag App Preference 
Bug: 244272155
Test: manual
Change-Id: I41ac15099f2d6fd0a7d7858f191d5ec0336b97b9
 2023-03-09 06:02:48 +00:00
Ting-Kang Chang
ec90572f75 Add debug logs for updateBatteryStatus and TopLevelBatteryPreferenceController updating. 
Bug: 271665638
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: I1c9cc3cfcb54051223df2ad46947d7f0c1ebbdb0
 2023-03-09 13:22:53 +08:00
Ankita Vyas
f9c62f2275 Merge "Display toast for clone app creation and completion in App Info page." into udc-dev 2023-03-09 05:10:55 +00:00
Diya Bera
8ceded494f Remove subtext when enrollment stage changes 
Bug: 272145668
Test: Manual (Try enrolling fingerprint in UDFPS, the subtext should
disappear when lottie asset is introduced)

Change-Id: I912ff2b32644d05cc189105ae1679fa14b04a1ef
 2023-03-08 23:00:47 +00:00
Yu-Ting Tseng
0f90688ede Merge "Remove CACHED_PROC_STATES which is unused." into tm-qpr-dev am: f7a098295f am: 11ab38f690 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21779083

Change-Id: Ic12845f37d61bd197c3c7eaeecf742aac572947b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-08 22:49:49 +00:00
Yu-Ting Tseng
11ab38f690 Merge "Remove CACHED_PROC_STATES which is unused." into tm-qpr-dev am: f7a098295f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21779083

Change-Id: I995d75f9a0cf98b329f0de672a7677307a434695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-08 22:17:51 +00:00
Dmitry Dementyev
1ab3fe5a9e Use updated lockscreen validation API in Settings. 
Test: manual
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
Bug: 269256333
Change-Id: I660dea98eace96ed241b0a90f12ddeb742381dc0
 2023-03-08 22:09:25 +00:00
Yu-Ting Tseng
f7a098295f Merge "Remove CACHED_PROC_STATES which is unused." into tm-qpr-dev 2023-03-08 21:24:57 +00:00
Vania Januar
4837c05b3f Remove battery event time detection from StylusUpdater. 
StylusManager battery listener now triggers whenever the
stylus battery becomes stale, so we no longer need to track
event time from the updater.

Bug: 270422546
Test: StylusDeviceUpdaterTest
Change-Id: I36f5dc132a95f7d4649cec2bda1d457edc1f64bd
 2023-03-08 18:33:56 +00:00
Justin Ghan
1cc772d30d Support stylus handwriting in settings search bar 
Bug: 270708561
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.search
Change-Id: Iec6d6deb68b834654b2bbc11d96227db5319b0f0
 2023-03-08 10:20:44 -08:00
TreeHugger Robot
cebb55826f Merge "Fix failing checkcolor_hook in Settings" into udc-dev 2023-03-08 14:00:45 +00:00
Matías Hernández
0aba4e342a Fix failing checkcolor_hook in Settings 
(Fixed according to the instructions in prebuilts/checkcolor/README.md).

Fixes: 272244692
Test: repo upload
Change-Id: Ib53c6b302984250e6c4dfe058a74697a62b94e26
 2023-03-08 13:35:00 +00:00
Tiger Huang
2238b4e807 Merge "Add an developer option to enable config_navBarDefaultTransparent" into udc-dev 2023-03-08 12:47:29 +00:00
Ankita Vyas
0da1131343 Display toast for clone app creation and completion in App Info page. 
Bug: 271990959
Test: manual
Change-Id: I93641c1bf675ac531fbf8201203d5141aafd39cc
 2023-03-08 10:55:37 +00:00
Maciej Żenczykowski
850993d166 Merge "settings: allow enabling ethernet tethering independent of link state" am: 905d584b15 am: f73112b56e am: 7e21dec65e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2475089

Change-Id: I5e5711aeb90bb8bd860fd8515975f2b7d90ce689
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-08 05:28:51 +00:00