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

113355 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
TreeHugger Robot
f7f800793c Merge "Add class BatteryDiffData used to parcel battery usage data" 2022-07-19 18:01:45 +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
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
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
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
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
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
Bill Yi
aa37dd1860 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e148a29a1c -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: I2c38c15ab224ca98b6911c70f54ac8a07e59f1e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-16 06:45:20 +00:00
TreeHugger Robot
7afae4bac1 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-07-16 06:32:58 +00:00
TreeHugger Robot
9e97c811a8 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-07-16 06:32:58 +00:00
Treehugger Robot
dad4720a31 Merge "Fix incorrect storage calculation when SD card is inserted" am: e705fcd7c3 am: 2a0a88af4d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147780

Change-Id: Iaa69c78ca9535382935688f7d9b41724c3f179ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-16 03:21:01 +00:00
Treehugger Robot
2a0a88af4d Merge "Fix incorrect storage calculation when SD card is inserted" am: e705fcd7c3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147780

Change-Id: I6ba5b7c40e87df6c231e0c774913b1320c9c3996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-16 02:51:11 +00:00
Treehugger Robot
e705fcd7c3 Merge "Fix incorrect storage calculation when SD card is inserted" 2022-07-16 02:35:19 +00:00
TreeHugger Robot
ac6af411ed Merge "Use Mockito 4.6.1 API" into tm-dev-plus-aosp 2022-07-15 21:40:43 +00:00
Sorin Basca
61e0bcd194 Use Mockito 4.6.1 API 
Bug: 236636175
Test: m RunSettingsRoboTests
Change-Id: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
(cherry picked from commit c1c3a84fdc)
Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
 2022-07-15 20:05:37 +00:00
TreeHugger Robot
661c035a1e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8359385233 -s ours am: f20ec29820 -s ours am: de8d037d68 -s ours am: 68d4addfdc -s ours am: cafb63129c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ife88e6efc3fe594b73ba204fe0e50933087992f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 19:29:04 +00:00
Bill Yi
1ed80994fe [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 415f1b8706 -s ours am: 6aa3b0a3a9 -s ours am: 7cb9020b74 -s ours am: 42ae81fed7 -s ours am: 1bcf2cea28 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I10a6f397f7dc2b78fdca7c2c8588b479f52c1aa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 19:28:52 +00:00
Bill Yi
9797a60371 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f841a2af4 -s ours am: cb2cb2e72a -s ours am: aae3370ac8 -s ours am: c5aff8f391 -s ours am: 7a4991ecf0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic7557deb4a3949451130d2872467a83f425e9c3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 19:28:34 +00:00
TreeHugger Robot
ccdb91b881 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8359385233 -s ours am: f20ec29820 -s ours am: 8a300a43df -s ours am: 086f4d675b -s ours am: 9192425035 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I147f8caaec459e9dcbbc095a67cd4c808a1129b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 19:21:08 +00:00
Bill Yi
c5d7394b00 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 415f1b8706 -s ours am: 6aa3b0a3a9 -s ours am: 617be8295c -s ours am: b70a1941ed -s ours am: fb3fd8e9de -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ife5c07c7172a721f77fb9fd9b2ac1f20ba08b549
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 19:20:55 +00:00
Bill Yi
bbd18a609f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f841a2af4 -s ours am: cb2cb2e72a -s ours am: d1f25e5217 -s ours am: 64ff179b42 -s ours am: 8ca886ff9b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie2c1e707fec93223a72753709603d7505b3fcde8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 19:20:37 +00:00
TreeHugger Robot
5de01382a8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7d8655936b -s ours am: 188a2c66c1 -s ours am: 037a382168 -s ours am: a687b7be39 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I82a1ca83266d2235eea4fd9cc95e6ec0130d302d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 19:13:40 +00:00
Bill Yi
ed9ba993e3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fef55df6ec -s ours am: cdd61bac15 -s ours am: 3df6f3fe63 -s ours am: 36ff4395d4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0bd64bf0e25564af2624e2a03faa17f68613077a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 19:13:23 +00:00