Commit Graph

120533 Commits

Author SHA1 Message Date
Becca Hughes
d9ce857fd5 Merge "Update strings based on UX/product feedback" 2023-02-24 19:45:33 +00:00
TreeHugger Robot
9713d1ce2d Merge "Fix b/270656372 unit test failure." into udc-dev am: f9ef8e39f5 am: f52774ec73
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578803

Change-Id: I3fc4b391adece41faa7fe8157854d62a30f77e57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 18:53:29 +00:00
TreeHugger Robot
f52774ec73 Merge "Fix b/270656372 unit test failure." into udc-dev am: f9ef8e39f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578803

Change-Id: I9cb9e491dd4f356ac9fc3c0e67a180d45a8230e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 17:55:37 +00:00
TreeHugger Robot
2ef53d0a79 Merge "Fix b/270656372 unit test failure." into udc-dev am: f9ef8e39f5 am: fa2b0ef4ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578803

Change-Id: I494c6d1c211318e1bcce47a5ae2b173455d05c72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 14:08:30 +00:00
Zaiyue Xue
95c4e00924 Merge "Fix b/265387286: The total percentage of all apps is not 100%" into udc-dev am: ae0d935dcc am: 1ee1cc368f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21502689

Change-Id: I5c2d6b84f10504df73d15cff263202fbc90eeb4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 14:05:48 +00:00
TreeHugger Robot
6ebf140fd7 Merge "Fix b/270656372 unit test failure." into udc-dev am: f9ef8e39f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578803

Change-Id: I1c9f640d8681e68cb6277724d412251fac2008df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 13:34:45 +00:00
TreeHugger Robot
fa2b0ef4ae Merge "Fix b/270656372 unit test failure." into udc-dev am: f9ef8e39f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578803

Change-Id: I285a39d07df9cf76fac6ebb4de1a6e1909771030
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 13:32:50 +00:00
Zaiyue Xue
1ee1cc368f Merge "Fix b/265387286: The total percentage of all apps is not 100%" into udc-dev am: ae0d935dcc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21502689

Change-Id: I7c47d61fd6cf6f1662dc77e7bf744b71f393a7be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 13:31:44 +00:00
Zaiyue Xue
c6166bc07d Merge "Fix b/265387286: The total percentage of all apps is not 100%" into udc-dev am: ae0d935dcc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21502689

Change-Id: Ib0c1ebd27bc65db95fccae3a67514b7687d662b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 13:31:35 +00:00
TreeHugger Robot
f9ef8e39f5 Merge "Fix b/270656372 unit test failure." into udc-dev 2023-02-24 13:06:28 +00:00
Zaiyue Xue
ae0d935dcc Merge "Fix b/265387286: The total percentage of all apps is not 100%" into udc-dev 2023-02-24 12:55:21 +00:00
Vincent Wang
ac92edd8cf Merge "Refactor FingerprintEnrollEnrolling to fragment" into udc-dev am: d17704196f am: 35ec32bb18
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578805

Change-Id: Ic703f7095014c9c34fb8395d7c2cffc88c401c94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 12:53:34 +00:00
Vincent Wang
35ec32bb18 Merge "Refactor FingerprintEnrollEnrolling to fragment" into udc-dev am: d17704196f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578805

Change-Id: I0017be373d3a5003913fd9d9fa86c2c8ced16c98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 12:19:09 +00:00
Vincent Wang
731ded4f9a Merge "Refactor FingerprintEnrollEnrolling to fragment" into udc-dev am: d17704196f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578805

Change-Id: I5afdcebedeff7b17cbcf3499d2b81c09502eedac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 12:19:01 +00:00
Vincent Wang
d17704196f Merge "Refactor FingerprintEnrollEnrolling to fragment" into udc-dev 2023-02-24 11:42:26 +00:00
TreeHugger Robot
60c8c5e985 Merge "[Settings] Re-enable previous work on data saver" into udc-dev am: fa57dd3f2e am: 5d32369ec8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578800

Change-Id: I74832d8b7d850c582e25a5d881bc8c78718bc418
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 11:26:06 +00:00
Tom Hsu
4c30d29dd5 Merge "Switch off Calendar UI fo regional preferences" into udc-dev am: 7e2ea92559 am: ad6359cfbb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578799

Change-Id: I4239916ef65de0a83712890ec8092c49971d1183
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 11:24:32 +00:00
Zaiyue Xue
6d939b34dc Fix b/265387286: The total percentage of all apps is not 100%
Bug: 265387286
Fix: 265387286
Test: manual
Change-Id: I654f8211a45c818f9a2d4867ac679e72c9ce6eb1
2023-02-24 19:19:28 +08:00
Zaiyue Xue
d4dbf039ea Fix b/270656372 unit test failure.
Failed test: sendBatteryEntryData_nullBatteryUsageStats_sendFakeDataIntoProvider

