Bill Lin
c51deb5ccd
Merge "Well control enrolling icon animation by UX design" into tm-qpr-dev am: 84154328df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19034499
Change-Id: I3863cd9fd771e6392ece1a0a8ea7a758067c7ae3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:53:46 +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
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
0805e9efbf
Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 am: b88828b155 am: 4e2c3689e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528
Change-Id: I321210e16c994d86824d952d04e7bb9a98e462d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 05:00:56 +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
4e2c3689e3
Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 am: b88828b155
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528
Change-Id: Ib3003b99cc802e9ade9e0602de83fbc685ece742
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 04:43:51 +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
b88828b155
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: I5bd96bac8e7313ec76a461a0d4e453da90ba9072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 04:25:38 +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
416595f2dc
Merge "Fix title used for financed device info in Settings" into tm-dev am: bb149294dd am: 7e3c6913d3 am: fd1d882d8d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18934542
Change-Id: Ic2101cf866cd697b2dfc3fbb15d9d8ffaf7b4c06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 23:22:54 +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
26bdfebe0b
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: I744f612059441079a6e5604de624536e3361e087
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 23:07:58 +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
071719856d
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: I48ec660d0ac6aecd3a28368a3b2035dbfb6fe297
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 22:47:52 +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
c1bd6bc6e3
Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31 am: e941740b35 am: 67556fac04
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040
Change-Id: I3aa2ebcdd16ff73296fbda1ce44441ba43bb4f39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 19:59:10 +00:00
Bonian Chen
a40112328c
Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31 am: e9cdc176a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040
Change-Id: I80200d5694abf84b7f540db8142b5f0f525cde49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 19:43:40 +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
e9cdc176a6
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: I8391c6e89654e3595a496de6da4485f27834bfda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 19:24:20 +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ó
7e7df0d9b5
Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0 am: 0dfc94f668 am: 95d32d678c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799
Change-Id: Idae7664b658f8057b30b9bcc50379d0cb11845fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 18:38:06 +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ó
50911db0c3
Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0 am: 10e5657a39
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799
Change-Id: Ia608719d3aa47159c80dd303bcc11360c000ee0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 18:02:01 +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ó
10e5657a39
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: I7fcfd55573d121122867893a5624c297a1f18653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 17:43:23 +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
c141388b7a
Merge "Restrict ProviderModelSlice for guest user" into tm-qpr-dev am: ea9b715e78
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18911434
Change-Id: I21514aba3524eeff34fccf3e31953f184f36fbda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 17:06:53 +00:00
TreeHugger Robot
3997ccc2ee
Merge "Restrict AddAppNetworksActivity for guest user" into tm-qpr-dev am: 2d0e1dc725
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18910990
Change-Id: Iac11c8a9834528d81cb757a85a5bcaed7c8b8035
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 17:06:42 +00: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
Zaiyue Xue
6470ada117
Merge "Move battery usage files to a separate folder." into tm-qpr-dev am: 3b7953eac2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18797446
Change-Id: I3e0ae9d1922b8d6f55721ec3357d529a58a56dc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-20 09:32:47 +00: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
SongFerngWang
e5e39d8d07
Fix the NullPointException am: 5a4df243f0 am: fd583a0459 am: 4f17ad5140
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18921546
Change-Id: Id7bcf5ea19e7cff695d42eaff1d9d1ff16fe67a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-20 08:15:31 +00:00
SongFerngWang
4f17ad5140
Fix the NullPointException am: 5a4df243f0 am: fd583a0459
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18921546
Change-Id: Id3236ff87e3a57cba5ee4afdfbb329e2c83fd19c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-20 08:06:25 +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
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
SongFerngWang
fd583a0459
Fix the NullPointException am: 5a4df243f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18921546
Change-Id: Icb8aae31d833d27bb64040af296f096471838785
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-20 07:27:56 +00:00
Oriol Prieto Gasco
f528e7de49
Use com.android.bluetooth as the BT stack APK
...
Test: TH
Bug: 236187653, 236192423
Change-Id: Ia86d195780a4994607b5533420cb72bd458d4f9a
2022-06-19 23:06:06 +00:00
xuezaiyue
ac7318419a
Move battery usage files to a separate folder.
...
Bug: 202118250
Test: presubmit
Change-Id: I21aa58ebc02327849ed2161dbbafcdc806c007f2
2022-06-19 05:59:35 +00:00
Salud Lemus
a1df448703
Fix title used for financed device info in Settings
...
The title for the financed device info page in Settings changes to
"Managed device info" instead of "Financed device info"
Bug: 236259020
Test: Manual test
Change-Id: Ica6d990e8dada28b643a5523ec284c18d4af89d2
2022-06-16 19:32:14 +00:00
Weng Su
88037e4f5e
Restrict ProviderModelSlice for guest user
...
- Don't show ProviderModelSlice if the user is a guest.
- Don't run background worker if the user is a guest.
Bug: 227470877
Test: manual test
atest -c ProviderModelSliceTest
Change-Id: Id9fd50add271513c396adfbc083a9d8ea5f7771f
2022-06-17 02:21:19 +08:00
Joshua McCloskey
4be235f6a8
Added face unicorn strings am: 66211d15bf am: 909913ffc1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18916254
Change-Id: I30ce8688e2a51a3748559dbf5c29a8c0779a52ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 03:17:24 +00:00
Joshua McCloskey
27c5a5b804
Added face unicorn strings am: 66211d15bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18916254
Change-Id: I8a25346d1d9416a6c6099d1811ad04914793c231
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 03:01:38 +00:00
Joshua McCloskey
909913ffc1
Added face unicorn strings am: 66211d15bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18916254
Change-Id: Ia1006b9a2e9dc4f2264cf0be47b7e087216c30aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 03:01:36 +00:00
SongFerngWang
5a4df243f0
Fix the NullPointException
...
The subscriptionInfo.getCarrierName may be a null, so adding the null
checking.
Bug: 236064286
Test: build pass
Change-Id: I8f6f5ac725d6dd552ac2626725e44f52dcbf6c32
2022-06-16 10:46:07 +08:00
Joshua McCloskey
66211d15bf
Added face unicorn strings
...
Test: Manual.
Fixes: 234663447
Change-Id: I57f0b52f645655647db38c58da2c158e63221c18
2022-06-15 21:07:16 +00:00
Treehugger Robot
6d36425f67
Merge "Keep setting of "TurnOff hotspot automatically" when AP is changed" am: 79e1afbdfa am: bef728d2ff am: 3682ed9fca am: 5b27a4e24c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2123300
Change-Id: I824b13f157033e6ede667010936cb607205fe7eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 18:47:19 +00:00
Treehugger Robot
5b27a4e24c
Merge "Keep setting of "TurnOff hotspot automatically" when AP is changed" am: 79e1afbdfa am: bef728d2ff am: 3682ed9fca
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2123300
Change-Id: I5a857be001a9ef641299b3f849c141b45d5b6664
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 18:20:58 +00:00
Treehugger Robot
3682ed9fca
Merge "Keep setting of "TurnOff hotspot automatically" when AP is changed" am: 79e1afbdfa am: bef728d2ff
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2123300
Change-Id: Iff5656052d729efb83a1947ecfd2393e87c9460a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 17:54:52 +00:00