PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,740 Commits 1 Branch 0 Tags
f3b9bf55a9a43163ab660b4fe7bdaea8d36902cc
Commit Graph

104740 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
b070ddda17 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2d6dbb4522ef217b94075bb4999a5276f983095f
 2022-06-22 19:05:21 -07: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
Jason Chiu
d3286b1981 Add FLAG_ACTIVITY_SINGLE_TOP to shortcuts intent 
This is to simplify the shortcut launch flow on large screen devices
when launching the same shortcut, which also improves the performance.

FLAG_ACTIVITY_CLEAR_TOP flag is used for the launch a shortcut. When
launching a shortcut whose activity is in the background on a large
screen device, the background activity is cleared by the system and a
new activity is started. Thus, the activity goes though the complete
deep link flow that invokes the trampoline homepage activity to start
the target page.

After the change, the system will bring the background activity to the
foreground rather than kill it and start a new one.

Test: create a shortcut and observe the adb log
Fix: 234681140
Change-Id: Id922af1f59a6a64ea6f6150cf6fea92808a6de65
 2022-06-22 10:17:35 +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
SongFerngWang
6426382e90 The UI only shows the active LE device 
At the media device, it only shows the active LE device which is
connected.

Bug: 232892046
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableMediaBluetoothDeviceUpdaterTest
make RunSettingsRoboTests ROBOTEST_FILTER=ConnectedBluetoothDeviceUpdaterTest
make RunSettingsRoboTests ROBOTEST_FILTER=SavedBluetoothDeviceUpdaterTest

Change-Id: Iac661206def4d43bc40ab9bb1938f084926899c2
 2022-06-20 21:30:34 +08: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
Bill Yi
4066539cc9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e00a15d95f -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: I10ea6e14ee85058126a4fedee4265fd4b651e4fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 07:24:43 +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
Bill Yi
e00a15d95f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0be2cdb059a4b42e7a9f73d91ca859c9832a3bb3
 2022-06-18 19:47:16 -07:00
Bill Yi
2652464d7c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I16bb20a52a58676aece02d01575bc32d710f5cd6
 2022-06-18 19:29:15 -07:00
Bill Yi
cc8d8e568a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id834260c1bbd63b31793705e5fb0b22838d9d729
 2022-06-18 19:24:50 -07:00
Bill Yi
980d88cc0d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8e73269e1f3bd05c9ffbeb56659b9d1bac5aad55
 2022-06-18 19:20:22 -07:00
Bill Yi
49b4ab94b7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8f85c7cccfc1b44e604611c4499245812136ea1d
 2022-06-18 18:57:39 -07: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
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
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