Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
107,131 Commits 1 Branch 0 Tags
899697ea0594356007125312c78e91126e0a2372
Commit Graph

43479 Commits

Author SHA1 Message Date
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
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
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
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ó
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ó
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
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
Treehugger Robot
bef728d2ff Merge "Keep setting of "TurnOff hotspot automatically" when AP is changed" am: 79e1afbdfa 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2123300

Change-Id: Icf6b8698aa4f01e89076fc0566f5d71ef35c1742
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 17:35:36 +00:00
Weng Su
cf7d2ef87c Merge "Restrict WifiSlice functionality for guest user" into tm-qpr-dev am: 1c25ce1937 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802566

Change-Id: Iaa2b5a26a3ee2b8490e116c5148a371651d32ee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 16:54:00 +00:00
Weng Su
1c25ce1937 Merge "Restrict WifiSlice functionality for guest user" into tm-qpr-dev 2022-06-15 16:40:03 +00:00
TreeHugger Robot
6da32e8c5c Merge "Restrict guest user to configure WiFi by QR code" into tm-qpr-dev am: cc0754b416 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869535

Change-Id: Ic0544cd42cf28b12f8ae470c67363b8683aec6b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 16:34:21 +00:00
Weng Su
f53f3e6e41 Restrict AddAppNetworksActivity for guest user 
- Don't show AddAppNetworksActivity if the user is a guest.

Bug: 224772678
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksActivityTest

Change-Id: I17571905f1c4a38db884e6d0523b7f8d668df607
 2022-06-16 00:33:07 +08:00
TreeHugger Robot
cc0754b416 Merge "Restrict guest user to configure WiFi by QR code" into tm-qpr-dev 2022-06-15 16:18:40 +00:00
Jason Parks
6d2ab0c69c Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91 am: 3b6fe0813b am: 3f55cd8929 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832

Change-Id: I73c85f36f4edde7719e9d12ead4c10e919629a8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 13:48:58 +00:00
Jason Parks
296fe0d0cd Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91 am: a48c508afa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832

Change-Id: I9bffe0d61056d7575015f5b20ff4b71da9714f09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 13:42:03 +00:00
Jason Parks
3f55cd8929 Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91 am: 3b6fe0813b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832

Change-Id: I0fafd91b14712a6bf9a118a2512973af1fb3d502
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 13:42:02 +00:00
Jason Parks
3b6fe0813b Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832

Change-Id: I14d08a02a7b27ae4bf3e54c03f9c9d33c6104a8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 13:14:53 +00:00
Jason Parks
a48c508afa Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832

Change-Id: I7d5be03e04e9c500bfdaef61dfef5699288dbd98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 13:13:24 +00:00
Bruno Kremp
b16ac39ee1 Keep setting of "TurnOff hotspot automatically" when AP is changed 
When AP config is changed, setting of "TurnOff hotspot automatically"
will be reset to default. Hence keep the setting when AP config changed.
Keep setting of whether auto shut down is enabled when AP
config changed.

Co-authored-by: Fangxiao Cao <fangxiao.x.cao@sony.com>

Test: manual test
Bug: 235370570
Change-Id: Ibd3d59b6a86edaf1253a2c9b035576e60a7beb96
 2022-06-15 09:20:18 +02:00
Amy Hsu
d68c5cd23b Merge "Restore the density when it has been overridden" into tm-d1-dev am: be6fef3095 am: 7e0b5c8c07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18791014

Change-Id: Id864846262cc794add2694833e6618d770409dcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:21:36 +00:00
Amy Hsu
16d022942f Merge "Restore the density when it has been overridden" into tm-d1-dev am: be6fef3095 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18791014

Change-Id: I399f7592e930545ba1d9e38a62d58aa58bda5b6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:11:34 +00:00
Amy Hsu
7e0b5c8c07 Merge "Restore the density when it has been overridden" into tm-d1-dev am: be6fef3095 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18791014

Change-Id: Ie88b0db9abc05339c9c77aa87350bcd3acf963e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:11:31 +00:00