PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
119,278 Commits 1 Branch 0 Tags
ee7b709aff0bc7d6a4c3e543bcdfdb0bb59c505c
Commit Graph

119278 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
8effce9d06 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c3804e1e0e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia465bce7a08197e9c3db76f2022ee30404d25758
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 16:23:20 +00:00
Behnam Heydarshahi
cf022d4537 Merge "Ring & notif vol missing on a largescreen device" into tm-qpr-dev 2023-01-12 16:15:27 +00:00
Behnam Heydarshahi
9d63dc8b6e Merge "Fix Maps PIP issue: DeviceConfig permission denial" into tm-qpr-dev 2023-01-12 16:14:15 +00:00
TreeHugger Robot
066a102995 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: d161ba7652 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9c84cf9aee552193c41fea708ac6ebe43aca37e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 15:58:50 +00:00
Bill Yi
e3e4de9e83 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f5f00347a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I61bddef910d08f34da363d9aa3e64fb11a7da42f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 15:58:41 +00:00
Bill Yi
6ae98c88cf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fb0de39122 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I590e56b6516e8789310a68289f52d7ff5bebd121
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 15:58:21 +00:00
Josep del Río
8d1cb3c97a [automerger skipped] Merge "NEW Use Mockito 4.6.1 API" into tm-qpr-dev am: 98bfab5f23 -s ours am: 5bff56abab -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e81d98cc08 is already in history. Merged-In was found from reverted change.

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

Change-Id: I472a7385324fbce5692caaa31891047ffa87e349
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 14:53:52 +00:00
Sorin Basca
465086f7e8 [automerger skipped] NEW Use Mockito 4.6.1 API am: a962b4b712 -s ours am: 721798dc8c -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e81d98cc08 is already in history. Merged-In was found from reverted change.

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

Change-Id: I5ba2a5b613861a60ac3cab86f231c99cfe1eb97f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 14:53:43 +00:00
Josep del Río
5bff56abab [automerger skipped] Merge "NEW Use Mockito 4.6.1 API" into tm-qpr-dev am: 98bfab5f23 -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e81d98cc08 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I8eb25f71cf788e590d6033e156cd0c4b67e548c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 14:50:31 +00:00
Sorin Basca
721798dc8c [automerger skipped] NEW Use Mockito 4.6.1 API am: a962b4b712 -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e81d98cc08 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: Ie2483910aa01e825f3257f0d07c3fc399d434835
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 14:49:47 +00:00
Josep del Río
98bfab5f23 Merge "NEW Use Mockito 4.6.1 API" into tm-qpr-dev 2023-01-12 14:17:44 +00:00
Sunny Shao
97cc69b7aa Fix checkcolor_hook error 
Bug: 265259233
Test: repo upload OK
Change-Id: Iff552bf0927136e747de502d8aae298c114c251e
 2023-01-12 22:00:44 +08:00
TreeHugger Robot
cede929542 Merge "Integrate modifier keys settings UI with APIs" 2023-01-12 11:49:59 +00:00
TreeHugger Robot
b8a4577914 Merge "Fix b/265054711: Settings crash on changing device orientation from battery usage page." 2023-01-12 10:34:05 +00:00
danielwbhuang
aa1d9c4dba Integrate modifier keys settings UI with APIs 
1. getModifierKeyRemapping
2. remapModifierKey
3. clearAllModifierKeyRemappings

Demo: go/modifier_keys_settings_demo

Bug: 244535460
Test: local test
Change-Id: I47bcd0b58637feb68c579112a991371490af0157
 2023-01-12 18:26:31 +08:00
Zaiyue Xue
9e9886997f Merge "[Battery usage U] [UI] Show screen time in the battery detail usage page" 2023-01-12 09:18:25 +00:00
Zaiyue Xue
6676e1758b Fix b/265054711: Settings crash on changing device orientation from battery usage page. 
Bug: 265054711
Fix: 265054711
Test: presubmit
Change-Id: I585fb054980d4536bb05d4778cb439031f34232f
 2023-01-12 17:10:47 +08:00
TreeHugger Robot
d481b398dd Merge "[Battery usage U] [UI] Add a threshold to filter out very small battery usage items in the app list" 2023-01-12 09:10:31 +00:00
TreeHugger Robot
cdbb4e4114 Merge "Add help/error msg for ProgressViewModel" 2023-01-12 09:00:28 +00:00
Bill Lin
eb74256eb3 [automerger skipped] Merge changes from topic "pattern-view-size" into tm-qpr-dev am: 3959e27ec1 am: 81974ace76 -s ours 
am skip reason: Merged-In I0baa2be65b797ca70f9de43bc8c5e3187a2d28ad with SHA-1 c2bfb4fbf3 is already in history

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

