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

119152 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
TreeHugger Robot
b2e00d2f0a Merge "Refine get props inside FingerprintRepository" 2023-01-12 02:01:50 +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
TreeHugger Robot
a5979448c1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 207f86e5fe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I18527e8f83fee7aca9e05e1ed6f3cf0cfc18dbbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 22:12:36 +00:00
Bill Yi
e1f6213a4b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 73537f9258 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2f40933b848d580b98e2e20ea955e04dada7cf0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 22:12:02 +00:00
Joshua McCloskey
dfaa7a1b7f Added performant auth feature am: b8695b8e76 am: 4915a5932d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20937285

Change-Id: I7427307ca99ce6512a0b66910939777193a10d92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 21:49:51 +00:00
Joshua McCloskey
4915a5932d Added performant auth feature am: b8695b8e76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20937285

Change-Id: I1214d53edf57e1b45efd3d81c7e0305d83e94459
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 21:38:32 +00:00
TreeHugger Robot
2bfb13f1fc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 00ca7a0225 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifcc2d37edb1685604bb67f5900832820127ddb02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 21:30:21 +00:00
Bill Yi
588a5a22a9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d9cc6bd784 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6dc09ecd7759a566ff211d2f49a36df79b84000a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 21:30:15 +00:00
Kevin Liu
393e031cf8 Revert "[automerger skipped] resolve merge conflicts of 521278a0..." am: c41c1fb83c -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/+/20944170

Change-Id: I99b6cfa13657354e2bebd91f80948654ab7f4d01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 19:32:57 +00:00
Kevin Liu
c41c1fb83c Revert "[automerger skipped] resolve merge conflicts of 521278a0..." 
Revert submission 20943849-am-ba81bb49f0b54fb08295adf7418e1fd4

Reason for revert: Automerger did skipped some of the important CLs will resubmit to tm-qpr-dev

Reverted changes: /q/submissionid:20943849-am-ba81bb49f0b54fb08295adf7418e1fd4

Change-Id: Ib639a1d8c81a1b3fcd8504704f55854fc36f4cb5
 2023-01-11 18:24:54 +00:00
Joshua McCloskey
b8695b8e76 Added performant auth feature 
Test: Manually verified in settings that the performant auth
feature(fingerprint) is disabled by default
Bug: 261216422
Bug: 265031172

Change-Id: I6422b12f801d038fa514758eca34efcbfdeef27a
 2023-01-11 16:43:54 +00:00
Kevin Liu
7bde01aba9 [automerger skipped] resolve merge conflicts of 521278a00d to tm-d1-dev am: 15ef36bc54 -s ours am: 988e1712a3 -s ours am: 8f5103a748 -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 93c143ed0a is already in history

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

Change-Id: I5116be17af8c196e320226962758b0415fd3722d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 15:53:41 +00:00
TreeHugger Robot
3bc11c7ad3 Merge "Update wallet setting availability" into tm-qpr-dev am: 61f81ffb07 am: 02cace2f67 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20874103

Change-Id: I7efaad7adeb7f07e36608dda8eb05a72133659fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 15:53:08 +00:00
Kevin Liu
8f5103a748 [automerger skipped] resolve merge conflicts of 521278a00d to tm-d1-dev am: 15ef36bc54 -s ours am: 988e1712a3 -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 93c143ed0a is already in history

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

Change-Id: Ib4d64f88405e9e6a7925787ba2d4bd3c28ac69ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 15:31:12 +00:00
TreeHugger Robot
02cace2f67 Merge "Update wallet setting availability" into tm-qpr-dev am: 61f81ffb07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20874103

Change-Id: I1c586d8d135b6238662b228b2101ab4de4d369ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 15:30:41 +00:00
Kevin Liu
988e1712a3 [automerger skipped] resolve merge conflicts of 521278a00d to tm-d1-dev am: 15ef36bc54 -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 93c143ed0a is already in history

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

Change-Id: I341ba1b28ad4b7b14da45f2e8c62c20d19d6fe91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 15:14:54 +00:00
Behnam Heydarshahi
53c32d487a Merge "Implement a separate controller for ring volume" into tm-qpr-dev am: ee56e95f90 am: 4fc098dc1b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20749598

Change-Id: I2ed97051fc0602324c12960e3696c4933911abcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 15:14:24 +00:00
TreeHugger Robot
61f81ffb07 Merge "Update wallet setting availability" into tm-qpr-dev 2023-01-11 14:54:39 +00:00
danielwbhuang
6125f9a9fa Integrate UI with APIs for trackpad settgins. 
1. Integrate with trackpad settings dummy APIs.
2. Integrate with trackpad gesture APIs.

Bug: 247080509
Test: manual, make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.inputmethod.*"
Change-Id: Ic180e28896bb0a5aa71eb0eb63d3824bd342ff45
 2023-01-11 22:42:15 +08:00
Behnam Heydarshahi
4fc098dc1b Merge "Implement a separate controller for ring volume" into tm-qpr-dev am: ee56e95f90 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20749598

