Bill Yi
81c97af835
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d1e4f888fb
2p: 8d94de2962
...
Blank merge reason: parent was merged -s ours
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591587
Change-Id: I4dac108fb9b72bb7180e3870ac0133ee0f4138c3
2021-08-17 05:49:52 +00:00
Bill Yi
635d7a2949
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d1e4f888fb
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591587
Change-Id: I4c5f57616aa0bda605f4fcd4f7de90a6c8b64853
2021-08-17 05:49:49 +00:00
Bill Yi
8d94de2962
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d1e4f888fb
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591587
Change-Id: I82e01f7a48919bec7e5d1d97788d7b72e239d831
2021-08-17 05:49:49 +00:00
Bill Yi
d1e4f888fb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Icabf059c62f547d2bf1bef0bc04e8e22d1613bc9
2021-08-16 22:49:25 -07:00
Bill Yi
a9674f1e17
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I645acc726b56601af6ae2a58959dd514a1140ee2
2021-08-16 22:44:16 -07:00
Bill Yi
33816cbd55
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Icc69636a8f76732319cc24c5bf7e842150ab5692
2021-08-16 22:39:23 -07:00
Bill Yi
d49b8b74d0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibe35735e2e3ab8087dfc0f2303e4b32318ac95a3
2021-08-16 22:37:14 -07:00
Bill Yi
1f5111f15b
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 21392f9ffb
2p: 1e656787ee
...
Blank merge reason: parent was merged -s ours
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591583
Change-Id: I28137b9f9c63c7247fbbed413bea2d7e7e080484
2021-08-17 05:35:24 +00:00
Bill Yi
cd0d73535b
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 21392f9ffb
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591583
Change-Id: Iab4d8828f2a190ed85f24dc2ec2f58f7082744f3
2021-08-17 05:35:19 +00:00
Bill Yi
1e656787ee
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 21392f9ffb
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591583
Change-Id: Ia8dff8797c03100a053ce9182e4b38b4b65a6ead
2021-08-17 05:35:19 +00:00
Bill Yi
21392f9ffb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0e71e551f5efede9979e39aa215cfb597bb3135d
2021-08-16 22:35:06 -07:00
Bill Yi
53e3aea5b1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I01389260be009ebfb0a3393909063a0e51a6cd8c
2021-08-16 22:32:57 -07:00
Bill Yi
25b3ab76e4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4be1756b35504ec9d49bc7b8d6bd7b7e753aae8b
2021-08-16 22:29:11 -07:00
Bill Yi
f82b80a567
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie28ab84cb3ef23d6602af63e2e531d7057000d2f
2021-08-16 22:24:38 -07:00
Bill Yi
62a6495cfa
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 04d698d1f6
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15590653
Change-Id: I98f7d7d5526c18e63acf41c5f8221895bfe1f8e0
2021-08-17 05:15:03 +00:00
Bill Yi
04d698d1f6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic2f525f57921de3a484758f4513e98310b41bab3
2021-08-16 22:14:41 -07:00
Bill Yi
6f047583bc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6680983f470525631710e359072fe27a81a322be
2021-08-16 22:09:54 -07:00
Bill Yi
a269d50b3a
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 9b333b2dcb
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15590650
Change-Id: Iff09f1740622370aee760d6ad043576de2b7e2dc
2021-08-17 05:05:28 +00:00
Bill Yi
9b333b2dcb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If452267fcdb2a76d571f3526b1da4aa1261dec64
2021-08-16 22:05:07 -07:00
Bill Yi
a687e17227
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iaed09e1a4628fec8391ad74d6eb451c8dbb997a0
2021-08-16 22:02:55 -07:00
Treehugger Robot
4056b335ce
Merge "Update OWNERS." am: 0544dc7b92
am: b294717b4c
am: 78ed3bb6ee
am: 5f69669adb
am: bba477b3ed
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1797467
Change-Id: Id2ad6188daec7edc8eadd67aaa8d7e9a52ff8208
2021-08-17 05:01:37 +00:00
Treehugger Robot
bba477b3ed
Merge "Update OWNERS." am: 0544dc7b92
am: b294717b4c
am: 78ed3bb6ee
am: 5f69669adb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1797467
Change-Id: Ifc7949ccb9eb3e9b15eaa3fea78d2a90c0024a6e
2021-08-17 04:53:01 +00:00
Treehugger Robot
5f69669adb
Merge "Update OWNERS." am: 0544dc7b92
am: b294717b4c
am: 78ed3bb6ee
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1797467
Change-Id: Ibf4c5605ece3d2f49602b60602c523d1e7c4877b
2021-08-17 04:41:07 +00:00
Treehugger Robot
78ed3bb6ee
Merge "Update OWNERS." am: 0544dc7b92
am: b294717b4c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1797467
Change-Id: I3d44a009fc1fb653a074c0b5075b673dcbee82d8
2021-08-17 04:28:48 +00:00
Treehugger Robot
b294717b4c
Merge "Update OWNERS." am: 0544dc7b92
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1797467
Change-Id: I8cef16ea650efa1d2f2479055779a84d266b7085
2021-08-17 04:09:55 +00:00
ykhung
518d6df4f4
[Security] resolve RequestIgnoreBatteryOptimizations info disclosure
...
after discussed with kdeus@ we will remove the setResult() from the
dialog action to avoid the caller apps can distinguish the users
interaction behavior, and declared REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
in other applications.
Bug: 195963373
Test: make SettingsRoboTests
Change-Id: Ia2e47c493c206e96b0bc1d9f08735c0f9474c233
2021-08-17 12:06:59 +08:00
Treehugger Robot
0544dc7b92
Merge "Update OWNERS."
2021-08-17 03:57:07 +00:00
Jason Hsu
7e4f26a729
Merge "Update the button navigation preview image in 'Accessibility button & gesture' page." into sc-v2-dev am: e4824d8ee0
am: 3f5218a971
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15552652
Change-Id: I0fbb00a00f65480bf59e35e7d4de89cf3244b5ca
2021-08-17 03:25:07 +00:00
PETER LIANG
dce6b4fe01
Merge changes I57306532,I1fba7ee1 into sc-v2-dev am: 4cddfd2b00
am: 976b30afe3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15478953
Change-Id: I80bb3f0e0d9617dadb3814f2bce8b19d4bb899a9
2021-08-17 03:25:00 +00:00
TreeHugger Robot
4b7d30a008
Merge "[Settings] Avoid from immediate update when UI inactive and SIM absent"
2021-08-17 03:17:03 +00:00
Jason Hsu
3f5218a971
Merge "Update the button navigation preview image in 'Accessibility button & gesture' page." into sc-v2-dev am: e4824d8ee0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15552652
Change-Id: I2d0eaadd04c8a323c9a85ecfeb27c6f18151fb87
2021-08-17 03:16:40 +00:00
Jason Hsu
e4824d8ee0
Merge "Update the button navigation preview image in 'Accessibility button & gesture' page." into sc-v2-dev
2021-08-17 03:14:48 +00:00
PETER LIANG
976b30afe3
Merge changes I57306532,I1fba7ee1 into sc-v2-dev am: 4cddfd2b00
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15478953
Change-Id: I6eee350feacecdb9d4bc83f6e297ac4c374c89e5
2021-08-17 03:12:08 +00:00
YUKAI HUNG
dc29c4b018
Merge "Add a skeleton to support battery configucation backup/restore" into sc-v2-dev am: 7053c5e265
am: 1b92bfe010
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15552649
Change-Id: Icfb09198ad2ba0fe1a0fd29f76e39a143d302a79
2021-08-17 03:07:46 +00:00
PETER LIANG
4cddfd2b00
Merge changes I57306532,I1fba7ee1 into sc-v2-dev
...
* changes:
Update the instruction images in Accessibility tutorial dialog.
Update the instruction images in Accessibility edit shortcut dialog.
2021-08-17 03:00:28 +00:00
YUKAI HUNG
1b92bfe010
Merge "Add a skeleton to support battery configucation backup/restore" into sc-v2-dev am: 7053c5e265
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15552649
Change-Id: I97ee066342d3c66bfa279eab6e238942f64eee3f
2021-08-17 02:54:11 +00:00
YUKAI HUNG
7053c5e265
Merge "Add a skeleton to support battery configucation backup/restore" into sc-v2-dev
2021-08-17 02:37:37 +00:00
Bonian Chen
74af46cc82
Merge "[Settings] Avoid from main UI thread blocking on accessing eSIM"
2021-08-17 01:51:55 +00:00
Curtis Belmonte
a17539fbdc
Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21
am: 36a42b630b
am: 4f1672ce7b
am: 1ca0b522d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467
Change-Id: Ic5f192d8cb5aade4d0eb2da3a45eb1db8f23ac35
2021-08-17 01:46:22 +00:00
Bonian Chen
1cc61672ef
[Settings] Avoid from floating overlay when displaying SIM selection UI
...
Avoid from floating overlay when displaying SIM selection UI, which
could avoid from security issue.
Bug: 195667589
Test: local
Change-Id: I8db76005f2c3ad6cc94d68703b2b1647d81371f5
2021-08-17 09:46:00 +08:00
Curtis Belmonte
1ca0b522d1
Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21
am: 36a42b630b
am: 4f1672ce7b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467
Change-Id: I59cfe8ed9fcbcaf34c885edbe8dfe480df503dbf
2021-08-17 01:31:46 +00:00
Curtis Belmonte
bdb9435bb6
Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21
am: 36a42b630b
am: 115bbd0556
am: 26b90c2cee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467
Change-Id: I223f70cf6621089768cf414414170058d656e993
2021-08-17 01:28:50 +00:00
Curtis Belmonte
fa10f95ec6
Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21
am: f07f8b57eb
am: 09beed19de
am: a5d6a791af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467
Change-Id: Id7d0615369e24f42681feebdef3bec53b302c2d3
2021-08-17 01:28:11 +00:00
Curtis Belmonte
5e5a8cd4a6
Merge changes from topic "presubmit-am-50cf8052ea594bbfb9d45e820e7b72cd" into sc-dev-plus-aosp am: 2b318b3b69
am: 474fba01f1
am: bf54fec03a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467
Change-Id: I55ae6875b4a3f7698eba3f21f8e69dbd9328d46e
2021-08-17 01:27:35 +00:00
Curtis Belmonte
26b90c2cee
Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21
am: 36a42b630b
am: 115bbd0556
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467
Change-Id: I3246c51ffeab997b5dbdb5a82f1ce8457ef57428
2021-08-17 01:19:04 +00:00
Curtis Belmonte
115bbd0556
Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21
am: 36a42b630b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467
Change-Id: I990c32d04641473d686914558eb801a1d0e865d7
2021-08-17 01:15:51 +00:00
Curtis Belmonte
4f1672ce7b
Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21
am: 36a42b630b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467
Change-Id: I8f77b33b4bcba08b8a25965cf165db290aaeca11
2021-08-17 01:15:50 +00:00
Curtis Belmonte
a5d6a791af
Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21
am: f07f8b57eb
am: 09beed19de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467
Change-Id: Idbced9b8570515f2a57d9458586ac9cb1bbebb66
2021-08-17 01:15:23 +00:00
Curtis Belmonte
bf54fec03a
Merge changes from topic "presubmit-am-50cf8052ea594bbfb9d45e820e7b72cd" into sc-dev-plus-aosp am: 2b318b3b69
am: 474fba01f1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467
Change-Id: Icc46cedb2fcd2e7a7bc471a029f2e7c832cecbdc
2021-08-17 01:15:04 +00:00
Yomna Nasser
9057e39d7f
Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248
am: ea343fa5a4
am: cc7d1df747
am: f64dc309ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273
Change-Id: Ia48a04ba72dddc241d1378e1638ed0e7db9d773b
2021-08-17 01:10:40 +00:00