Bug: 270656372
Fix: 270656372
Test: presubmit
Change-Id: Idd1b3be07ec72c3cf7050b96e5320d67dcdc5463
2023-02-24 19:13:50 +08:00
TreeHugger Robot
58333856cd Merge "[Settings] Re-enable previous work on data saver" into udc-dev am: fa57dd3f2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578800

Change-Id: Idc4b057032a4efcbeb48fce1767d06a4e163b0a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 10:50:10 +00:00
TreeHugger Robot
5d32369ec8 Merge "[Settings] Re-enable previous work on data saver" into udc-dev am: fa57dd3f2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578800

Change-Id: I090cef5138a424af861d3e2a306c8f8657c421d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 10:49:58 +00:00
Tom Hsu
a74a9bf6c2 Merge "Switch off Calendar UI fo regional preferences" into udc-dev am: 7e2ea92559
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578799

Change-Id: I4a1b9290a8729271ac08e4283432af32ec524931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 10:48:57 +00:00
Tom Hsu
ad6359cfbb Merge "Switch off Calendar UI fo regional preferences" into udc-dev am: 7e2ea92559
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578799

Change-Id: Iea1de3d7bfe3db293deed904c1459da57478d6cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 10:48:26 +00:00
TreeHugger Robot
fa57dd3f2e Merge "[Settings] Re-enable previous work on data saver" into udc-dev 2023-02-24 10:15:32 +00:00
Tom Hsu
7e2ea92559 Merge "Switch off Calendar UI fo regional preferences" into udc-dev 2023-02-24 09:47:01 +00:00
Vincent Wang
882b49c8fb Refactor FingerprintEnrollEnrolling to fragment
Bug: b/260957933
Test: NA
Change-Id: I281ec7a7373f6863e2e6f8f20bbbb01fa01e009a
2023-02-24 08:43:17 +00:00
Charles Chen
638f2309fe [automerger skipped] Make Settings show in two-pane on portrait tablet am: 159b42a247 -s ours am: dce4259653 -s ours am: 4aaf6c191b -s ours am: 84c1cbe2cd -s ours
am skip reason: Merged-In I0c26a7443882cc28edb5500f8d135c5f00dee515 with SHA-1 1881749f09 is already in history

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

Change-Id: Ia099fe16988487f3c02a45ae3864363ec920dd3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 08:12:21 +00:00
TreeHugger Robot
6da120c7b5 Merge "Fix b/265364351: Light theme icons opacity is too light" into udc-dev am: 802bff9092 am: 8748b299bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517325

Change-Id: I94a8257092fbb7dbae7daeeb9b4b5a65eb4833f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 08:10:21 +00:00
TreeHugger Robot
25fabae5ac Merge "Clarify string for translation" into udc-dev am: 6d3a9b40d4 am: 76baf341d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21534693

Change-Id: I4a7145554f6167828cda024ba7b56cd7528b563d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 08:07:43 +00:00
Daniel Huang
871122ca24 Merge "Change key name "Meta" to "Action key"" into udc-dev am: 6e6b067863 am: 3b00f28b6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21552503

Change-Id: I4bfdaafed08ab563aa8e49574e47cd27f6647d17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 08:03:35 +00:00
Zaiyue Xue
a000f98438 Merge "Fix b/265364507: Merge GPU and TPU into Others in battery usage system components list" into udc-dev am: 2959831d59 am: d99ae387d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21546834

Change-Id: I37dd3f4cbc493c169d0f81b96383f4f12cb0115d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 07:54:31 +00:00
Avinash Vadlamudi
a491337497 Merge "[Auto Pin Confirm]: Fix the usage of LockPatternUtils#isAutoPinConfirmFeatureAvailable method" into udc-dev am: 2a619718ee am: d4e541f101
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21537112

Change-Id: Id69e9e8e86dfcfd5945e9f426233788b64fe8de9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 07:54:13 +00:00
Bonian Chen
fb9f85ec65 Merge "[Settings] Customizable resource for hiding 3G preferred network type" into udc-dev am: 7d76797f94 am: 7bfa22df7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21548828

Change-Id: I4a13552fe5d9dfb7d06b0e5caad3b06359d39f3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 07:49:24 +00:00
Charles Chen
84c1cbe2cd [automerger skipped] Make Settings show in two-pane on portrait tablet am: 159b42a247 -s ours am: dce4259653 -s ours am: 4aaf6c191b -s ours
am skip reason: Merged-In I0c26a7443882cc28edb5500f8d135c5f00dee515 with SHA-1 1881749f09 is already in history

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

Change-Id: I6c496790a26b516bf003aefc30e9bb52ff816727
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 07:38:36 +00:00
TreeHugger Robot
8748b299bb Merge "Fix b/265364351: Light theme icons opacity is too light" into udc-dev am: 802bff9092
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517325

