PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
113,423 Commits 1 Branch 0 Tags
d1d85bea8e4629fa92eff41f5a0fe76c86c18a83
Commit Graph

113423 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
db7f7b6d31 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2ca813a72a28c275eacf6dda32ad36d491aa48b9
 2022-07-19 13:59:24 -07:00
Grace Cheng
16aacff410 Merge "Add missing description to SUW set pattern lock UI" into tm-qpr-dev am: 66625c9c7b am: 5aff3d9de6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19303032

Change-Id: Ib913526c5340f4cce6f4d670433c947edd704980
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 20:30:19 +00:00
TreeHugger Robot
42c02ad936 Merge "Prevent leaking Wi-Fi dialog on lock screen" into tm-qpr-dev am: bd41fe5a5b am: 3d6b632232 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19207636

Change-Id: I66292ce19a0616253ec8f23a185d34aa7a03a977
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 20:24:42 +00:00
Sorin Basca
199f6a4ed0 [automerger skipped] Use Mockito 4.6.1 API am: e2b0873f9c -s ours am: dd00927d16 -s ours am: 522bcbd7fc -s ours am: 5b0b7de3d5 -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 61e0bcd194 is already in history

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

Change-Id: Idbdbed2572606ce0d1c51004827c3f60f30b222c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 20:22:37 +00:00
Julia Reynolds
c961d97a2e Update strings am: 21744cf2d1 am: bfe54c8ad0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19325246

Change-Id: Id84be5f2811095f9f7fd982f9653630e403cacd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 20:09:12 +00:00
Treehugger Robot
de39a970c5 Merge "Fix incorrect storage calculation when SD card is inserted" am: e705fcd7c3 am: 2a0a88af4d am: dad4720a31 am: cb4de95600 am: 3ce3686836 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147780

Change-Id: Id8a56f0aceb2710d4ce2c0445b233f3f808185b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 20:09:02 +00:00
TreeHugger Robot
d257564701 [automerger skipped] [conflict] [conflict] Merge "Use Mockito 4.6.1 API" into tm-dev-plus-aosp am: ac6af411ed am: 326c0ea30c am: 91aec69fdc -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 c1c3a84fdc is already in history

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

Change-Id: I779bcb7e74b3eddaa1ead5418eba33bd91e8d891
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 19:48:58 +00:00
Grace Cheng
5aff3d9de6 Merge "Add missing description to SUW set pattern lock UI" into tm-qpr-dev am: 66625c9c7b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19303032

Change-Id: Iaaef33597b7a6c79deb5154bc9b7841af8f5e48f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 19:42:56 +00:00
Grace Cheng
66625c9c7b Merge "Add missing description to SUW set pattern lock UI" into tm-qpr-dev 2022-07-19 19:31:06 +00:00
TreeHugger Robot
f7f800793c Merge "Add class BatteryDiffData used to parcel battery usage data" 2022-07-19 18:01:45 +00:00
TreeHugger Robot
3d6b632232 Merge "Prevent leaking Wi-Fi dialog on lock screen" into tm-qpr-dev am: bd41fe5a5b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19207636

Change-Id: I8ea19a4c48286a2185450116f06a3314087c5be8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 17:21:39 +00:00
TreeHugger Robot
bd41fe5a5b Merge "Prevent leaking Wi-Fi dialog on lock screen" into tm-qpr-dev 2022-07-19 17:02:10 +00:00
Kuan Wang
5c98e155c2 Add class BatteryDiffData used to parcel battery usage data 
Add class BatteryDiffData used to parcel battery usage diff data per
apps. It behaves as an interface between UI and data.

Bug: 236101687
Test: make RunSettingsRoboTests
Change-Id: I59daa9e8c5de2105ebf24c7a585c02e554735e78
 2022-07-19 15:47:51 +00:00
Sorin Basca
5b0b7de3d5 [automerger skipped] Use Mockito 4.6.1 API am: e2b0873f9c -s ours am: dd00927d16 -s ours am: 522bcbd7fc -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 61e0bcd194 is already in history

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

Change-Id: I6bc4f9e950642a51e6b3158b4168826521ed3d56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 12:51:33 +00:00
Neil Fuller
d0a3929327 Change high/low bound logic for manual date/time 
This commit moves knowledge of the upper / lower bounds for valid manual
date suggestions to (internal) API calls.

It adds a test to confirm the API calls are used to configure the date
dialog.

Further, it removes redundant filtering from the client that would
prevent suggestion calls being made if the settings UI considers them
invalid. Year bounds are already used to limit the UI entry, and the
system server will return false from the service call if the suggestion
is invalid, though the SettingsUI doesn't do anything (behaviorally)
with the false before or after this change.  After this change it is
logged.

The goal of this change is to allow users with devices that don't have
the Y2038 issue to enter dates > 2037. This could have been done with
a smaller change, but the use of the new internal class
TimeDetectorHelper means that the bounds logic is in one place. The
lower bound (on mobile devices) can now be changed relatively easily by
touching one class.

