PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
111,996 Commits 1 Branch 0 Tags
b54eb125cebd5cb02d8a6762bc99dfcb317e13bc
Commit Graph

111996 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Xin Li
a258d7760f Merge "Merge Android 12 QPR 3" 2022-06-16 18:51:54 +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
TreeHugger Robot
652e9ef651 Merge "Add "AOD" into searching keywords" 2022-06-16 09:43:03 +00:00
Sunny Shao
4150c5fcda Add "AOD" into searching keywords 
Fixes: 211782678
Test: manual test
Change-Id: I3125b9d82e48a6d4aee8c8682a4ebc0fa69f7707
 2022-06-16 15:28:05 +08:00
Joshua McCloskey
106dc47dde Added face unicorn strings am: 66211d15bf am: 27c5a5b804 am: ae6c552db6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18916254

Change-Id: I9f2e1de35d8669e6ba6305e176c311ef40959540
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 03:44:40 +00:00
Joshua McCloskey
10ccb0b984 Added face unicorn strings am: 66211d15bf am: 909913ffc1 am: 4be235f6a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18916254

Change-Id: Icc08826d46790ba67c0db63f3afa5e4ca1232467
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 03:43:37 +00:00
Joshua McCloskey
ae6c552db6 Added face unicorn strings am: 66211d15bf am: 27c5a5b804 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18916254

Change-Id: I3fab30ae528e985c9c7656baff0b2a5a98c10a2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 03:18:19 +00: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
f2cbfafb57 Merge "Keep setting of "TurnOff hotspot automatically" when AP is changed" am: 79e1afbdfa am: bef728d2ff am: 3682ed9fca am: 5b27a4e24c am: 6d36425f67 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2123300

Change-Id: I9369175ae744f146b41454e9835007664eb5296c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 19:24:44 +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
Automerger Merge Worker
f0ad740c18 Merge changes from topic "am-414a94947bed43e6a84cfcb1fa2914a3" into tm-qpr-dev-plus-aosp am: 785cbaf832 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18905652

Change-Id: Ie8acecdbed8d9b31149c683aed60c5a2cd7e854f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 17:13:23 +00:00
TreeHugger Robot
f31d81e491 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: dc3e340774 -s ours am: 4a83e4212f -s ours am: 53ed759eef -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18905652

Change-Id: Ibc790eea9659dc29ea2d142de75445a3b1c5d7fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 17:12:56 +00:00
Treehugger Robot
79e1afbdfa Merge "Keep setting of "TurnOff hotspot automatically" when AP is changed" 2022-06-15 17:12:06 +00:00
TreeHugger Robot
ea9acb7fe8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: dc3e340774 -s ours am: 844417c14a -s ours am: 37d218599e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18905652

Change-Id: I7cfdf9742c07e34236681af2aa7cbb334d68a7af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 17:05:49 +00:00
Bill Yi
b6344a3d07 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2609fb2ccb -s ours am: c4e65cf197 -s ours am: 9ea4c77941 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18905652

Change-Id: I1ebfe333e4bec8f92adae104dd33dd705be33915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 17:05:35 +00:00
Automerger Merge Worker
785cbaf832 Merge changes from topic "am-414a94947bed43e6a84cfcb1fa2914a3" into tm-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: dc3e340774 -s ours am: 4a83e4212f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2609fb2ccb -s ours am: b989753b8f -s ours
 2022-06-15 16:57:44 +00:00
TreeHugger Robot
53ed759eef [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: dc3e340774 -s ours am: 4a83e4212f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18905652

Change-Id: Ie24810b1dc201cf014ec862b6bbca9de1396733c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 16:56:26 +00:00
Bill Yi
8e92c73b8b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2609fb2ccb -s ours am: b989753b8f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18905652

Change-Id: I385ab70eb6fb2eb546fae94d7e3352e18980e6fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 16:56:17 +00:00
TreeHugger Robot
37d218599e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: dc3e340774 -s ours am: 844417c14a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18905652

Change-Id: I1cb47c57b7c38ab70396fa94e02063e24698f570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 16:55:17 +00:00
Bill Yi
9ea4c77941 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2609fb2ccb -s ours am: c4e65cf197 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18905652

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

Change-Id: Idc60ceaab8bb124064b9c4dbb46c650a53d47990
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 16:54:32 +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
TreeHugger Robot
28fc41c411 Merge "Restrict guest user to configure WiFi by QR code" into tm-qpr-dev am: cc0754b416 am: 6da32e8c5c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869535

Change-Id: I48c23041bbe828678b6f179312ace6d920bb03f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 16:53:33 +00:00
TreeHugger Robot
4a83e4212f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: dc3e340774 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18905652

Change-Id: I6d43c235439a1cfad2344b89a109cd268849e896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 16:47:38 +00:00
TreeHugger Robot
844417c14a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: dc3e340774 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18905652

Change-Id: Ibf72c73b773c475a21d43029ccf0c4c0774aff8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 16:47:35 +00:00
Bill Yi
b989753b8f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2609fb2ccb -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18905652

Change-Id: I12eeeef97b1931268f958e972f5be4ae98aa1286
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 16:47:17 +00:00
Bill Yi
c4e65cf197 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2609fb2ccb -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18905652

Change-Id: I56973c016a00acb084a6bfbc02ea89bdbc58ae3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 16:47:12 +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
dc3e340774 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-15 16:39:17 +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
5ad4f1e639 Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91 am: 3b6fe0813b am: 9afd03c09e am: d0f7e24eb3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832

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

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

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

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

Change-Id: Iac6683e78266adbfee3537c0c93f4164df21dc98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 13:59:19 +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
9afd03c09e 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: I41aea305788fc9063b50676b5594bfdd8f8873ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 13:42:13 +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
88c084c018 Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91 am: 5c4943cc93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832

Change-Id: I64cbc363b3ddb6cb7272b7f21c3567fcbc4e7b73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 13:41:24 +00:00