Change-Id: Ibe2db726e392a030e623a140c0fab9adbac04d65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 08:38:32 +00:00
lbill
f42e1bdbaf [automerger skipped] 2/ Define pattern view size by UX deck am: 43f0076830 am: 4e148d71f1 -s ours 
am skip reason: Merged-In Icfc2932279aa9e3a065030dbb7ff73f12ed6d081 with SHA-1 3bfefd16af is already in history

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

Change-Id: Icddfdc17c4981dda1ed9f6edfa6010c7a68b3de0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 08:37:57 +00:00
Bill Lin
81974ace76 Merge changes from topic "pattern-view-size" into tm-qpr-dev am: 3959e27ec1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20454693

Change-Id: I69f420a942336d1fb589793662d1e700fa64b173
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 08:11:01 +00:00
lbill
4e148d71f1 2/ Define pattern view size by UX deck am: 43f0076830 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20426387

Change-Id: Id6d15e9cb8db5488676fdd395885c8f10f55fcdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 08:10:24 +00:00
Bill Lin
3959e27ec1 Merge changes from topic "pattern-view-size" into tm-qpr-dev 
* changes:
  3/ SUW lib Glif and theme add additional padding in sud_layout_content
  2/ Define pattern view size by UX deck
 2023-01-12 07:56:23 +00:00
Zaiyue Xue
0639abfcca [Battery usage U] [UI] Show screen time in the battery detail usage page 
screen record: https://drive.google.com/file/d/1TUbcysrVoj10iUhoMIT0wuCDJY8EMpy7/view?resourcekey=0-lS9d0aIQqrgJ7CpOlsOlYw

Bug: 258125117
Fix: 258125117
Test: manual
Change-Id: I31fbc7c45473ded254ebf1b1e82e09dbc88480cf
 2023-01-12 15:45:51 +08:00
Zaiyue Xue
4ecf42f1bb [Battery usage U] [UI] Add a threshold to filter out very small battery usage items in the app list 
Bug: 264840285
Fix: 264840285
Test: manual
Change-Id: I36a6c0dc284d09efcf82316db1541d289c37b16f
 2023-01-12 15:44:26 +08:00
Milton Wu
822c5bac48 Add help/error msg for ProgressViewModel 
Pass Help and Error message from FingerprintManager callback to LiveData
in FingerprintEnrollProgressViewModel.

Bug: 259664912
Test: Manually test FindSensor page
Change-Id: I3a992a51d97368fc82f6a1064d0c0d1e445e276b
 2023-01-12 15:37:02 +08:00
Bill Lin
05a019a6f9 [automerger skipped] Merge changes from topics "disable_face_enroll_inSUW", "tuscany_FaceEnrollFoldPage" into tm-qpr-dev am: 34d144265d am: a597789661 -s ours 
am skip reason: Merged-In Ib9f43f82f7d19f3f187c2f6f8984e76cd843afbc with SHA-1 ee6366761b is already in history

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

Change-Id: I1b5b14bc252cf181b3a51fa66e23745678808beb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 07:34:53 +00:00
lbill
040f7a69d6 [automerger skipped] 2-1/ Add config_suw_support_face_enroll to customize SUW face enroll flow am: e05697fc65 am: 516ef08351 -s ours 
am skip reason: Merged-In I61aa5c818bedfb490f2172a7481f59fda7295c1a with SHA-1 1eee5eda6c is already in history

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

Change-Id: I7aa18defb4b41a9d642d0a21ebec4bf763e22746
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 07:34:48 +00:00
Milton Wu
89bcf27c40 [automerger skipped] Fix face enroll introduction crash after 10mins am: 8e57808247 am: fe819292e3 -s ours 
am skip reason: Merged-In Ie1dd6f36e4deb3f776e3b39acd165fc47d04f526 with SHA-1 a174486803 is already in history

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

Change-Id: I25c39f0980bca596fe79e97a404c491b5068f219
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 07:34:46 +00:00
Bill Lin
a597789661 Merge changes from topics "disable_face_enroll_inSUW", "tuscany_FaceEnrollFoldPage" into tm-qpr-dev am: 34d144265d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20673972

Change-Id: I1b5fc399539a8f6585588c90a8481e0a8c4d5463
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 07:02:24 +00:00
lbill
516ef08351 2-1/ Add config_suw_support_face_enroll to customize SUW face enroll flow am: e05697fc65 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727251