Bug: 228967927
Test: m RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.datetime"
Change-Id: Iaf1ca8220e0e96773aa71b595da9c1ba1e50d59d
 2022-07-19 13:43:36 +01:00
Julia Reynolds
bfe54c8ad0 Update strings am: 21744cf2d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19325246

Change-Id: I163c8692eb166b134cf7cabb8434429be43f3911
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 12:41:07 +00:00
Sorin Basca
522bcbd7fc [automerger skipped] Use Mockito 4.6.1 API am: e2b0873f9c -s ours am: dd00927d16 -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 61e0bcd194 is already in history

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

Change-Id: Ic39e47f5cdbd5ab6bd6377d14bd8bf2661ebcb22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 12:33:47 +00:00
Sorin Basca
dd00927d16 [automerger skipped] Use Mockito 4.6.1 API am: e2b0873f9c -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 61e0bcd194 is already in history

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

Change-Id: I4a89e9c7a5009f1bf6041589bd43b09d0f6f81b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 12:08:10 +00:00
TreeHugger Robot
e18e92699e Merge "In BatteryChartViewV2, use levels.length-1 to replace mTrapezoidCount. So the chartview could show any number of slots as the given levels length-1." 2022-07-19 10:57:05 +00:00
Jason Chiu
c89755525f Update all preferences when the account preference updates UI 
When an account is added or removed, the account preference controller
just updates the account list, whereas there's no trigger point for the
account data sync preferences to refresh.

Add an API to update all preferences in DashboardFragment, so we can
refresh the account sync preferences whenever the account list is
updated.

Bug: 185479221
Test: robotest, manual
Change-Id: Ide3d972abae09ce0175e3bafbb1f4a5e307d20c8
 2022-07-19 10:32:23 +00:00
Sorin Basca
e2b0873f9c Use Mockito 4.6.1 API 
Bug: 236636175
Test: m RunSettingsRoboTests
Change-Id: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
(cherry picked from commit c1c3a84fdc)
Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
(cherry picked from commit 61e0bcd194)
Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
 2022-07-19 09:07:28 +00:00
Zaiyue Xue
837a8f0063 In BatteryChartViewV2, use levels.length-1 to replace mTrapezoidCount. So the chartview could show any number of slots as the given levels length-1. 
Test: manual
Bug: 236101166, 239491373
Change-Id: I9625ed80e8eba6632cc864ada0ba3e9cf11de82a
 2022-07-19 16:54:59 +08:00
Wesley Wang
7e8d79b3c2 Update battery optimize page states condition 
- Keep apps optimize state as what it set even it's a system or default
   app
 - Previously we force system/defualt apps present as Unrestricted mode
   only and disable other options but that can not shows that apps
   actual optimize states, it's possible to be other states even it's a
   system or default apps, so we change the UI logic back to: present
   it's actual states and disable other options when it's a system or
   default apps.

Bug: 234419032
Test: make SettingsRoboTests
Change-Id: Ib5b6cb0aacb570cb8d15b1bb9ac2d480356eda49
 2022-07-19 16:27:14 +08:00
Treehugger Robot
3ce3686836 Merge "Fix incorrect storage calculation when SD card is inserted" am: e705fcd7c3 am: 2a0a88af4d am: dad4720a31 am: cb4de95600 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147780

Change-Id: I1bf71a120f7db3f388a5e279a7e13ece80eef571
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 01:06:43 +00:00
TreeHugger Robot
91aec69fdc [conflict] [conflict] Merge "Use Mockito 4.6.1 API" into tm-dev-plus-aosp am: ac6af411ed am: 326c0ea30c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19305127

Change-Id: I52547d10f0579fddb21091b641925910db17ef38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
 2022-07-18 22:39:07 +00:00
Treehugger Robot
cb4de95600 Merge "Fix incorrect storage calculation when SD card is inserted" am: e705fcd7c3 am: 2a0a88af4d am: dad4720a31 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147780

Change-Id: Ia8f4762a938a8b4dc2b8ac503b42792cc3cd882a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-18 20:43:47 +00:00
Julia Reynolds
21744cf2d1 Update strings 
Test: view notification settings on device
Fixes: 231232522
Change-Id: I04e236df65c89737a99e37ab818ec330629a942f
 2022-07-18 20:11:46 +00:00
Simon Wingrove
839b3c426c [automerger skipped] Distinguish multiple PendingIntents via requestCode am: 25686219d3 am: ef498ef53d -s ours 
am skip reason: Merged-In Ia59197eeb86e988d9ffbb86caff4bbda7b30f059 with SHA-1 f2b0cedcd0 is already in history

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

Change-Id: I57f1a091c651699ec9d809ac709cc939b67190fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-18 19:36:42 +00:00
Simon Wingrove
ef498ef53d Distinguish multiple PendingIntents via requestCode am: 25686219d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19289844

