PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,979 Commits 1 Branch 0 Tags
6040d46cb034d5dfaed5d49fb6edbcfac15a4b86
Commit Graph

85979 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
6c553c0c5c Merge "Hide emergency APN in user settings" 2021-11-25 09:58:12 +00:00
Android Build Coastguard Worker
04f4cc429a Merge cherrypicks of [16061618, 16099517, 16093937, 16144999] into sc-qpr1-release. 
Change-Id: Ief49976e9d02a64fcc9987a2fa9c8cc9fe0d739c
 2021-11-24 23:26:14 +00:00
Hugh Chen
3f280c15b1 RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission 
- Only enable device can be discoverable when the user launch
  "Connected Devices settings" through settings and systemui

Bug: 194695497
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.

Change-Id: Ia04ab759b737acf30b782f5c5831dd59f25fb257
(cherry picked from commit d3abbb9821)
(cherry picked from commit b1adf980a5)
Merged-In:Ia04ab759b737acf30b782f5c5831dd59f25fb257
 2021-11-24 23:23:54 +00:00
changbetty
76fc500d9b Add location check for Wifi Scanning notify message 
Bug: 203471614
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: I0fccd1a8dfd8e6ca499a6f87a59772f70961bc1d
(cherry picked from commit aab7b55926)
Merged-In:I0fccd1a8dfd8e6ca499a6f87a59772f70961bc1d
 2021-11-24 23:23:45 +00:00
Bill Yi
7f0320483c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idf72f0b25491f38f592613b85cd7e20c5935681a
(cherry picked from commit 52146b1b0a)
Merged-In:Idf72f0b25491f38f592613b85cd7e20c5935681a
 2021-11-24 23:23:38 +00:00
Bill Yi
eaf56ad8fe Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0dd09e87e7a2116b4ad5bbc03462b30e786cdd07
(cherry picked from commit 8a603688a7)
Merged-In:I0dd09e87e7a2116b4ad5bbc03462b30e786cdd07
 2021-11-24 23:23:32 +00:00
Mattias Nilsson
6a56b4a8e6 Hide emergency APN in user settings 
Emergency APN types is not something for the end user
and should not be possible to edit.

Test: Add an emergency APN and check in Settings
Bug: 207626003
Change-Id: I866eb98dce410218bc76ade3201a2a2abfc959e7
 2021-11-24 16:43:42 +01:00
Joe Bolinger
78e700fd31 Update biometrics OWNERS. 
Test: N/A
Change-Id: Ia9e71da5fd13b46c3a897b8aabaca0865b3fb87c
 2021-11-23 15:36:53 -08:00
Jack Yu
79675e89f2 Merge "NFC support in work profile" am: c2647199ce 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1856215

Change-Id: Iac30f77fd5d732bb3b50fc531600fed02d477919
 2021-11-22 11:00:16 +00:00
Jack Yu
c2647199ce Merge "NFC support in work profile" 2021-11-22 10:45:44 +00:00
Jack Yu
2a2e0275cc NFC support in work profile 
Configure NFC payment settings based on userId.

Bug: 202367033
Test: mauanl tests
Change-Id: I97e275f374d34618b64188d5de185ec6c527e0fd
 2021-11-15 19:03:34 +08:00
Xin Li
bf45599d43 Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 
Bug: 205056467
Merged-In: I9ac05f5da437030e1b5db082ddaf7959f82acccd
Change-Id: Iaf8ebc4877a8276672354b45db0dd502c0f71bd3
 2021-11-11 16:54:23 +00:00
Etienne Ruffieux
e004eaa51b Make BluetoothCodecConfig and BluetoothCodecStatus public 
Tag: #feature
Bug: 200202780
Test: make RunSettingsRoboTests
Change-Id: I2a81216de050b143cee5c537d899a699d5012330
 2021-11-10 10:12:51 +00:00
Treehugger Robot
f7836dd7bc Merge "Add entry point for adaptive brightness settings" am: d3d24b65ac 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1698500

Change-Id: I2db800ef165041f79b7465768bcc57ff00873c2d
 2021-11-09 07:35:39 +00:00
Treehugger Robot
d3d24b65ac Merge "Add entry point for adaptive brightness settings" 2021-11-09 07:13:50 +00:00
Jun Ono
89c2c5e9c0 Add entry point for adaptive brightness settings 
Test: adb shell am start -a android.settings.ADAPTIVE_BRIGHTNESS_SETTINGS
Bug: 187332145
Change-Id: Ifd81bfb3b0abc3ea10a062cb49fab20f6ef3fdfc
 2021-11-05 17:27:41 +00:00