Change-Id: Ied1b19f97d2c170c21c00f4425b54bbb494eb6ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 07:33:20 +00:00
TreeHugger Robot
76baf341d2 Merge "Clarify string for translation" into udc-dev am: 6d3a9b40d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21534693

Change-Id: Ia72afbbe0cdc696dc42e84e199374bf2ef993cf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 07:30:34 +00:00
Daniel Huang
3b00f28b6f Merge "Change key name "Meta" to "Action key"" into udc-dev am: 6e6b067863
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21552503

Change-Id: Iad85e0c130b774e9df08aa75df5ed08467280d80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 07:14:40 +00:00
Zaiyue Xue
d99ae387d8 Merge "Fix b/265364507: Merge GPU and TPU into Others in battery usage system components list" into udc-dev am: 2959831d59
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21546834

Change-Id: I9f64cc6e3a11f76ee920b557ad5ec6d77dc5f73a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 07:13:30 +00:00
Avinash Vadlamudi
d4e541f101 Merge "[Auto Pin Confirm]: Fix the usage of LockPatternUtils#isAutoPinConfirmFeatureAvailable method" into udc-dev am: 2a619718ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21537112

Change-Id: Ic83e6680667c7231d964a0beca11a7382aa89fb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 07:06:00 +00:00
Bonian Chen
7bfa22df7b Merge "[Settings] Customizable resource for hiding 3G preferred network type" into udc-dev am: 7d76797f94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21548828

Change-Id: I07f82db18158882064867dd628e0227c2e30ef3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 07:03:43 +00:00
Bonian Chen
2c92075e93 Merge "[Settings] EID should be read out as phone number" into udc-dev am: 07d60877b6 am: a721bf0895
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21546836

Change-Id: I7820069bb49d573f2b415b2e2e2f1116b69cd1c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 06:57:25 +00:00
Bonian Chen
c9cca5940b [Settings] Re-enable previous work on data saver
Previous work on data saver performance got disabled, this is a change to re-enable it.

Bug: 249502488
Test: build pass

Change-Id: I7264b1e8c21a789db358e0aae70a2cf0ce09ebba
(cherry picked from commit 2115d0e495)
2023-02-24 06:27:18 +00:00
Bonian Chen
a721bf0895 Merge "[Settings] EID should be read out as phone number" into udc-dev am: 07d60877b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21546836

Change-Id: Iadf05dfe61cf4949c3fdc98c9836841fd56ff67a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 06:17:21 +00:00
tom hsu
22dff773fa Switch off Calendar UI fo regional preferences
- Due to unsupported calendar type in java lib, it may happen
   unexpected exception. Hence switch off this function till we find a
   better way to improve.

Bug: b/270650444
Test: Manual test.
Change-Id: If380dbe5d98b915f3e288eb668df573ef2971ae2
2023-02-24 14:03:45 +08:00
Charles Chen
7b56fc72c6 [automerger skipped] Make Settings show in two-pane on portrait tablet am: 159b42a247 -s ours am: dce4259653 -s ours am: 4aaf6c191b -s ours
am skip reason: Merged-In I0c26a7443882cc28edb5500f8d135c5f00dee515 with SHA-1 1881749f09 is already in history

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

Change-Id: I378791a935de14381392f3053157cf8f635cd782
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 03:47:33 +00:00
TreeHugger Robot
673228592e Merge "Fix b/265364351: Light theme icons opacity is too light" into udc-dev am: 802bff9092
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517325

Change-Id: I4e18746978e31b21bd227309f97aa861662e3d3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 03:47:16 +00:00
Charles Chen
4aaf6c191b [automerger skipped] Make Settings show in two-pane on portrait tablet am: 159b42a247 -s ours am: dce4259653 -s ours
am skip reason: Merged-In I0c26a7443882cc28edb5500f8d135c5f00dee515 with SHA-1 1881749f09 is already in history

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

Change-Id: Ie31e3ef8ec302bb85de93b937546141e5ea41b70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 03:24:08 +00:00
TreeHugger Robot
802bff9092 Merge "Fix b/265364351: Light theme icons opacity is too light" into udc-dev 2023-02-24 03:10:42 +00:00
Charles Chen
dce4259653 [automerger skipped] Make Settings show in two-pane on portrait tablet am: 159b42a247 -s ours
am skip reason: Merged-In I0c26a7443882cc28edb5500f8d135c5f00dee515 with SHA-1 1881749f09 is already in history

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

Change-Id: Icdf326ddcf7fa2edc60f9e7b84c581d8a626e0b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 02:44:21 +00:00
Anvesh Renikindi
511fc77c6e [automerger skipped] Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" am: 60763d6941 am: 3b08c0d9db -s ours am: bdd54472a8 -s ours am: 410fa6cfc5 -s ours am: 52f50db889 -s ours
am skip reason: Merged-In I0f5e5a10250049fb9425eac7c113b803b6701cc7 with SHA-1 bfc95e7ba1 is already in history

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

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