TreeHugger Robot
abc26d38fd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 94061be6ee
-s ours am: 7828afe859
-s ours am: 2fae3c8608
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210269
Change-Id: I00113b088499b3a6d2686eae5c1915ccc3b81a7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:48:06 +00:00
Bill Yi
45908574e2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c60e7098d2
-s ours am: 2819fde801
-s ours am: d36fa64c17
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210269
Change-Id: Iac02b759107d2ba2a53e0713e9b18bbfe286370f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:48:01 +00:00
Bill Lin
84154328df
Merge "Well control enrolling icon animation by UX design" into tm-qpr-dev
2022-06-24 00:41:10 +00:00
TreeHugger Robot
2fae3c8608
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 94061be6ee
-s ours am: 7828afe859
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210269
Change-Id: If55c036e66029f9f40366cb6fe05cf4f763be054
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:30:19 +00:00
Bill Yi
d36fa64c17
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c60e7098d2
-s ours am: 2819fde801
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210269
Change-Id: Idfb9cf3bc7e1208b7ad8ba011095695025e23555
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:30:14 +00:00
TreeHugger Robot
7828afe859
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 94061be6ee
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210269
Change-Id: I29c94990fd4fd817084566ded10bb1bc851ebcec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:04:10 +00:00
Bill Yi
2819fde801
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c60e7098d2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210269
Change-Id: I09548afe761010b4909cc3a2453d1980776d6b15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:03:59 +00:00
TreeHugger Robot
9812f35a1b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 49a681bb37
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19009446
Change-Id: I016a862b42c0563e77b78a84dda730514a25ee7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 11:46:20 +00:00
Bill Yi
679b231989
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 382bed292d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19009446
Change-Id: Ic02005a0bb378e5e4916e094bc5d1cd2fc1bf201
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 11:46:11 +00:00
TreeHugger Robot
d360cd6895
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f08bf7780a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19009125
Change-Id: Iee8fd197446401293b649fb866fca45375b14892
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 11:46:03 +00:00
Bill Yi
f1ccac59de
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2714015bac
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19009125
Change-Id: I07e7a8739655acb12d360200de06e1579aa3355e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 11:45:57 +00:00
TreeHugger Robot
49a681bb37
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-06-23 11:24:26 +00:00
TreeHugger Robot
f08bf7780a
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-06-23 11:24:26 +00:00
lbill
48286b8df0
Well control enrolling icon animation by UX design
...
T:
* Always plays the scanning animation when user enrolling.
QPR:
* At beginning / Orientation change: Play the scanning animation until user interact with FPS
* When progress moved : Play scanning animation once
* Error : Show message(red color) to notify user
Bug: 232018092
Test: With Rare-FPS device, Settings > Security > Fingerprint enrollment,
enrolling a new fingerprint, check the mIconAnimationDrawable
Test: With Side-FPS device, Settings > Security > Fingerprint enrollment,
enrolling a new fingerprint, check the mIconAnimationDrawable
Test: make RunSettingsGoogleRoboTests ROBOTEST_FILTER= \
"com.google.android.settings.biometrics.fingerprint.FingerprintEnrollEnrollingTest"
Change-Id: I64a1bd24260205b651036c34e6e879b59bef75cc
2022-06-23 08:33:02 +00:00
Bonian Chen
2cb39cf969
Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7
am: 31b8174c10
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528
Change-Id: Id817b88d0210b620c398b2598a954ec544548833
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 04:52:11 +00:00
Bonian Chen
31b8174c10
Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528
Change-Id: I7484149765a66e9c9beeeac1bb9dd596670a6ba8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 04:27:06 +00:00
Bonian Chen
c5fc5db0e7
Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev
2022-06-23 04:08:21 +00:00
Salud Lemus
fd1d882d8d
Merge "Fix title used for financed device info in Settings" into tm-dev am: bb149294dd
am: 7e3c6913d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18934542
Change-Id: I926409fc54b474b2e8a079767d9eb0dc58056fee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 23:08:03 +00:00
Salud Lemus
7e3c6913d3
Merge "Fix title used for financed device info in Settings" into tm-dev am: bb149294dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18934542
Change-Id: I6237d72f20faa1961a5e7005244c8f0962bf891f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 22:49:19 +00:00
Salud Lemus
bb149294dd
Merge "Fix title used for financed device info in Settings" into tm-dev
2022-06-22 22:33:18 +00:00
Bonian Chen
67556fac04
Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31
am: e941740b35
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040
Change-Id: I8564a7c35b201d4a5022d9dcf2545a097822c4bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 19:43:37 +00:00
Bonian Chen
e941740b35
Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040
Change-Id: I8c39ef8a089394c52b5a80ea98fa77f2ab0f2ab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 19:25:48 +00:00
Bonian Chen
29a00dbc31
Merge "[Settings] Adjusted the API of Settings app" into tm-dev
2022-06-22 18:59:54 +00:00
Oriol Prieto Gascó
95d32d678c
Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0
am: 0dfc94f668
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799
Change-Id: I94c1735bc1da2157654340fb809b0e7f273a804b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 18:12:29 +00:00
Oriol Prieto Gascó
0dfc94f668
Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799
Change-Id: I0af1ada1c42fe907243bcde356f51d8302bfb5c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 17:45:17 +00:00
Oriol Prieto Gascó
d6166e42a0
Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev
2022-06-22 17:18:45 +00:00
Bonian Chen
d10618d489
[Settings] Adjusted the API of Settings app
...
The API of Settings app get changed in order to support large screen.
This is a fix to adopt the change related to this work.
A short brief:
1. Accept ACTION_MAIN for launching MobileNetworkActivity.
2. Support deep-link intent while MobileNetworkActivity in foreground.
3. Avoid from binding MobileNetworkActivity as a single instance.
Bug: 230047450
Bug: 234406562
Bug: 229371407
Test: local & unittest
Change-Id: Ifcb9d4c564839199d998bd503f390f021c6bf3ad
2022-06-22 07:51:47 +08:00
TreeHugger Robot
ea9b715e78
Merge "Restrict ProviderModelSlice for guest user" into tm-qpr-dev
2022-06-21 17:05:16 +00:00
TreeHugger Robot
2d0e1dc725
Merge "Restrict AddAppNetworksActivity for guest user" into tm-qpr-dev
2022-06-21 17:04:33 +00:00
TreeHugger Robot
16dfffd6e3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d9fba9380a
-s ours am: 16a6989a3e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19012175
Change-Id: I87d336c1f4b14eac5f6bfa2ee2988ad2228e9bb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 16:41:24 +00:00
Bill Yi
bbce161bdf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fabd8de898
-s ours am: 8c356181d3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19012175
Change-Id: I8d7d19057d700661ce790325764843878686cc8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 16:41:16 +00:00
Bill Yi
22f8ed5745
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b92a98891
-s ours am: ba3e9a0be7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19011703
Change-Id: Ic662f31c45b0a2c0fd5bb89b754e3dfe8c87a333
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 16:41:09 +00:00
TreeHugger Robot
16a6989a3e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d9fba9380a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19012175
Change-Id: Id68dad65a41f070989c3af1eb9a771ac36694d0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 16:23:39 +00:00
Bill Yi
8c356181d3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fabd8de898
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19012175
Change-Id: I7bc9900be8bff52607e50c04e5101bf155722e03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 16:23:33 +00:00
Bill Yi
ba3e9a0be7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b92a98891
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19011703
Change-Id: Ib124601d7cf447559e33a4e6b863c0d6ad33aff4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 16:23:24 +00:00
TreeHugger Robot
d9fba9380a
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-21 16:17:20 +00:00
Bill Yi
1b92a98891
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6239cc468a57eec0e714dab336bf2a913b54267e
2022-06-21 04:15:29 -07:00
Bill Yi
fabd8de898
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I99e5ebe3a8c58c3c9dd9ba74a3081aed861c859b
2022-06-21 04:11:01 -07:00
Bill Yi
382bed292d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3c1724acd927e61e022d74d348092d256d2072ed
2022-06-20 23:19:45 -07:00
Bill Yi
2714015bac
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I09a80efa89b4558201beeb22aa7c854b2e86096e
2022-06-20 23:15:51 -07:00
Zaiyue Xue
3b7953eac2
Merge "Move battery usage files to a separate folder." into tm-qpr-dev
2022-06-20 09:12:04 +00:00
TreeHugger Robot
dcdc9374ae
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 90884f3225
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18984486
Change-Id: I09456fa6dee64a6f453073956ff4370ecd8e80e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-20 08:20:25 +00:00
Bill Yi
2c0551238e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2652464d7c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18984486
Change-Id: I798cd5cea1e4efb86f72ef6a23195212c5a685c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-20 08:20:02 +00:00
Bill Yi
b48231e5a2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e00a15d95f
-s ours am: 4066539cc9
-s ours am: 85204b39fd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18984487
Change-Id: I77d565fae6e8ddac19bf836248dd878e9692f275
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-20 08:14:02 +00:00
Bill Yi
30583caa75
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 980d88cc0d
-s ours am: 3caf5ab605
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18983544
Change-Id: I9cecef72695311a23909ab4945d7e451352c699b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-20 08:08:06 +00:00
SongFerngWang
25818d1f60
Fix the NullPointException am: 5a4df243f0
am: 5221cb21bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18921546
Change-Id: Ibf96ed585fd8294bfdcdc9b7351d491515a629bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-20 08:05:30 +00:00
TreeHugger Robot
90884f3225
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-06-20 07:40:11 +00:00
Bill Yi
85204b39fd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e00a15d95f
-s ours am: 4066539cc9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18984487
Change-Id: Id627f73cebdb6c2192ed74ef77e68381b5342870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-20 07:35:58 +00:00
Bill Yi
3caf5ab605
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 980d88cc0d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18983544
Change-Id: Ie1defe5780a660c7ab64d607407a7b73de010fa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-20 07:31:35 +00:00
SongFerngWang
5221cb21bd
Fix the NullPointException am: 5a4df243f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18921546
Change-Id: Ifcb7bb32737ee460e8ddbcf7730426017fc018db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-20 07:28:03 +00:00