Change-Id: Ib401d8eeb89c916a9cf934f6dcce6bc101d6965a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 07:02:18 +00:00
Milton Wu
fe819292e3 Fix face enroll introduction crash after 10mins am: 8e57808247 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20454691

Change-Id: I98f9468ff878f9aefb67e29b694a52eb1b910f02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 07:02:12 +00:00
TreeHugger Robot
6b47dd97dd Merge "Clean up always false parameter isValidToShowSummary." 2023-01-12 06:54:32 +00:00
Bill Lin
34d144265d Merge changes from topics "disable_face_enroll_inSUW", "tuscany_FaceEnrollFoldPage" into tm-qpr-dev 
* changes:
  3-1/ Impl FoldProvider.FoldCallback for Face enroll activities
  2-1/ Add config_suw_support_face_enroll to customize SUW face enroll flow
  Fix face enroll introduction crash after 10mins
 2023-01-12 06:47:45 +00:00
Xin Li
5482fb0301 Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 
Bug: 264720040
Merged-In: Ic8d9f286c53e321a933d98f9c05bbc6bb8bf98f0
Change-Id: I2f32b289ee96a205816ed48e8f4490d081a0d315
 2023-01-11 22:47:24 -08:00
TreeHugger Robot
42da13300c Merge "Fix b/264582296: Incorrect app battery usage after switching between 'restricted/unrestricted/optimized'." 2023-01-12 06:37:09 +00:00
Daniel Huang
aa88bca296 Merge "Integrate UI with APIs for trackpad settgins." 2023-01-12 05:33:48 +00:00
Ankita Vyas
149cbf04aa Merge "AppClone: Changes in AppInfo page for cloned app." 2023-01-12 05:04:43 +00:00
Zaiyue Xue
e8f2631f25 Fix b/264582296: Incorrect app battery usage after switching between 'restricted/unrestricted/optimized'. 
This bug is due to the instance fields state is not refreshed after setAppUsageState(). When setting back to the original mode in the same page, getAppOptimizationMode(mMode, mAllowListed) still returns the original mode. So the setting back action is ignored.

Bug: 264582296
Fix: 264582296
Test: manual
Change-Id: I4da5dd7f1ca2660661f842a67b7d799aabd1ba05
 2023-01-12 12:13:48 +08:00
TreeHugger Robot
b2e00d2f0a Merge "Refine get props inside FingerprintRepository" 2023-01-12 02:01:50 +00:00
Sorin Basca
a962b4b712 NEW Use Mockito 4.6.1 API 
Addressing skipping merge issue

Bug: 236636175
Test: atest SettingsRoboTests
Change-Id: Ie7caae0ea9aa212f1ee06d6fe89fa0776979e4e6
Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
 2023-01-12 01:35:44 +00:00
Diya Bera
271362af05 Merge "Fixes background color in SUW fingerprint enrollment" into tm-qpr-dev am: dc071e94cd am: 81ab030e4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20919289

Change-Id: I2d25a70f82548cc1ae754a8b6376fbc831f1f0e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 00:55:03 +00:00
Joshua Mccloskey
bc1291e163 Merge "Fixed scroll issue w/ FP settings" into tm-qpr-dev am: 7b8bddaac0 am: dc0f04d7ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20931688

Change-Id: I9ead82f334b4ca2b69989707d5890f9e8cdf3ab3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 00:53:55 +00:00
Diya Bera
81ab030e4c Merge "Fixes background color in SUW fingerprint enrollment" into tm-qpr-dev am: dc071e94cd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20919289

Change-Id: I18729fd0f253008a29d9da947e833cab42238efd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 00:17:04 +00:00
Joshua Mccloskey
dc0f04d7ee Merge "Fixed scroll issue w/ FP settings" into tm-qpr-dev am: 7b8bddaac0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20931688

Change-Id: I22bee3710fa6cdf31c15aae69691f94ddf38aa80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-12 00:12:33 +00:00
Diya Bera
dc071e94cd Merge "Fixes background color in SUW fingerprint enrollment" into tm-qpr-dev 2023-01-11 23:52:35 +00:00
Joshua Mccloskey
7b8bddaac0 Merge "Fixed scroll issue w/ FP settings" into tm-qpr-dev 2023-01-11 23:43:54 +00:00
TreeHugger Robot
d9ef61d3eb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: ee6d6f0b2c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I442347075aa207e49e546210c66e4a5b5cfb8a2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 22:19:42 +00:00
Bill Yi
c52cd167d4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 25fdb49733 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I38f9094db693855981efa415205bd6018cbeb283
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 22:19:07 +00:00