Bill Yi
eda6485a4b [automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: 9d0eba50aa -s ours 
am skip reason: Merged-In I62be3678022753eaba32209c33f95edf220294f1 with SHA-1 a4197a7aa1 is already in history

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

Change-Id: I095493a9f49902c2bfe20a0f5464f86ae50ed536
 2021-11-03 18:08:25 +00:00
Bill Yi
9d0eba50aa Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" 2021-11-03 17:50:39 +00:00
Bill Yi
5e67298476 Merge SP1A.211105.004 to aosp-master - DO NOT MERGE 
Merged-In: I62be3678022753eaba32209c33f95edf220294f1
Merged-In: I1d17526b87d442bc3513a1e7f526fcf5ff11e881
Change-Id: I63bda2d4f97e2c35d317675624c69d45e6dfbcaa
 2021-11-02 21:07:55 -07:00
The Android Open Source Project
e5d3401aa1 Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE 
Merged-In: I1d17526b87d442bc3513a1e7f526fcf5ff11e881
Change-Id: Ib2e431d8d28a3b0da86ec65cad345d8adda041ec
 2021-11-02 14:11:57 -07:00
tim peng
a4197a7aa1 Merge "Phone fails to switch channel mode from stereo to mono" am: 41cfaa9f29 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1873736

Change-Id: I62be3678022753eaba32209c33f95edf220294f1
 2021-11-01 06:22:15 +00:00
tim peng
41cfaa9f29 Merge "Phone fails to switch channel mode from stereo to mono" 2021-11-01 06:02:26 +00:00
Tim Peng
07b3675717 Phone fails to switch channel mode from stereo to mono 
-Set codec to SBC when HD audio is off

Bug: 194349060
Test: make -j50 RunSettingsRoboTests

Change-Id: Iae4aa3f1d77350f5b4d91e7a687e048091c1daea
 2021-10-29 03:28:14 +00:00
Weng Su
400e5b0fba Merge "Keep compatibility for old WiFi shortcut" am: ab7640dcd9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853101

Change-Id: I44f373cab6a829af3e08ab95d62d53a42516d41a
 2021-10-21 12:56:02 +00:00
Weng Su
ab7640dcd9 Merge "Keep compatibility for old WiFi shortcut" 2021-10-21 12:38:12 +00:00
Android Build Coastguard Worker
f06e9dd5df Merge cherrypicks of [16066342, 16067131, 16067132, 16067098, 16067099, 16067100, 16067101, 16067102] into sc-qpr1-release 
Change-Id: I2ea689bdb16fa799424ea430883556d5bf31b27a
 2021-10-15 21:33:32 +00:00
SongFerngWang
b172582c14 The Network name is not same as statusbar at SIM Edit page 
Using subscriptionInfo to get the network name.

Bug: 203035698
Bug: 201591202
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=RenameMobileNetworkDialogFragmentTest (PASS)

Change-Id: I84848a2801172b46f7cc3ff39d88ad57e34514a4
(cherry picked from commit 050b6d5224)
 2021-10-15 21:33:27 +00:00
changbetty
435c3385f6 For Internet Picker - Information about Wi-Fi scanning when Wi-Fi is off 
Bug: 202323013
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: I4a26ec43bb7e1758b8170a7ff9fa7d5846cb4a35
(cherry picked from commit bfd3020038)
 2021-10-15 21:33:24 +00:00
Bonian Chen
d7ced5df54 [Settings] Crash when resetting downloaded eSIM 
Context need to be maintained when performing async operation in
background thread.

Bug: 202787946
Test: local
Change-Id: Ia5b81ae66e9482b10df5133b2f1444fc007a78e8
(cherry picked from commit 8aa98d63fd)
(cherry picked from commit 21f7095b3a)
 2021-10-15 21:33:22 +00:00
Weng Su
ba67825a54 Add WIFI_SCANNING_SETTINGS action to Settings 
- Export the interface for System UI to launch Wi-Fi Scanning Settings.

Bug: 202323013
Test: manual test by adb to launch Wi-Fi scanning settings below
adb shell am start -a android.settings.WIFI_SCANNING_SETTINGS

Change-Id: I893d3cea40d1f3ed4a962009416f54c99a91e11f
(cherry picked from commit 9e6966d1c2)
 2021-10-15 21:33:19 +00:00
changbetty
565d44c4f8 Add String for information about Wi-Fi scanning when Wi-Fi is off. 
Bug: 202323013
Test: make
Change-Id: I22618a57bfecd02508f2d4a53ff6c65071de2fd1
(cherry picked from commit b7509a3079)
 2021-10-15 21:33:14 +00:00
Roopa Sattiraju
f2295126b6 Merge "Phone fails to switch channel mode from stereo to mono" into stage-aosp-master 2021-10-14 18:17:20 +00:00
Steven Moreland
90181319da Merge "getBlobAshmemSize -> getOpenAshmemSize" am: 5d30c2de37 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1856673

Change-Id: I1ecba7ee53fead58d83d159f2849e3798e7198fd
 2021-10-14 17:48:04 +00:00
Steven Moreland
5d30c2de37 Merge "getBlobAshmemSize -> getOpenAshmemSize" 2021-10-14 17:43:16 +00:00
Steven Moreland
519546ce3e getBlobAshmemSize -> getOpenAshmemSize 
This API returns the total size of all ashmem memory that is in FDs that
is owned by a Parcel object. It was renamed a while ago, but the name
was never updated in Java.

Bug: 202029388
Test: N/A
Change-Id: Icc428063083110952cf3951721d69cbb919429b1
 2021-10-13 11:01:10 -07:00
Bonian Chen
dcd13abd65 Merge "Revert "[Settings] Code refactor DataSaverSummary"" am: b0a2857ec5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853597

Change-Id: Ibdca526adba3a2fb79cec39101832d53d87b46b7
 2021-10-12 06:50:56 +00:00
Bonian Chen
b0a2857ec5 Merge "Revert "[Settings] Code refactor DataSaverSummary"" 2021-10-12 06:36:35 +00:00
Bonian Chen
16b298ef92 Revert "[Settings] Code refactor DataSaverSummary" 
This reverts commit 0ea486d1e5.

Reason for revert: build breakage

Change-Id: Id4c7689ae6f82ab05987365551a06debc1676aa5
 2021-10-12 06:14:17 +00:00
Treehugger Robot
ef03b3a361 Merge "[Settings] Code refactor DataSaverSummary" am: e7b211b35e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853594

Change-Id: I8e4f9e3429948ba709dfa40eb56f7c428813590c
 2021-10-12 06:09:37 +00:00
Treehugger Robot
e7b211b35e Merge "[Settings] Code refactor DataSaverSummary" 2021-10-12 05:56:21 +00:00
Bonian Chen
0ea486d1e5 [Settings] Code refactor DataSaverSummary 
Remove unused Callbacks.

Bug: 202792574
Test: local and presubmit
Change-Id: I185c083fd1621b0256e55339e9688d6b190dee32
 2021-10-12 11:53:32 +08:00
David Magno
6031a6ef69 Keep compatibility for old WiFi shortcut 
WifiSettings2Activity has been replaced by WifiSettingsActivity

Test: Create a shortcut to WifiSettings in Android 11, update to Android 12 and test it
Bug: 202534606
Change-Id: I042eb3ae0bc0af6c42221c876cc4ea7b0a6de0b7
 2021-10-11 18:26:09 +02:00
Android Build Coastguard Worker
5a5a905da3 Snap for 7810908 from c57387dee7 to sc-qpr1-release 
Change-Id: I8488404e3e0c2a330be9956566a2d9288e749f65
 2021-10-10 23:08:15 +00:00
TreeHugger Robot
d3f9214763 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: c57387dee7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9ac05f5da437030e1b5db082ddaf7959f82acccd
 2021-10-10 05:56:12 +00:00
Bill Yi
cde6bf9031 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709 am: cac2809d5b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1a4ce422c864b46a3400ed3b8e53109a4bf0c957
 2021-10-10 05:55:05 +00:00
Bill Yi
f445e1018d [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709 am: fcdcf5a0a1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If3a3af0cabe768f1309479d54c0d99612940eb98
 2021-10-10 05:53:33 +00:00
TreeHugger Robot
c57387dee7 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-10-10 05:34:09 +00:00
Android Build Coastguard Worker
98d3c3a06a Snap for 7808903 from 9048523ba4 to sc-qpr1-release 
Change-Id: I63e5ae3f1bd8e698a25690f7fbb89de24fb26922
 2021-10-09 03:08:36 +00:00
Bill Yi
9b8ef1b7ae Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If65120e7b71d5ea69ec91f72077de3c4b45b287b
 2021-10-08 20:07:13 +00:00
Bill Yi
cac2809d5b [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709 
Blank merge reason: commit message contains skip directive

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

Change-Id: If7e901e27836f4e297645947d45bac9f08088eff
 2021-10-08 20:03:37 +00:00