TreeHugger Robot
70a5bd4c62
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a1c58e43cb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591585
Change-Id: I762388b6d96ba80d2f5c632dc16ce812c607aad1
2021-08-17 19:49:47 +00:00
TreeHugger Robot
a1c58e43cb
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-08-17 19:31:32 +00:00
YUKAI HUNG
c4234a86a8
Merge "[Security] resolve RequestIgnoreBatteryOptimizations info disclosure" into sc-v2-dev am: 0a308d056b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15583411
Change-Id: I547b749bf8186e08ef33f7eb7635842b4895d1c8
2021-08-17 17:27:51 +00:00
YUKAI HUNG
0a308d056b
Merge "[Security] resolve RequestIgnoreBatteryOptimizations info disclosure" into sc-v2-dev
2021-08-17 17:10:26 +00:00
Treehugger Robot
e53111b6a0
Merge "Add biometric OWNERS to unit tests." am: 9689490c22
am: 2fbbcd3d9d
am: 9ee42fc623
am: e016e0b03f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1795029
Change-Id: I49dcaf8ffe6c206087ac920b18fa73f36a2c2a39
2021-08-17 09:48:26 +00:00
Treehugger Robot
e016e0b03f
Merge "Add biometric OWNERS to unit tests." am: 9689490c22
am: 2fbbcd3d9d
am: 9ee42fc623
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1795029
Change-Id: I4e704c29fa65197dbe1ba6e6471d925c0ad19a60
2021-08-17 09:37:38 +00:00
Treehugger Robot
9ee42fc623
Merge "Add biometric OWNERS to unit tests." am: 9689490c22
am: 2fbbcd3d9d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1795029
Change-Id: I56890f77bf79e84953a0ce01f2cec4089682fbf4
2021-08-17 09:22:56 +00:00
Treehugger Robot
2fbbcd3d9d
Merge "Add biometric OWNERS to unit tests." am: 9689490c22
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1795029
Change-Id: I355edf3a1ff7efb93a3c8eff94bb77104e60a5cb
2021-08-17 09:12:11 +00:00
Treehugger Robot
9689490c22
Merge "Add biometric OWNERS to unit tests."
2021-08-17 08:43:12 +00: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
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
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
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
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
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
Curtis Belmonte
09beed19de
Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21
am: f07f8b57eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467
Change-Id: I4b1c644efefef622f6fdc5b426f38ead71adc1ec
2021-08-17 01:02:27 +00:00
Curtis Belmonte
36a42b630b
Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467
Change-Id: Ia1824f9bbb81d95e928f32f39f088a4a6aeaef9e
2021-08-17 01:02:08 +00:00
Curtis Belmonte
474fba01f1
Merge changes from topic "presubmit-am-50cf8052ea594bbfb9d45e820e7b72cd" into sc-dev-plus-aosp am: 2b318b3b69
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467
Change-Id: Ibb2a4c9f98a1c6f302288252201d12f28de4a1e1
2021-08-17 01:01:47 +00:00
Curtis Belmonte
f07f8b57eb
Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467
Change-Id: I6428763357c016f863a7eead05c8424b7efe9ba4
2021-08-17 01:01:17 +00:00
Yomna Nasser
f64dc309ac
Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248
am: ea343fa5a4
am: cc7d1df747
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273
Change-Id: I324006143b33deeca77021a6187ad7636588ad2e
2021-08-17 00:56:43 +00:00
Yomna Nasser
e4bfb7de87
Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248
am: ea343fa5a4
am: 4ff69294a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273
Change-Id: Ie79c34db0894229d263fd2361285e4eeb2391ea7
2021-08-17 00:56:23 +00:00
Yomna Nasser
19c1eba133
Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248
am: 87259ab2af
am: da6c658b99
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273
Change-Id: I50a1f816db1831e0570c07878e963632c70c7d31
2021-08-17 00:56:17 +00:00
Curtis Belmonte
7fb2316a21
Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev
2021-08-17 00:47:58 +00:00
Curtis Belmonte
2b318b3b69
Merge changes from topic "presubmit-am-50cf8052ea594bbfb9d45e820e7b72cd" into sc-dev-plus-aosp
...
* changes:
[automerge] Remove/replace old fingerprint icon in SUW/Settings 2p: dc9b53c446
Remove/replace old fingerprint icon in SUW/Settings
2021-08-17 00:47:58 +00:00
Yomna Nasser
cc7d1df747
Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248
am: ea343fa5a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273
Change-Id: I66ce87c90de8da8b288295dfbb7f9be0b05132fc
2021-08-17 00:43:43 +00:00
Yomna Nasser
4ff69294a4
Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248
am: ea343fa5a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273
Change-Id: I357fb09a14d85c85fed75603da9f96aa44ff6786
2021-08-17 00:43:41 +00:00
Yomna Nasser
da6c658b99
Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248
am: 87259ab2af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273
Change-Id: I3a5aa2741d2a8bb9495fb5e88b27d1248d60f7ef
2021-08-17 00:43:26 +00:00
Yomna Nasser
ea343fa5a4
Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273
Change-Id: Ic40a46ce6d36e5147fc99ed3afb1bb1735164cad
2021-08-17 00:30:30 +00:00
Yomna Nasser
87259ab2af
Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273
Change-Id: I04e70b72a0c2cd197ae993139c9fb60b01a07a23
2021-08-17 00:29:43 +00:00
Joe Bolinger
6e1ecbd617
Update OWNERS.
...
Test: N/A
Change-Id: I6646a2b7dda95f458b95c0fed331b1cb213fcae8
2021-08-16 17:12:53 -07:00
Yomna Nasser
cf77b7a248
Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev
2021-08-17 00:12:39 +00:00
Curtis Belmonte
dbef2415d3
[automerge] Remove/replace old fingerprint icon in SUW/Settings 2p: dc9b53c446
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467
Change-Id: Ief92774377376ea11b4e099f7c0cf5764cbf7f31
2021-08-16 21:44:39 +00:00
Curtis Belmonte
dc9b53c446
Remove/replace old fingerprint icon in SUW/Settings
...
Replaces instances of the old fingerprint icon shown during Setup Wizard
or in Settings with either an updated version or an entirely different
icon.
Test: Manual
Fixes: 196600265
Change-Id: If78e8f0dbdb033f557614a019d4c9dde4493b6c6
2021-08-16 14:44:15 -07:00
Alex Florescu
d6adfa60d5
Set a maximum width for the settings bottom panel on large screens am: 9fab04b913
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15543301
Change-Id: Icba157112b88c2568b7ffcaaafc8422e919af6f6
2021-08-16 10:41:40 +00:00
Alex Florescu
9fab04b913
Set a maximum width for the settings bottom panel on large screens
...
Bug: 187297703
Test: manual
Change-Id: I18ec554dbb6edae88b1d73f4682a77106f787461
2021-08-16 09:15:01 +00:00
Peter_Liang
192dfdec7f
Update the instruction images in Accessibility tutorial dialog.
...
1. Update the material next style.
2. Support for Lottie image.
Bug: 195094388
Test: manual test
Change-Id: I57306532b10e91c927bdc1ef5e115f41bc7a939b
2021-08-16 16:20:01 +08:00
Peter_Liang
c2a04e3820
Update the instruction images in Accessibility edit shortcut dialog.
...
1. Update the material next style.
2. Support for Lottie image.
Bug: 195094388
Test: manual test
Change-Id: I1fba7ee1d18b53f4c917319d2c0a4a304de0ae43
2021-08-16 15:36:32 +08:00