TreeHugger Robot
5c851b28f7
Merge "Show restricted message in Wi-Fi Direct summary" into tm-dev am: 38989c9c6a am: d1c67e389d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062823
Change-Id: I7402200f611236e0c2c0d471ff7d09e305e57792
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:51:28 +00:00
Jan Tomljanovic
1ef1f750e8
Merge "Update the SafetyCenter icon" into tm-dev am: 297028ea69 am: 3c357dec8a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18029249
Change-Id: Ia360845eb4b455bf88daf0f8acc423d3a99aeada
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:51:23 +00:00
TreeHugger Robot
431c7ede2b
Merge "Show restricted message in Wi-Fi hotspot summary" into tm-dev am: 30bba3bbdb am: 1c16e6b314
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062822
Change-Id: I4ecd7932ed0100a15fd739ca8cade7394db0b31d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:51:18 +00:00
TreeHugger Robot
5ed72fae84
Merge "Remove tab symbol for app pinning strings" into tm-dev am: 5d31a69d65 am: 7d1f75839d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030885
Change-Id: I45b74f273b2a2665b643e97f8450981228e95402
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:51:12 +00:00
Chaohui Wang
74030a5bc5
Merge "Fix flicker for Mobile data & Wi-Fi page" into tm-dev am: 71e03076cd am: 19356dae5d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18013070
Change-Id: I7d12f8797c346d1cef2be49c97d45a1f40a20ada
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:51:07 +00:00
Tom Hsu
3521d0420c
Merge "[Panlingual] Avoid activity restart during rotation" into tm-dev am: 1d0f85a3d6 am: 169517aacc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030882
Change-Id: Ieefa68c92581682a5eb08d1a85867a1fefc02065
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:51:01 +00:00
Arc Wang
3af1d90a43
Merge "Prevent side channel package installation enumeration" into tm-dev am: a3c7f8482a am: 7a530c79ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944167
Change-Id: I76ce4b70bec93a73c91d716858cb7703f3ed4a1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:50:56 +00:00
TreeHugger Robot
d1c67e389d
Merge "Show restricted message in Wi-Fi Direct summary" into tm-dev am: 38989c9c6a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062823
Change-Id: I56cba95face2b3c989abc77ed0a520f29b6ed8b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:28:22 +00:00
Jan Tomljanovic
3c357dec8a
Merge "Update the SafetyCenter icon" into tm-dev am: 297028ea69
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18029249
Change-Id: Ic4eb2afbbfed8bc6353f9d79dc3451c789166243
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:28:15 +00:00
TreeHugger Robot
1c16e6b314
Merge "Show restricted message in Wi-Fi hotspot summary" into tm-dev am: 30bba3bbdb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062822
Change-Id: Id017a3a3b3a67cd98f0727cd476a86b9ce248fdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:28:08 +00:00
TreeHugger Robot
7d1f75839d
Merge "Remove tab symbol for app pinning strings" into tm-dev am: 5d31a69d65
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030885
Change-Id: I8367ebd5ba89af527152ad41cb0446abd8d5370e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:28:01 +00:00
Chaohui Wang
19356dae5d
Merge "Fix flicker for Mobile data & Wi-Fi page" into tm-dev am: 71e03076cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18013070
Change-Id: I43b852b5c2ae039e20f40ee0d91ed842caf79998
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:27:54 +00:00
Tom Hsu
169517aacc
Merge "[Panlingual] Avoid activity restart during rotation" into tm-dev am: 1d0f85a3d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030882
Change-Id: Ia047213d433f4829bb134f0fbbfc7e8c4c1d6f9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:27:46 +00:00
Arc Wang
7a530c79ec
Merge "Prevent side channel package installation enumeration" into tm-dev am: a3c7f8482a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944167
Change-Id: I822332ea3404102dc25aaeb6db9e6c329a943d47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:27:39 +00:00
Julia Reynolds
d9d09bf112
Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into tm-dev am: 312de956ec am: 1f912cbfe3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17871961
Change-Id: Ic82fa3118e725755090a78e3e13d6bed95ce3e3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 21:07:49 +00:00
TreeHugger Robot
d266df1531
Merge "Hide running time information for "Android System" entry" into tm-dev am: fc6cb73d29 am: 6708570e2c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062824
Change-Id: Ie0dbbd4df64d5bcd52e1715639228de0d7376b31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 21:07:30 +00:00
Calvin Pan
492fdaf058
Merge "Add unit test for AppLocalePickerActivity" into tm-dev am: 8ad2642b5f am: 38fac79ee6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903006
Change-Id: Ia51d0a83cddabc8ba6916aebc8305fa03478f01b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 21:07:24 +00:00
Betty Chang
3ea06f174e
Merge "[LE] Launch the MediaOutputBroadcastDialog when the current device is broadcasting" into tm-dev am: 7711207ba5 am: ec17c47421
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944166
Change-Id: I9fbbf6adfe050182ebbe2d1888d3ee7778b9fa4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 21:05:44 +00:00
TreeHugger Robot
4942694f50
Merge "Remove loading spinner from Premium SMS access" into tm-dev am: 611db9e8be am: 70e4a209c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903584
Change-Id: I28d03b0fbe4652b6aa768b77354b8c698bdb3c70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:24:44 +00:00
YK Hung
6ff7a106b1
Merge "Refine the BatteryUsageStats close() method invoke timing" into tm-dev am: 55fcb02aca am: fc95a8f973
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030883
Change-Id: Ie8099f28d548199f7860fd6d83525dce532bc054
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:17:46 +00:00
Bill Yi
61ba40c852
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8 2p: 737ee1e1a7 am: fa29c0c3bc -s ours am: f7c06375b1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062875
Change-Id: I9d8785fa71e2f89215727dae9718398331d04a28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:17:14 +00:00
Amy Hsu
d99149b0b4
Merge "[ScreenResolutionController] UI string update" into tm-d1-dev am: 19b9978591
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17983872
Change-Id: I0b02f976ed8b7f56d327fcf162b23d09b4cab964
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:15:58 +00:00
Prabal Singh
158164e219
Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev am: 9a8f44227e am: 89e0eda197
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17981601
Change-Id: I8ad9c1b8e092818f6ae120cd87e54dd598615047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:04:06 +00:00
Julia Reynolds
1f912cbfe3
Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into tm-dev am: 312de956ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17871961
Change-Id: I76028b997fab517cb28d5dacc821c80cf777ec84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 17:14:31 +00:00
TreeHugger Robot
6708570e2c
Merge "Hide running time information for "Android System" entry" into tm-dev am: fc6cb73d29
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062824
Change-Id: Ia8cb12f3f41c3f9ba8cf5ef85d5d012a5fe7053c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 17:14:05 +00:00
Calvin Pan
38fac79ee6
Merge "Add unit test for AppLocalePickerActivity" into tm-dev am: 8ad2642b5f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903006
Change-Id: I0314d4cf0c8d2232da05fd6b8eb9f417d718ecbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 17:13:57 +00:00
Betty Chang
ec17c47421
Merge "[LE] Launch the MediaOutputBroadcastDialog when the current device is broadcasting" into tm-dev am: 7711207ba5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944166
Change-Id: I27aae2227a69fbe547a974e2d8a1054f1d87108d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 17:12:59 +00:00
TreeHugger Robot
70e4a209c8
Merge "Remove loading spinner from Premium SMS access" into tm-dev am: 611db9e8be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903584
Change-Id: I8145b6fae18d039c59cb7ad542d8623d94b4e3c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 17:12:25 +00:00
YK Hung
fc95a8f973
Merge "Refine the BatteryUsageStats close() method invoke timing" into tm-dev am: 55fcb02aca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030883
Change-Id: Ife069490f25bb4b7fbabf49992537711b21d5266
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 17:12:15 +00:00
Bill Yi
f7c06375b1
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8 2p: 737ee1e1a7 am: fa29c0c3bc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062875
Change-Id: I11013b1af35da8dfc6794f1fd656df9ea46d2243
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 17:12:04 +00:00
TreeHugger Robot
38989c9c6a
Merge "Show restricted message in Wi-Fi Direct summary" into tm-dev
2022-04-29 15:16:44 +00:00
Jan Tomljanovic
297028ea69
Merge "Update the SafetyCenter icon" into tm-dev
2022-04-29 13:38:38 +00:00
TreeHugger Robot
30bba3bbdb
Merge "Show restricted message in Wi-Fi hotspot summary" into tm-dev
2022-04-29 09:51:21 +00:00
TreeHugger Robot
5d31a69d65
Merge "Remove tab symbol for app pinning strings" into tm-dev
2022-04-29 09:43:23 +00:00
Chaohui Wang
71e03076cd
Merge "Fix flicker for Mobile data & Wi-Fi page" into tm-dev
2022-04-29 08:26:24 +00:00
Tsung-Mao Fang
a95b12f921
Remove tab symbol for app pinning strings
...
The pinning description can't align together
in certain device.
To mitigate the alignment problem, we try to
remove the \t character now.
Test: visual
Fix: 222617691
Change-Id: I35974caf9d6fa316a6e4a0a5200ccab6a80f915b
2022-04-29 07:41:33 +00:00
Tom Hsu
1d0f85a3d6
Merge "[Panlingual] Avoid activity restart during rotation" into tm-dev
2022-04-29 07:14:14 +00:00
Arc Wang
a3c7f8482a
Merge "Prevent side channel package installation enumeration" into tm-dev
2022-04-29 07:12:06 +00:00
Julia Reynolds
312de956ec
Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into tm-dev
2022-04-29 05:11:26 +00:00
TreeHugger Robot
fc6cb73d29
Merge "Hide running time information for "Android System" entry" into tm-dev
2022-04-29 04:32:41 +00:00
Calvin Pan
8ad2642b5f
Merge "Add unit test for AppLocalePickerActivity" into tm-dev
2022-04-29 03:56:56 +00:00
Betty Chang
7711207ba5
Merge "[LE] Launch the MediaOutputBroadcastDialog when the current device is broadcasting" into tm-dev
2022-04-29 03:33:55 +00:00
Amy Hsu
19b9978591
Merge "[ScreenResolutionController] UI string update" into tm-d1-dev
2022-04-29 03:25:34 +00:00
ykhung
1c3cb4505c
Hide running time information for "Android System" entry
...
Hide the running time information for "Android System" entry, since this
entry will combine multiple system components together. It will provide
incorrect running time information. The getRealUid() method maps many
UIDs to Process.SYSTEM_UID(1000), which results in combining all of
those UIDs into one "Android System" entry. This is the expected behavior.
Bug: 220717612
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: I0aece0f1e86c36e55a2b5a966b4da9fdea14c748
2022-04-29 02:40:07 +00:00
TreeHugger Robot
611db9e8be
Merge "Remove loading spinner from Premium SMS access" into tm-dev
2022-04-29 02:30:14 +00:00
YK Hung
55fcb02aca
Merge "Refine the BatteryUsageStats close() method invoke timing" into tm-dev
2022-04-29 01:14:33 +00:00
Prabal Singh
89e0eda197
Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev am: 9a8f44227e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17981601
Change-Id: Ibfa6243c7bb5757515ed2388f2acec1547c023d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 20:41:46 +00:00
Weng Su
5e3d75a6f9
Show restricted message in Wi-Fi Direct summary
...
- See the result screenshot in b/203168953#comment9
Bug: 203168953
Test: manual test
make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiP2PPreferenceControllerTest
Change-Id: I87ad6d7554fbb4aa86d4617438fa359c67544812
2022-04-29 03:41:56 +08:00
Bill Yi
fa29c0c3bc
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8 2p: 737ee1e1a7
...
Blank merge reason: parent was merged -s ours
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062875
Bug: 205460459
Change-Id: Ic315f239b7f44fccb3ffdf859a920c7bbdda7602
2022-04-28 18:52:14 +00:00
Bill Yi
737ee1e1a7
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062875
Bug: 205460459
Change-Id: I51afb40dfedcc3495b937de9d81e15c82a3bf90b
2022-04-28 18:51:58 +00:00