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

119373 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Gil Cukierman
0251b272aa Change Toggle UX to "Require encryption" 
Changes the UX of enable/disable null ciphers to
"Require encryption". The default value is off, making
the default behavior equivalent to the previous version
of the toggle.

Test: atest NullAlgorithmsPreferenceControllerTest
Test: Manual testing in cuttlefish
Bug: 264540492
Change-Id: Iaa0c9c259559a205aacad9fb9af8de6b54782c8d
 2023-01-11 18:42:05 +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
Zaiyue Xue
a500e4f739 Clean up always false parameter isValidToShowSummary. 
So the next cl (new summary for battery detail page) doesn't need to
deal with isValidToShowSummary=true case.

Bug: 262802531
Test: presubmit
Change-Id: I88528caedb29d61a05b40d3ca435fc007bf3f54c
 2023-01-11 21:03:42 +08: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
Cynthia Wasonga
166999e9bf Hide clone profile Settings app from launcher 
Bug: 258063297
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsInitializeTest

Change-Id: If46354271ed1288b5078c4d6100c6f79212f3901
 2023-01-11 06:42:43 +00: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
TreeHugger Robot
353cde7109 Merge changes from topic "LifecycleEffect" 
* changes:
  Redirect to AppInfoSettings when SPA is on
  Reload package info for each time enter App Info
 2023-01-11 05:35:07 +00:00
Zaiyue Xue
0ddc5257f5 Merge "[Battery usage U] [UI] Update the text in footer" 2023-01-11 05:34:41 +00:00
Shen Lin
1721d0f276 Amend "Reset notification importance" list item style 
Using LayoutPreference here makes list look like abrupt, we would like
to switch to normal Preference to align listitem style.

Bug: 265062898
Test: atest ImportanceResetPreferenceControllerTest -c
Change-Id: I93961de148915699d2cba46bdba71e667e8ea10a
 2023-01-11 05:21:59 +00:00
Edgar Wang
47fbf1d333 Merge "Set key for the SwitchPreferences of Connected devices > USB" 2023-01-11 04:07:05 +00:00
Kuan Wang
a396885f5e Adjust background time to avoid background + screen time larger than 
time slot duration.

Test: make RunSettingsRoboTests
Bug: 265089855
Fix: 265089855
Change-Id: Idf3fee13eccd5b1f699feb5f79bd2aa474e444b8
 2023-01-11 11:44:36 +08:00
Andy Hung
11264e9a00 Merge "Bluetooth Settings: Restore Spatial Audio Settings" 2023-01-11 03:29:14 +00:00
Zaiyue Xue
4221504e43 [Battery usage U] [UI] Update the text in footer 
Bug: 265088249
Fix: 265088249
Test: manual
Change-Id: If112f7a0b3509cdf11f1ffcea233ab3ace2bf6d7
 2023-01-11 11:10:54 +08:00
TreeHugger Robot
47aed3060e Merge "Add "Data Sharing Updates" to legacy Privacy Page" 2023-01-11 02:26:04 +00:00
Joshua McCloskey
3e0f8365f5 Fixed scroll issue w/ FP settings 
Test: Verified fingerprint preferences are not shown over the fingerprint title when device is rotated in settings screen
Fixes: 259338792
Change-Id: Ie99e584247bb52b097e949d0c8c0ed096543aa21
 2023-01-11 02:04:41 +00:00
Arc Wang
c8c1cfda38 [automerger skipped] Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION am: 17cd85b946 -s ours am: cef3637f4c -s ours am: b169c48705 -s ours 
am skip reason: Merged-In I48f88c662b843212b1066369badff84cf98935a8 with SHA-1 0f7f913281 is already in history

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

Change-Id: I4d641efd90bd9cd83d00616e4f9b19a1bc7b17c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 01:23:21 +00:00
Arc Wang
2d9b281595 [automerger skipped] Allow 2-pane deep link to access unexported Activity am: 960c96474d -s ours am: e3a8b88137 -s ours am: a9f470ab46 -s ours 
am skip reason: Merged-In I662df6cb287361b135e2c596abe946ddeb03bda4 with SHA-1 0498907322 is already in history

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

Change-Id: I73ecabcc25847fa4309ffc50f37ae35097233ede
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 01:23:19 +00:00
Arc Wang
6d0def1b87 [automerger skipped] Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION am: 0f7f913281 am: b7c98a18c9 -s ours 
am skip reason: Merged-In I48f88c662b843212b1066369badff84cf98935a8 with SHA-1 17cd85b946 is already in history

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

Change-Id: I32243ee3ef1647611ff2f3928d6e9e639c0e67ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 01:23:10 +00:00
Arc Wang
5175b552f3 [automerger skipped] Allow 2-pane deep link to access unexported Activity am: 4703a5a61b -s ours 
am skip reason: Merged-In I662df6cb287361b135e2c596abe946ddeb03bda4 with SHA-1 960c96474d is already in history

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

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

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

Change-Id: I2feed138828f25a29f54c570cabd7bfc792c2a36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 01:21:24 +00:00