Change-Id: Id8509feac060578cf8d7ffb4d7a7b9def221f029
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-18 19:19:15 +00:00
Menghan Li
7fa6e7df05 Merge "Refactor AccessibilityControlTimeoutPreferenceFragment to improve maintainability" 2022-07-18 13:52:29 +00:00
Simon Wingrove
25686219d3 Distinguish multiple PendingIntents via requestCode 
Settings uses a system of intent extras to open subsettings pages. When
PendingIntents are created from these Intents, the system does not think
they are unique as extras are not included in this equality check. So
only one of them is likely to work.

A unique request code can be used to distinguish between them.

Bug: 238605613
Test: atest LockScreenSafetySourceTest
Merged-In: Ia59197eeb86e988d9ffbb86caff4bbda7b30f059
Change-Id: Ia59197eeb86e988d9ffbb86caff4bbda7b30f059
(cherry picked from commit f2b0cedcd0)
 2022-07-18 11:18:28 +00:00
Simon Wingrove
3db36eb530 Merge "Distinguish multiple PendingIntents via requestCode" 2022-07-18 11:13:42 +00:00
Zaiyue Xue
a3a90a744f Merge "Refactor BatteryChartView X-axis labels. Instead of only timestamps, also support any string[] labels." 2022-07-18 08:50:38 +00:00
menghanli
236a376211 Refactor AccessibilityControlTimeoutPreferenceFragment to improve maintainability 
Root cause: There is a bunch of different logic of preferences in AccessibilityControlTimeoutPreferenceFragment. It’s hard to implement new features and hard to maintain and hard to be testable.
Solution: Move out logic of AccessibilityControlTimeoutPreferenceFragment into controllers to reduce the complexity of the relationship between preference and fragment.

Bug: 197695932
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.accessibility
Change-Id: I22e6e3b9e2f199ac1721fc069690321ad5f7a0d4
 2022-07-18 15:50:52 +08:00
Zaiyue Xue
24bc269ec1 Refactor BatteryChartView X-axis labels. Instead of 
only timestamps, also support any string[] labels.

Bug: 236101166
Test: manual
Change-Id: I84763ccce0ee63da0b5b26e1416bf5bd5b58963d
 2022-07-18 14:25:24 +08:00
Bill Yi
dfdcb3b7dd Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-07-18 04:31:31 +00:00
Bill Yi
fb7e554b91 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-07-18 04:31:31 +00:00
TreeHugger Robot
d20233e81c Merge changes from topic "tc_change_22071422_30" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc75b57a54
  Import translations. DO NOT MERGE ANYWHERE
 2022-07-17 18:06:56 +00:00
TreeHugger Robot
31ab010723 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: dee7be8277 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I54c4908e120beaa653ebbabadedbe3f8fb3a565e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-16 19:17:58 +00:00
Bill Yi
0ff0b62161 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c0e84757d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9005ccdd21fe5b5ff0f861a22cb322a2cfda19d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-16 19:17:50 +00:00
TreeHugger Robot
dee7be8277 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-07-16 18:36:03 +00:00
TreeHugger Robot
326c0ea30c [conflict] Merge "Use Mockito 4.6.1 API" into tm-dev-plus-aosp am: ac6af411ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19291449

Change-Id: Ifce8e49a098d2e745f15348eb2d318d347366e31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
 2022-07-16 09:09:57 +00:00
TreeHugger Robot
2e89652733 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 7afae4bac1 -s ours am: e0f3ec193b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2555b9cfb6563c123cfda1189838cf70dd02d319
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-16 07:11:52 +00:00
Bill Yi
6b62556ab9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0f98a4d1ca -s ours am: 4c171b21e8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6a846d8cc40d71f73e87dc2147e53da9980d3be9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-16 07:11:20 +00:00
TreeHugger Robot
d6fc39e36d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 9e97c811a8 -s ours am: cd107313cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iff5ad3d3776265cbc9c0af1a63eb58f4b1278c23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-16 07:10:59 +00:00
Bill Yi
58fb52791c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e148a29a1c -s ours am: aa37dd1860 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If19d51d9ff5c10642e008fb8aefaaee10adb4145
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-16 07:10:42 +00:00
Sorin Basca
b9503775c0 Use Mockito 4.6.1 API 
Bug: 236636175
Test: m RunSettingsRoboTests
Change-Id: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
(cherry picked from commit 61e0bcd194)
Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
 2022-07-16 07:57:52 +01:00
TreeHugger Robot
e0f3ec193b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 7afae4bac1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iea692e5126ada63d0ca4aa91bd83570f3ddf325a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-16 06:46:32 +00:00
Bill Yi
4c171b21e8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0f98a4d1ca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5c0e23ba0c57b9e5d69c6107d2c1421bd747e76a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-16 06:46:06 +00:00
TreeHugger Robot
cd107313cf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 9e97c811a8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieebc2eba1f675bba4cb40037f5639b3cb6bc179a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-16 06:45:41 +00:00