Change-Id: I1dbbde115a9e92ecc1b602607827d51ec2078102
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 14:34:49 +00:00
Behnam Heydarshahi
ee56e95f90 Merge "Implement a separate controller for ring volume" into tm-qpr-dev 2023-01-11 14:08:01 +00:00
Vania Januar
c9e42d4d73 Merge "Update strings for stylus settings preferences." 2023-01-11 12:52:04 +00:00
TreeHugger Robot
49b7e7d315 Merge "Fix one build failure when running in studiow." 2023-01-11 12:35:25 +00:00
Treehugger Robot
88e923f7ce Merge "Amend "Reset notification importance" list item style" am: aef592eb18 am: 9c8ff84746 am: 8601b70e1c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2382194

Change-Id: I1e2cabff29c20c9a759743116ba9d57710c3d1bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 12:17:05 +00:00
TreeHugger Robot
e0050d3abf Merge "Fix Content Capture service starting after restriction" into tm-qpr-dev am: fb0986623f am: e9da17a8b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20904549

Change-Id: I4cfcbf8cdfeafdd2547ed81bf3953eb371296ee7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 12:16:51 +00:00
TreeHugger Robot
5404ade7ec Merge "Fix html injection in Autofill confirmation dialog" into tm-qpr-dev am: ecb7c54fc5 am: b464bfa049 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20904550

Change-Id: I7be000514ace73753e35325fe9e62bb30679e15f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 12:15:18 +00:00
Treehugger Robot
8601b70e1c Merge "Amend "Reset notification importance" list item style" am: aef592eb18 am: 9c8ff84746 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2382194

Change-Id: Ibb2373d9410439be710b78c9e61c697f87bb28b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 11:53:43 +00:00
TreeHugger Robot
e9da17a8b9 Merge "Fix Content Capture service starting after restriction" into tm-qpr-dev am: fb0986623f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20904549

Change-Id: I1ce36528fa8ae6d30ad6aecc880c3bbf905fabba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 11:36:19 +00:00
TreeHugger Robot
b464bfa049 Merge "Fix html injection in Autofill confirmation dialog" into tm-qpr-dev am: ecb7c54fc5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20904550

Change-Id: I4e713518a4f0de69a4d85514315048d438b53fb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 11:35:17 +00:00
Treehugger Robot
9c8ff84746 Merge "Amend "Reset notification importance" list item style" am: aef592eb18 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2382194

Change-Id: Ife8b88093010ff9fea43758057d334bbea50540a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 11:19:53 +00:00
TreeHugger Robot
fb0986623f Merge "Fix Content Capture service starting after restriction" into tm-qpr-dev 2023-01-11 11:05:12 +00:00
TreeHugger Robot
ecb7c54fc5 Merge "Fix html injection in Autofill confirmation dialog" into tm-qpr-dev 2023-01-11 11:05:07 +00:00
TreeHugger Robot
569becdb7f Merge "Use (the last existing timestamp in DB + 1) as the start time of usage event query to avoid loading the same events repeatedly." 2023-01-11 10:51:40 +00:00
Treehugger Robot
aef592eb18 Merge "Amend "Reset notification importance" list item style" 2023-01-11 10:31:55 +00:00
Bonian Chen
4ef920e9ef Merge "[Settings] Limit height of TextView when text too long" 2023-01-11 10:17:51 +00:00
Zaiyue Xue
53eb9ce22d Fix one build failure when running in studiow. 
Test: manual
Change-Id: I6abcbcfa01d60799a77d45c5a89306b5a4c99285
 2023-01-11 17:43:36 +08:00
Zaiyue Xue
43ace6ed33 Merge changes from topic "feature0" 
* changes:
  Refactor processBatteryDiffData() from DataProcessor to BatteryDiffData class.
  Refactor PowerUsageFeatureProvider: Cache the config set to avoid generating the set again.
 2023-01-11 08:57:29 +00:00
TreeHugger Robot
24dbaeba1e Merge "Clean up unused code in AdvancedPowerUsageDetail class" 2023-01-11 08:54:30 +00:00
Kuan Wang
6da66f9a5c Use (the last existing timestamp in DB + 1) as the start time of usage 
event query to avoid loading the same events repeatedly.

queryEvents API will return the events within [start, end). In the
hourly job, if we query the events from the latest existing time, the
events happening at the latest time will be saved for multiple times
into database. This aims to avoid this issue.

Test: make RunSettingsRoboTests
Bug: 265110147
Fix: 265110147
Change-Id: I408e88b0e15fe22585906261935854cf47707f9c
 2023-01-11 16:18:55 +08:00
Zaiyue Xue
cad4c069bd Clean up unused code in AdvancedPowerUsageDetail class 
Bug: 262802531
Test: presubmit
Change-Id: Ide91bd5312296945effb5a54422bda2c9623341d
 2023-01-11 14:27:53 +08:00
TreeHugger Robot
89e5b837b9 Merge "Adjust background time to avoid background + screen time larger than time slot duration." 2023-01-11 05:54:55 +00:00