PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
118,279 Commits 1 Branch 0 Tags
fd39b53f5184f1222beb18c87b6733c53e561b0c
Commit Graph

118279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
XingHai Lu
fd39b53f51 Merge "Cleanup plurals in Settings, change <one> to <1> in string res file." 2022-12-14 02:10:08 +00:00
TreeHugger Robot
a464ca0e47 Merge "Make BatteryStatsHistoryIterator API compatible with Iterator" 2022-12-14 01:49:18 +00:00
TreeHugger Robot
3518578331 Merge "Remove redundant method in LocalMediaManager" 2022-12-14 01:47:02 +00:00
Diya Bera
942df78886 [automerger skipped] Merge "Flicker in Fingerprint Enrollment" into tm-qpr-dev am: 2d343061d3 am: c52d4922cc -s ours 
am skip reason: Merged-In I2581dfcc7054c5df1368d5d912dbbc4c8ea01f23 with SHA-1 37858ea1f2 is already in history

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

Change-Id: I59dff6dc0f9d03af3dd1c5cf96409ca53f8195d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 22:10:29 +00:00
Diya Bera
c52d4922cc Merge "Flicker in Fingerprint Enrollment" into tm-qpr-dev am: 2d343061d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20523590

Change-Id: I8fdd0725e4c0a1b0d2f7ced3ce058522566528f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 21:37:51 +00:00
Diya Bera
2d343061d3 Merge "Flicker in Fingerprint Enrollment" into tm-qpr-dev 2022-12-13 21:15:08 +00:00
TreeHugger Robot
9ff5eb35ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 47302fda11 -s ours am: 240835c715 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib7044e12a6c6d571d93e0b7b60f2ddc077a9eabd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 21:04:02 +00:00
Bill Yi
33b252d545 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4453455aae -s ours am: 2c7ca303ea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7a763c6ea7e9802a34bbc716e84b75ad51d24cb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 21:03:39 +00:00
TreeHugger Robot
240835c715 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 47302fda11 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I41d2cb5a62ffa6d03e24dfb143a4816881be2494
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 20:25:39 +00:00
Bill Yi
2c7ca303ea [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4453455aae -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I44b33cf33b581726795713834e56a6cf15ca5415
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 20:25:07 +00:00
TreeHugger Robot
47302fda11 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-12-13 19:49:15 +00:00
Yi Jiang
b94ae45f18 Merge "[conflict] Merge "Creates a flag for auto-rotate with face detection" into tm-qpr-dev am: 410c1d28bf am: 7075fd453d" 2022-12-13 19:44:44 +00:00
TreeHugger Robot
80bbf46773 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-12-13 19:39:12 +00:00
Yi Jiang
028b04d93c [conflict] Merge "Creates a flag for auto-rotate with face detection" into tm-qpr-dev am: 410c1d28bf am: 7075fd453d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20696311

Change-Id: I25c5fccdcffe89e651af4154738f0049f6c0d14c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 18:20:21 +00:00
Diya Bera
6b468377c1 Flicker in Fingerprint Enrollment 
Fixes: 259707991
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=MessageDisplayControllerTest
Change-Id: I2581dfcc7054c5df1368d5d912dbbc4c8ea01f23
Merged-in: I2581dfcc7054c5df1368d5d912dbbc4c8ea01f23
 2022-12-13 18:17:23 +00:00
Yi Jiang
7075fd453d Merge "Creates a flag for auto-rotate with face detection" into tm-qpr-dev am: 410c1d28bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20696311

Change-Id: I8fb334d8ac3783286c3cce1df3bd5d2c83a92c5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 17:06:07 +00:00
Yi Jiang
410c1d28bf Merge "Creates a flag for auto-rotate with face detection" into tm-qpr-dev 2022-12-13 16:27:35 +00:00
TreeHugger Robot
82789d15ce Merge "[Settings] eSIM transfer: MobileNetworkSettings" 2022-12-13 10:57:38 +00:00
Chaohui Wang
3199d66b93 Merge "Add spa flag for Picture-in-picture App List" 2022-12-13 10:46:00 +00:00
xinghailu
b5293a2d1c Cleanup plurals in Settings, change <one> to <1> in string res file. 
"One" and "1" are not same, such as "1st place" vs "a
place". Also in many languages, plurals expression is different with English, for more detail please check: go/android-i18n-plurals.
So in string res file, replace "one" with excat value "1" is a more
proper way.

Test: Existing unit tests still pass.
Bug: 199230342
Change-Id: I832abc38afc5d8816fa803865c25e6017cffa2c6
 2022-12-13 18:31:08 +08:00
Zoey Chen
ef2652887a Merge "[Settings] eSIM transfer: MobileNetworkListFragment" 2022-12-13 09:19:37 +00:00
Zoey Chen
5aa4d6915a [Settings] eSIM transfer: MobileNetworkSettings 
- Add new entry in pSIM: Convert to eSIM
 - Add new entry in eSIM: Transfer eSIM to another device

Srceenshot(pSIM): https://hsv.googleplex.com/6013596216590336
Srceenshot(eSIM): https://hsv.googleplex.com/6584033673740288

Bug: 261810065
Test: manual
Change-Id: Ifb1a6f8213037893939478caf1ced4a5705bdf66
 2022-12-13 08:54:20 +00:00
Chaohui Wang
9f735ab6ed Add spa flag for Picture-in-picture App List 
Bug: 235727273
Test: Manually with Settings for both flag on and off
Change-Id: I8d907a658406684998bc8b84c214462cb86fed88
 2022-12-13 16:30:19 +08:00
TreeHugger Robot
902911f3b5 Merge "Remove logging for count of shown / hidden apps in Battery Usage page." 2022-12-13 07:51:37 +00:00
PETER LIANG
ff861d54d4 Merge "Fix the preview couldn't be scrolled up and down when showing the scroll bar." 2022-12-13 05:50:51 +00:00
TreeHugger Robot
beee3044d8 Merge "Implement new keyboard settings UI." 2022-12-13 05:28:07 +00:00
Zaiyue Xue
4ee99b0e05 Remove logging for count of shown / hidden apps in Battery Usage page. 
Bug: 262187603
Fix: 262187603
Test: presubmit
Change-Id: Iff3bcb07f6df424c7498f128739743210d8e7951
 2022-12-13 13:17:56 +08:00
danielwbhuang
1639782df6 Implement new keyboard settings UI. 
Add enabled input method locales page
Add keyboard layout picker page
Add keyboard settings entry in BT device detail

Bug: 242680718
Test: local test
Change-Id: I07e068ecde553d394697b25cb573f806229f6f52
 2022-12-13 10:47:07 +08:00
Arc Wang
d115638c36 Merge "Fix SettingsHomepageActivity crash during configuration change" into tm-qpr-dev am: a0e5f09d94 am: a538747a6a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20615154

Change-Id: Id0b95aa046f8b225d75bedd0ff752f8f1b0b78d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 02:45:16 +00:00
Arc Wang
a538747a6a Merge "Fix SettingsHomepageActivity crash during configuration change" into tm-qpr-dev am: a0e5f09d94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20615154

Change-Id: I7acafe30f3cccfb2cf1428493f5cee42c5e8e9a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 02:07:35 +00:00
Arc Wang
a0e5f09d94 Merge "Fix SettingsHomepageActivity crash during configuration change" into tm-qpr-dev 2022-12-13 01:19:06 +00:00
Bill Yi
4453455aae Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I351b7072bcfca6b3bc3808c49290cdd9ef120670
 2022-12-12 16:59:11 -08:00
Bill Yi
79447654e8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I89308a4526fb5fe1a30c88de3dd733f8a20bd5dc
 2022-12-12 16:55:46 -08:00
Diya Bera
19856fc03c Merge "Flicker in Fingerprint Enrollment" 2022-12-12 20:57:26 +00:00
Yi Jiang
1145b26ac7 Creates a flag for auto-rotate with face detection 
The flag is enabled by default. And will be disabled on foldable
devices.

Test: locally
Bug: 236249360

Change-Id: I8c90533f6011531a4f00af5f2514579638604067
 2022-12-12 19:49:16 +00:00
Diya Bera
37858ea1f2 Flicker in Fingerprint Enrollment 
Fixes: 259707991
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=MessageDisplayControllerTest
Change-Id: I2581dfcc7054c5df1368d5d912dbbc4c8ea01f23
 2022-12-12 18:16:42 +00:00
Darrell Shi
5fe30a5d97 [automerger skipped] Merge "Update screensaver preference summary when on." into tm-qpr-dev am: 7bae5625a6 am: ef4fb09916 -s ours 
am skip reason: Merged-In I40483f266c42a6e49e513208ba513d469d67f85a with SHA-1 adb864a784 is already in history

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

Change-Id: I5c94ad466e8a510c5daad6b18ec99a69af375357
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-12 17:37:22 +00:00
Darrell Shi
ef4fb09916 Merge "Update screensaver preference summary when on." into tm-qpr-dev am: 7bae5625a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20683706

Change-Id: Ie01d33707536f511f144d82fc13b2d02f2825941
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-12 17:01:34 +00:00
Darrell Shi
7bae5625a6 Merge "Update screensaver preference summary when on." into tm-qpr-dev 2022-12-12 16:41:38 +00:00
Weng Su
941cae99a5 Merge "fix WifiUtils:isNetworkLockedDown() null pointer issue" am: 956f288d1d am: ee773103f8 am: cd486c06d0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2334743

Change-Id: Icca73d74b5ee6c32607761c8f3c45ab565419604
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-12 14:07:17 +00:00
Automerger Merge Worker
d6f76e0081 [automerger skipped] Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master am: b54c768b90 -s ours am: 99c0b8baf6 -s ours 
am skip reason: Merged-In I937a4acf0917a16660ff237d0511a5883864a1b9 with SHA-1 a3c97876bb is already in history

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

Change-Id: I973016f96d28794d7241931f72730c27baf36b21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-12 13:50:04 +00:00
Xin Li
ccca1eba6c [automerger skipped] Merge "Merge Android 13 QPR1" am: b6df569c32 -s ours am: 06b6887d64 -s ours am: bd7e05c797 -s ours 
am skip reason: Merged-In I937a4acf0917a16660ff237d0511a5883864a1b9 with SHA-1 a3c97876bb is already in history

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

Change-Id: Ie5d8c08699d628d10922fe9f793d2ab5e039ed1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-12 13:47:40 +00:00
Bonian Chen
b7480f6713 Merge "[Settings] Add QR code for EID and enable text copy" 2022-12-12 12:50:51 +00:00
Bonian Chen
6a383db74b [Settings] Add QR code for EID and enable text copy 
1. Add QR code for EID (when available)
2. Enable text copy

Bug: 260540995
Test: local
Change-Id: Iba7eace2ca3142a065219a3e65371af52df1511c
 2022-12-12 12:50:28 +00:00
Xin Li
7d0f2b7e96 [automerger skipped] Merge "Merge Android 13 QPR1" am: b6df569c32 -s ours am: ef13057b38 -s ours am: f63f3c682d -s ours 
am skip reason: Merged-In I937a4acf0917a16660ff237d0511a5883864a1b9 with SHA-1 a3c97876bb is already in history

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

Change-Id: Icd0ac12c0b8c0d4a934d87ab05c06961a86d5944
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-12 11:59:13 +00:00
Xin Li
bd9ff743c4 [automerger skipped] Merge Android 13 QPR1 am: ea401a8bba -s ours am: 61084112c8 -s ours am: 862a28bbfe -s ours 
am skip reason: Merged-In I937a4acf0917a16660ff237d0511a5883864a1b9 with SHA-1 a3c97876bb is already in history

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

Change-Id: Icf7339d01484896e422f1cec48631973a7f03b2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-12 11:56:46 +00:00
Peter Liang
edfed449c3 Fix the preview couldn't be scrolled up and down when showing the scroll bar. 
Actions:
1) Add the specific attribute to disallow parent view intercept the touch event of child view to avoid conflicting with the nested scroll view.
2) Add the scroll view into the page of the mail content preview.

Bug: 220078816
Test: manual test
Change-Id: I7f3b2afdf76e501386d9080e7a0eed8b92e28d3b
 2022-12-12 19:32:52 +08:00
TreeHugger Robot
ecb674742b Merge "Don't hide 1% battery usage apps but show percentage "-" instead." 2022-12-12 08:49:22 +00:00
PETER LIANG
97b7731f04 Merge "Fix the summary of Magnification didn’t be updated after the content change." 2022-12-12 07:47:49 +00:00
Zaiyue Xue
1bf57958d2 Don't hide 1% battery usage apps but show percentage "-" instead. 
Bug b/242252864 will be fixed at the same time.

screen_record: https://drive.google.com/open?id=1ycEuazqQZzNWGO8E2Fh3GdgyTEd2Z9s0&authuser=0&resourcekey=0-x9BJJE6932jIv9fFoecjeQ&usp=drive_link

Bug: 262187603
Bug: 242252864
Fix: 262187603
Fix: 242252864
Test: manual
Change-Id: Id1a8b5291d66a38fb86f168d3115ae566e6ec079
 2022-12-12 14:40:56 +08:00