PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
120,793 Commits 1 Branch 0 Tags
7db8aed96ce84f074c096806d85aea24fad79084
Commit Graph

120793 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
7db8aed96c Merge "Fix b/273175976: Screen time counts the time before full charge." into udc-dev am: 85ca6e6a5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21982791

Change-Id: I948b11e9e74c4c2b010299522991861c54d11d4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 10:23:59 +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
Jason Hsu
c25e248a66 Merge "The string of "Hearing device shortcut" is displayed wrong when shortcut set to gesture." into udc-dev am: de202d5307 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21978663

Change-Id: I38b2df8182985fe1c3e38dc22f2d5992307150cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 10:06:39 +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
Candice Lo
dc2b52fa21 [automerger skipped] Merge "Set the settings key when the font size is changed" into tm-qpr-dev am: 91eab671d1 am: 934beb4127 -s ours am: b64632bcf7 -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: I56a3858c8a8dc18458c365452485cbbd066cee2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 08:37:02 +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
0fcf95b375 Merge "Remove subtext when enrollment stage changes" into tm-qpr-dev am: 9777ea2fdf am: 9a93c8a00f am: 3a4c6feb0a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21911480

Change-Id: I50bc1a5529ebb04798f8b41c7cfa675bcaff54bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-11 02:29:44 +00: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
5b24c992e1 Merge "Show single icon layout for unknown device type in advanced header." into udc-dev am: 76452f3a1f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21700162

Change-Id: I5cf3fa692a8bd992e78b2a42fe3817487683f5e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 18:55:27 +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
f719ca7ec0 Merge "Adb is disconnecting during Monkey Test Run." am: 821e70ea59 am: c8a58a249d am: 3c62dd3543 am: a38c972ef0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2348443

Change-Id: I8b60d17de7e930436142107da0dfd1fee29c0c88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 17:58:19 +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
e7250864cd Merge "Revert "Automated Token Alignment Android/Material"" into udc-dev am: 7e2d77a717 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21944880

Change-Id: Ia16e68a02b5f88082f4b6f7468580d261a6cb422
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 14:09:07 +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
101d035e5f Merge "Do not crash when duplication found in merged imsi list" am: ae267bae74 am: 0da4abe1db am: 4beef2e82e am: 3eb30fb31c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2479336

Change-Id: Ib5ac7af875fc0e29301739ebe147b93eb8e207c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 12:41:54 +00:00
George Chang
3785967f8e Merge "Update title string for Nfc Tag App Preference" into udc-dev am: 541a7153a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21918803

Change-Id: I6bae3dfae9a53f92761770b2a7aa08b923b2d115
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 12:41:45 +00:00
Ting-Kang Chang
3d500900b7 Merge "Add debug logs for updateBatteryStatus and TopLevelBatteryPreferenceController updating." into udc-dev am: d31de7593e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21858528

Change-Id: Ia1311e3f57008829afa03d6dcca6b985b86d7302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 12:41:13 +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
56deb1bde4 Merge "Use updated lockscreen validation API in Settings." into udc-dev am: 18df885c94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21910534

Change-Id: I0335cc899f0fc5b88497e5d0be3821365518e60f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-09 22:45:31 +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
d9026c1914 Add "Speed & compatibility" preference to Wi-Fi hotspot Settings am: bcca5ebf1a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21858522

Change-Id: I8731bece358e754a93ad6751ccfc81df82fd8578
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-09 15:59:11 +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
026cd4273a Merge "Remove battery event time detection from StylusUpdater." into udc-dev am: ebf06975e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21787129

Change-Id: I51edf97f50865769e1431484203e94d65e2c1cd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-09 11:09:15 +00:00
YK Hung
c05e7dabf0 Merge "Add configChanges for PowerUsageSummaryActivity for rotation" into udc-dev am: 16b4fb33e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21918805

Change-Id: Ibc77b30118851625895da35d41946683f02794a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-09 11:08:33 +00: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
Justin Ghan
ad618f755a Merge "Support stylus handwriting in settings search bar" into udc-dev am: 037eda8910 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21477804

Change-Id: I6839d9b7f0f248caa25825558728c9bd402cf01c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-09 07:31:59 +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
Ankita Vyas
c0ebdcfd49 Merge "Display toast for clone app creation and completion in App Info page." into udc-dev am: f9c62f2275 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809544

Change-Id: Ib4c39e45a1bca8e48822d4a13dff8ec91aa48a0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-09 05:44:11 +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
Yu-Ting Tseng
da3bf9287f Merge "Remove CACHED_PROC_STATES which is unused." into tm-qpr-dev am: f7a098295f am: 11ab38f690 am: 0f90688ede 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21779083

Change-Id: I520b6454586cf5684b648dea28ec113f137db4d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-08 23:23:16 +00:00