Chloris Kuo
fe172874ed
Merge "Support ACTION_NOTIFICATION_ASSISTANT_DETAIL_SETTINGS in Enhanced Notifications"
2022-08-23 18:35:22 +00:00
Bonian Chen
105cda2fbe
Merge "[Settings] Additional route for dismiss activity dialog" into tm-qpr-dev
2022-08-23 18:14:32 +00:00
Tiffany Nguyen
83ade9dd2a
Merge "Fix loading bug when switching filters."
2022-08-23 17:51:20 +00:00
Bill Yi
5fabe23482
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: f0632c26b5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19693732
Change-Id: I5ea8b507df6c7409726330950eea1185eae83282
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 17:20:39 +00:00
Bill Yi
74a222312f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f6a1e9ded
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19693732
Change-Id: I8501c021895608b09d108d789780953b17d427d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 17:20:26 +00:00
Bill Yi
af0f1a099e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1be27e97c5
-s ours am: 5c691c0670
-s ours am: c29ab9bf8b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694398
Change-Id: I6f08bb590cce0cab8ae307bdd402d777c76035c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 15:41:52 +00:00
Bill Yi
05773ecea0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9c441ad4fe
-s ours am: 60f828e428
-s ours am: 78aece0998
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694398
Change-Id: I384a00aeb000326b6ef38f50c35b159d47d3bff3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 15:41:27 +00:00
Bill Yi
7ac893639d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1a3d6c47c2
-s ours am: 9281ec1752
-s ours am: 56af244b80
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694395
Change-Id: If9c598992da440a52a905c9ddb61780137f28f91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 15:41:08 +00:00
Bill Yi
15d7c75f32
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 789b774cb2
-s ours am: 381f37b918
-s ours am: 1c41a160c2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694395
Change-Id: I0703bdd5d63e31e140c9eec69d043418177f974b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 15:40:54 +00:00
Treehugger Robot
b09a775ba7
Merge "Fix always return first package for mock location app in developer options." am: d221269892
am: 280ad76afb
am: 4c06c2426d
am: 1467de15bc
am: cb302284e6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2133170
Change-Id: I0105eee03725bc5ec7f07218483fa668e41d96bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 15:39:32 +00:00
Bill Yi
c29ab9bf8b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1be27e97c5
-s ours am: 5c691c0670
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694398
Change-Id: Iea672469f43e5b1deda5fb6c7b75ba79c5c9adb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 14:37:08 +00:00
Bill Yi
78aece0998
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9c441ad4fe
-s ours am: 60f828e428
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694398
Change-Id: Idff7c99bf3926e4138799fa53bc0317306a9158f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 14:36:42 +00:00
Bill Yi
56af244b80
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1a3d6c47c2
-s ours am: 9281ec1752
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694395
Change-Id: I13c2baa859f086fcb43624b88be0f5de477caf84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 14:36:23 +00:00
Bill Yi
1c41a160c2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 789b774cb2
-s ours am: 381f37b918
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694395
Change-Id: I4fc668bfd5013261e8a3205af9aa15f20edc14ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 14:36:09 +00:00
Treehugger Robot
cb302284e6
Merge "Fix always return first package for mock location app in developer options." am: d221269892
am: 280ad76afb
am: 4c06c2426d
am: 1467de15bc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2133170
Change-Id: Ie73421bb80637e58b04772e20289a38d22a2a708
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 14:35:06 +00:00
Bill Yi
f0632c26b5
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-08-23 14:30:18 +00:00
Tetiana Meronyk
53a45bea3d
Remove overflow from guest user settings
...
- Removed overflow for guest users
- Code cleanup
Bug: 191509236
Test: atest UserSettingsTest
Change-Id: I1ccf9924a471f148bf6413a040ccc769f9293c97
2022-08-23 14:25:59 +00:00
Bill Yi
5c691c0670
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1be27e97c5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694398
Change-Id: Iad5a8f14604bcba021c13146ec1b0b4fb2d11681
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 14:23:20 +00:00
Bill Yi
7c8eb553f3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1be27e97c5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694398
Change-Id: Ib88833c3b66e745fd0057f324f06cb2e91d74156
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 14:23:00 +00:00
Bill Yi
60f828e428
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9c441ad4fe
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694398
Change-Id: Icd342af76d5df98b8855635e5fdac9097dc66335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 14:22:55 +00:00
Bill Yi
9281ec1752
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1a3d6c47c2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694395
Change-Id: I3ce860ad406c50b616e86eeb03d341dc422cff4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 14:22:35 +00:00
Bill Yi
44b8eef34f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9c441ad4fe
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694398
Change-Id: I427f1711a9ba96028188f84b0065478d82063d36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 14:22:31 +00:00
Bill Yi
381f37b918
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 789b774cb2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694395
Change-Id: I832faea9d0f28e85e4ce5fc7c796bf0d94a093c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 14:22:18 +00:00
Bill Yi
a508e939b1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1a3d6c47c2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694395
Change-Id: I11c3a1c5f69dada5b7d1ec2d74cdb46f34e8b678
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 14:22:09 +00:00
Bill Yi
0bc186ced0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 789b774cb2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694395
Change-Id: Ice10cfe5937d454d09b7e6e75c22060d7ed5300f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 14:22:04 +00:00
Treehugger Robot
1467de15bc
Merge "Fix always return first package for mock location app in developer options." am: d221269892
am: 280ad76afb
am: 4c06c2426d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2133170
Change-Id: I6ffe3f49c01d692a9eb1c77030be732be204ef8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 14:17:42 +00:00
Treehugger Robot
4c06c2426d
Merge "Fix always return first package for mock location app in developer options." am: d221269892
am: 280ad76afb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2133170
Change-Id: If151337acb399e3ce8ab733eb44d2cc6a9ef0484
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 13:59:51 +00:00
Bill Yi
1be27e97c5
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-08-23 13:56:32 +00:00
Bill Yi
1a3d6c47c2
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-08-23 13:56:32 +00:00
Treehugger Robot
280ad76afb
Merge "Fix always return first package for mock location app in developer options." am: d221269892
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2133170
Change-Id: I66bdf2036d3a3af348137b07a1b2b9edb29d1894
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 13:38:27 +00:00
Treehugger Robot
d221269892
Merge "Fix always return first package for mock location app in developer options."
2022-08-23 13:15:51 +00:00
YK Hung
ef6a5f0288
Merge "Add fade in animation for battery usage chart group"
2022-08-23 12:26:09 +00:00
Pajace Chen
b00140b7a3
Reduce the calling times for isExtraDefend
...
Only calling this HAL API when BatteryDefenderTips card need to be shown
Bug: 243465597
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.*
Change-Id: Iae3c03d946ec29fe78a826ce62b6bebd893704ef
2022-08-23 20:15:50 +08:00
TreeHugger Robot
bab9d6fa0b
Merge "Fix udfps fingerprint setting flow"
2022-08-23 11:58:59 +00:00
Zaiyue Xue
2a57f5de8d
Port battery usage bug fixing cls from master to tm-qpr-dev
...
This cl is a merge of the following 5 cls:
ag/19674112 Fix b/242989581: The two battery charts have the same label
ag/19667114 Support data logging for battery usage new chart view
ag/19636171 Support data logging for battery usage new chart view
ag/19682758 Resolve insufficient contrast for system component icons
ag/19697763 Add fade in animation for battery usage chart group
Bug: 242989581
Bug: 242810430
Bug: 242989982
Test: presubmit
Change-Id: I39cd0f88ce62a280a966750082a40f8a537b9616
Merged-In: Ice30508bc20b5de631efee0db0160fe6ad710dbb
2022-08-23 19:30:49 +08:00
TreeHugger Robot
63e627ca93
Merge "Show 'Clear storage' on customize manage space button"
2022-08-23 10:47:55 +00:00
ykhung
919864918c
Add fade in animation for battery usage chart group
...
Bug: 236101166
Test: manually checking for UI
Change-Id: I56e2f80036397efd1ce0dceec46fceff08af43d6
2022-08-23 09:31:08 +00:00
Arc Wang
47532e9d76
Show 'Clear storage' on customize manage space button
...
Settings app may show 'Clear storage' button to clear data
or 'Manage space' button to show app customize manage space UI.
To have a consistent UI, shows 'Clear storage' button
for the 2 cases.
Fix: 241486222
Test: manual visual
Settings -> Apps -> See all apps -> Photos
-> Storage & cache
Change-Id: I09f2e651a2844ef809ee269c7114296af69e6bb9
2022-08-23 16:48:00 +08:00
张倞诚
d8d0cb3532
Fix always return first package for mock location app in developer options.
...
The mock location app should be OP_MOCK_LOCATION allowed app, the packageOps.get(0).getPackageName()
is the first app that used the OP_MOCK_LOCATION in history, but maybe rejected.
Change-Id: I0158436dd7d2790f4e9640075bc9c8bd3422f467
2022-08-23 07:50:16 +00:00
Automerger Merge Worker
a5789ddaa3
Merge changes from topic "am-3814f95bacde4982ab989e398ac8052d" into tm-d1-dev-plus-aosp am: ad5444df28
am: f2220437ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393
Change-Id: Ife8ee8bf4755cd93317dc6e11968629f14e76ac5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 07:41:17 +00:00
TreeHugger Robot
920c70da3c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675
-s ours am: 4f819e1516
-s ours am: a31f4bd4de
-s ours am: 614943029f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393
Change-Id: I4c339e6159363349220d24d929427da0f187c985
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 07:40:59 +00:00
TreeHugger Robot
8638f1a9f3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675
-s ours am: aa3a5a8e5f
-s ours am: 9313d8a22a
-s ours am: 7132b78cd2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393
Change-Id: Ic0eccd3825e7d6fc44d7c7c8d78489ee216138bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 07:37:25 +00:00
Bill Yi
56577277de
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32ddcf7c21
-s ours am: c6fcf4dd69
-s ours am: 03694f9b15
-s ours am: 7bef9eab0f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393
Change-Id: I4b081431cd5db5fa63dee5f8f41c2256be427a7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 07:37:03 +00:00
Automerger Merge Worker
f2220437ba
Merge changes from topic "am-3814f95bacde4982ab989e398ac8052d" into tm-d1-dev-plus-aosp am: ad5444df28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393
Change-Id: If3d42aa8f43328404c65ee659d1a5ebb438149b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 07:12:13 +00:00
TreeHugger Robot
614943029f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675
-s ours am: 4f819e1516
-s ours am: a31f4bd4de
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393
Change-Id: Ic97a2bd6beb54d3d555b80ed0377714f7ec0c04d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 07:11:58 +00:00
TreeHugger Robot
7132b78cd2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675
-s ours am: aa3a5a8e5f
-s ours am: 9313d8a22a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393
Change-Id: Id693f540436ffd8fe8a8745aaaa737ae667213f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 07:09:09 +00:00
Bill Yi
7bef9eab0f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32ddcf7c21
-s ours am: c6fcf4dd69
-s ours am: 03694f9b15
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393
Change-Id: Idacf29303b59a4c8d8995b81e77a6ebcc018472e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 07:08:51 +00:00
TreeHugger Robot
3cd548088b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675
-s ours am: 1a2d36a67f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393
Change-Id: Ic9fb8cc721a79b6aa7c9de7abd9c63ce489b149f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 06:54:19 +00:00
Bill Yi
d64405dad1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32ddcf7c21
-s ours am: 1399a1767a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393
Change-Id: Iff782408f3c36301c8fa05ff3cad7a0076000781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 06:54:05 +00:00
Automerger Merge Worker
ad5444df28
Merge changes from topic "am-3814f95bacde4982ab989e398ac8052d" into tm-d1-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675
-s ours am: 4f819e1516
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32ddcf7c21
-s ours am: f8f3b752ea
-s ours
2022-08-23 06:52:09 +00:00