PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,458 Commits 1 Branch 0 Tags
f122de33eff0fb2ea9e7dc2e5d53f967d13a75cc
Commit Graph

121458 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
392cd4be96 Merge "[Settings] 1. Show default subId SIM page if get an intent with invalid subId 2. Fix the hotswap UI issue" into udc-dev am: 25b2c5a63c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21947524

Change-Id: I4dc8aa7aa34749795ee5341bbd92b2c8b50e4d23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 12:13:21 +00:00
TreeHugger Robot
de6666f95b Merge "[Settings] 1. Show default subId SIM page if get an intent with invalid subId 2. Fix the hotswap UI issue" into udc-dev am: 25b2c5a63c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21947524

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

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

Change-Id: I3c87c1030ed7d9af51e05cabf909509dc8628506
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 12:12:49 +00:00
Matías Hernández
32f8c390c0 Fix icons size in "Add DND Schedule" dialog 
(An alternative option is to use app_icon_size and let the row grow with a padding/margin... but the icons were humongous, so having a fixed size looks better).

Fixes: 231677100
Test: Manually on phone & tablet
Change-Id: Icea9c1a5af47e66ee35685686fbd927d04adae0c
 2023-03-13 12:10:36 +00:00
TreeHugger Robot
25b2c5a63c Merge "[Settings] 1. Show default subId SIM page if get an intent with invalid subId 2. Fix the hotswap UI issue" into udc-dev 2023-03-13 11:51:12 +00: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
Zaiyue Xue
64965ded30 Replace stream().min() to Collections.min() to avoid stream object. 
Bug: 273175976
Fix: 273175976
Test: manual
Change-Id: I36a162443e8e275b03f804edb4fc6b421deb345d
 2023-03-13 19:06:53 +08:00
Matías Hernández
89f93a9bb1 Close ZenModeScheduleRuleSettingsActivity when rule is deleted 
This fixes an issue where the ZenRuleButtonsPreferenceController was redirecting to the rule list, but the container fragment was still trying to refresh the rule, leading to a "rule not found" toast. This also makes the transition look nicer, as it's a "back" instead of a "forward" animation now.

Fixes: 244103559
Test: Manually on phone & tablet
Change-Id: Ie26511dcaec4c7976f488936cdc6d417110ca1b1
 2023-03-13 12:03:27 +01: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
TreeHugger Robot
22ab6c2735 Merge "Fix b/273175976: Screen time counts the time before full charge." into udc-dev am: 85ca6e6a5e am: 2a28840820 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21982791

Change-Id: I3b34ef7587fe6fa99f01854bcaed4098b8848c3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 10:41:32 +00:00
TreeHugger Robot
c21d06d8e0 Merge "Fix b/273175976: Screen time counts the time before full charge." into udc-dev am: 85ca6e6a5e am: 7db8aed96c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21982791

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

Change-Id: Ifee986d6e5257b03d4e22959c5cee43512c5cb30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 10:39:07 +00:00
Jason Hsu
977a6bf0fa Merge "The string of "Hearing device shortcut" is displayed wrong when shortcut set to gesture." into udc-dev am: de202d5307 am: 13c960629b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21978663

Change-Id: Ib89bd67123b705c864d8ec7c4bd336c8699670fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 10:37:52 +00:00
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
2a28840820 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: I16f465c28dd7638ab0f380ec31c3e05eaf07ef54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 10:23:33 +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
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
13c960629b 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: Ibaa6b0372a74f0ad07a3f7a3dce0a26c9f6cdf7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 10:05:55 +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
Candice Lo
f4969d69d1 [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: dc2b52fa21 -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: I3d06c42e0e8b96032f6aa4a0f7539bdda3909a33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 09:10:39 +00:00
Candice Lo
a86aabee4a [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: 151ffe1ea7 -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: I40b7809d9bf2cc45a54b7f384f8284d505b77cdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 09:08:34 +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
Candice Lo
151ffe1ea7 [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: I45626763f82479e0a953abad549ed62af73b562b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 08:36:07 +00:00
Zoey Chen
63978e7e52 [Settings] 1. Show default subId SIM page if get an intent with invalid 
subId 2. Fix the hotswap UI issue

Bug: 271635200
Bug: 271347499
Test: local test
Change-Id: Iac61a211fce7bcd85da48cb291f46584cf43f5c5
 2023-03-13 08:12:20 +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
cbc16fc5af Merge "Remove subtext when enrollment stage changes" into tm-qpr-dev am: 9777ea2fdf am: 9a93c8a00f am: 3a4c6feb0a am: 0fcf95b375 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21911480

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

Change-Id: I44eaa8ffc6cf0fb3ec6cabfacb1b672033fa6b2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-11 02:46:39 +00: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
bee78a3d59 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: Ieaf430842a766ff697b5de93bf4ed24db05186ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-11 02:00:12 +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
Bill Yi
8b02de1799 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 869cd2a572 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icded7105ee4854ad9943c554f2bdeb49e4fc814d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 21:50:54 +00:00
Bill Yi
f5fe27e59e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 44d7c4e2ae -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I943f12820f36dc7bcfbc1264ac2bdaa4fa64c623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 21:50:47 +00:00
Bill Yi
c2f0c7b380 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fa0cc20b94 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I809f5c79ff573848275a196be5b08a2b74b41ece
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 21:50:44 +00:00
Bill Yi
03c863614d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c3f35c7dd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I62904eafe1d1b0cbd4b08cf84a761137e8e889c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 21:50:40 +00:00
Bill Yi
b052aa6400 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 8fe591389b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I94b235b1e698bb00fd2f3f9394c2629ca5f96557
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 21:50:36 +00:00
Bill Yi
c0c88802c4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d5a9fbb23 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1176718cb5f1cb2af438642fa2a30462082e9098
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 21:48:30 +00:00
Bill Yi
869cd2a572 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-03-10 21:18:23 +00:00
Bill Yi
fa0cc20b94 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-03-10 21:18:23 +00:00
Bill Yi
8fe591389b Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-03-10 21:18:23 +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
1883fc0bf6 Merge "Show single icon layout for unknown device type in advanced header." into udc-dev am: 76452f3a1f am: adb043c201 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21700162

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

Change-Id: I04df492aaa2cfc42d7de65c41788f3dceb582dd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 19:22:10 +00:00