PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
92,059 Commits 1 Branch 0 Tags
e300781fb886cbb4a61c63c91a61a84e75324b2f
Commit Graph

92059 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Betty Chang
e300781fb8 Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" am: e5a21d345d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107794

Change-Id: I9fedeeaf397e15e8c6a9421604a0cf6def4c743c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 14:47:51 +00:00
Betty Chang
e5a21d345d Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" 2022-05-27 14:30:02 +00:00
SongFerng Wang
1ab90f4640 Merge "Settings: Change array resource sim_color_light to an integer array" am: ed0f3c60ec 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2081598

Change-Id: I308ab424ad1acf881c0106de1007393e7bf0bff1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 05:32:46 +00:00
SongFerng Wang
ed0f3c60ec Merge "Settings: Change array resource sim_color_light to an integer array" 2022-05-27 05:12:32 +00:00
changbetty
012527b81c Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT 
Bug: 214338905
Test: Manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=QrCameraTest
Change-Id: I1ca3e9e0b2cdc9fd3f32da8c5329c0e887ee3427
Merged-In: I1ca3e9e0b2cdc9fd3f32da8c5329c0e887ee3427
 2022-05-27 04:05:44 +00:00
Xupei Li
05301c7d1a Settings: Change array resource sim_color_light to an integer array 
* It should be an integer array because its items are all color reference, and I found that the translations of this resource can lead to not show SIM color in languages other than English.

Change-Id: I6264abdfd0a49119e0170ae5c4bec437ad4c9e8f
 2022-05-26 07:17:58 +00:00
Victor Chang
d5ab7dc729 Merge "Reland "Don't use framework strings for formatting file sizes"" am: ba69fd0d3f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2096605

Change-Id: Ib0ad04ef4c225fbc449abed9913381d6c8d3a138
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 10:53:20 +00:00
Victor Chang
ba69fd0d3f Merge "Reland "Don't use framework strings for formatting file sizes"" 2022-05-24 10:04:46 +00:00
Treehugger Robot
2b7eb9eff6 Merge "Call CardDatabaseHelper.getInstance() when used and not in onCreate" am: 97b4621c68 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1928158

Change-Id: I5685d61f33acf4fbf4b5ff8356a487f77d314bab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 10:52:07 +00:00
Treehugger Robot
97b4621c68 Merge "Call CardDatabaseHelper.getInstance() when used and not in onCreate" 2022-05-23 10:21:02 +00:00
Håkan Kvist
6f1b6e3693 Call CardDatabaseHelper.getInstance() when used and not in onCreate 
Providers can be created before onCreate is called on the application.
Calling CardDatabaseHelper.getInstance() too early will cause
ContextualCardLoader to call getAppllicationContext before application
has been fully started.

Postpone calling CardDatabaseHelper.getInstance() until database is
accessed.

Test: Start device with sim card inserted and Pin enabled on sim.
  Wait some time before entering sim pin. After entering pin, open
  settings. Verify that settings does not crash.
  Verify that there is no contentProvider exceptions from settings in log.
Bug: 154076590
Change-Id: Id0b6294ca2aeebdc71076299928c4dea5145ba33
 2022-05-23 09:08:30 +02:00
SongFerng Wang
d28816fcc3 Merge "[LE unicast] Disable the "phone calls" when LE is enabled" am: 27b4578002 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2100870

Change-Id: I4b1e2ca82609c4c37f74839ff1e404c428cdec8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 00:18:52 +00:00
SongFerng Wang
27b4578002 Merge "[LE unicast] Disable the "phone calls" when LE is enabled" 2022-05-19 23:56:08 +00:00
SongFerngWang
5350643e7a [LE unicast] Disable the "phone calls" when LE is enabled 
The "phone calls" uses the Headset profile, not HFP profile. The ui
uses the wrong profile. It causes the "phone calls" is always enabled
when LE is enabled.

Bug: 231511825
Test: build pass
Change-Id: Ib507352107c0d825b8c7a9605713bc9083259fbd
 2022-05-19 15:14:01 +08:00
Roozbeh Pournader
ad389346c8 Reland "Don't use framework strings for formatting file sizes" 
Reland http://ag/2529020 because the over-translation issue should be
resolved now.

Modify various formatters to avoid using framework strings for
formatting file sizes.

Also update README instructions for running unit tests.

Bug: 36994779
Bug: 71580745
Bug: 217592956
Test: no new test failures from RunSettingsRoboTests
Test: manual opening the settings page.
Change-Id: Ic4689ab1b76622028004d05e69858228bdc441cf
 2022-05-17 16:06:55 +01:00
Treehugger Robot
a312e1f404 Merge "Settings: Optimize the selected WFD route preference summary" am: 1143a4e8dc 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2089683

Change-Id: I10970f3d2e7b8c916d2ef6231cb21d59fe6dcd44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 12:01:29 +00:00
Treehugger Robot
1143a4e8dc Merge "Settings: Optimize the selected WFD route preference summary" 2022-05-16 11:32:24 +00:00
Jack He
55da62f36e Merge "Only cancel bonding if pair button is not pressed" am: 33a080ad7a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2093951

Change-Id: I9d47c60b9588236b7923a33b3c1183b60896f0e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 22:56:57 +00:00
Treehugger Robot
4a0d0f29f3 Merge "Disable "SIM card lock" when the SIM card is PUK-blocked" am: ab8bdb2bdb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2076379

Change-Id: I5bb8460443557bdca8d23bae54353c4b1dee548d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 22:56:40 +00:00
Jack He
56b5fa0fb1 Merge "Cancel bonding upon back gesture." am: 3671fb8438 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2093046

Change-Id: I234953b29f4fb02af845243cce3131267acbf6a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 22:56:31 +00:00
Jack He
33a080ad7a Merge "Only cancel bonding if pair button is not pressed" 2022-05-10 21:47:29 +00:00
Qasim Javed
419b7fa289 Only cancel bonding if pair button is not pressed 
aosp/2093046 cancels bonding unconditionally in onDestroy(), this
results in the user not being able to pair when the pair button is
pressed because onDestroy() is also called in that case.

Only cancel bonding if the user did not press the pair button.

Bug: 231554812
Test: Changed settings app is able to scan after dismissing the dialog
and is also able to pair when the pair button is pressed

Change-Id: I868af9b795f1bb0766656e4619bd06dc8028008a
 2022-05-10 11:29:28 -07:00
Treehugger Robot
ab8bdb2bdb Merge "Disable "SIM card lock" when the SIM card is PUK-blocked" 2022-05-10 17:16:13 +00:00
Mattias Nilsson
36c71e9d47 Disable "SIM card lock" when the SIM card is PUK-blocked 
For an inserted PUK-blocked SIM card we should not allow
to open lock settings. Add a check for SIM_STATE_PERM_DISABLED
and disable "SIM card lock".

Test: Insert a PUK blocked card and check SIM card lock
Bug: 230370597
Change-Id: I8b468cefe95fb8bd66ab91d6c4569ddb01473fbe
 2022-05-10 10:46:56 +02:00
Jack He
3671fb8438 Merge "Cancel bonding upon back gesture." 2022-05-10 00:09:48 +00:00
Qasim Javed
0521856683 Cancel bonding upon back gesture. 
When pairing dialog is dismissed using the back gesture, we do not call
cancelBondProcess() for the remote device. Since bonding is not
cancelled and the dialog is dismissed, when the user tries to pair again
and scans for devices, nothing shows up. This is because in case of a
pending bond or pending SDP, the request to search for new devices is
queued.

The correct behavior is to cancel bonding if the pairing dialog is
dismissed using the back gesture. This is similar to what
happens when the pairing dialog is dismissed using the cancel button.

Bug: 231554812
Test: Changed settings app is able to scan after dismissing the dialog

Change-Id: Ia790e345be811be1b60762ff819544d03c5a18fd
 2022-05-09 13:11:13 -07:00
Treehugger Robot
34ca30adc7 Merge "[Settings] Avoid from crash UI when querying data usage" am: 2da70f6385 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2092023

Change-Id: I198290510e8adda1198663beb90e8501f785c6f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 16:22:13 +00:00
Treehugger Robot
2da70f6385 Merge "[Settings] Avoid from crash UI when querying data usage" 2022-05-09 15:46:46 +00:00
Bonian Chen
2c6d8d536e [Settings] Avoid from crash UI when querying data usage 
Screen update been requested while querying data usage and response not
yet available.
This change tried to avoid from updating the UI in this case.

Bug: 210664126
Test: local
Merged-In: Id055fbd441936a9842b4acc978a894a855165bb7
Change-Id: Ia57f831d78b12754d60f920a9dbe057400dc4ce2
 2022-05-09 16:28:14 +08:00
hoffc
0304a0e88b Settings: Optimize the selected WFD route preference summary 
RouteInfo has several status values, such as unavailable status. But according to current logic, unavailable status will be displayed as connnected. it is not reasonable.

Update and optimize the route preference summary with the real WFD status value.

Change-Id: Iacd10e0133d06ef0b86da38cf763fe7def6ed7de
Buganizer: 231656030
 2022-05-09 09:22:57 +08:00
Xin Li
2a6d8885bc [automerger skipped] Merge "Merge SP2A.220505.002" am: 8adb561455 -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: I1328a5b1eec08a2d30940f610911af8978153c5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 20:57:11 +00:00
Xin Li
90645fb925 [automerger skipped] Merge SP2A.220505.002 am: c3a9ea7443 -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: Ib4481f34e89f88b1a74baebdc5499460fe10b2e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 20:56:53 +00:00
Xin Li
8adb561455 Merge "Merge SP2A.220505.002" 2022-05-04 20:30:21 +00:00
Xin Li
c3a9ea7443 Merge SP2A.220505.002 
Bug: 231319788
Merged-In: I1def7b37184d6d81f29a5e6e4793b92012dacd9b
Change-Id: I225d05e638e099971b596b8ceeb8bf7bcd8778bd
 2022-05-03 20:53:03 +00:00
Neil Fuller
3bb5fc5da8 Merge "Capitalize TZ display name strings" am: 6a44151bc1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2055886

Change-Id: Iaead2dab59a3641905f62c472aee78546eb312bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:27:41 +00:00
Neil Fuller
6a44151bc1 Merge "Capitalize TZ display name strings" 2022-05-03 19:22:03 +00:00
Victor Chang
16aca1db9f Merge "Titlecasing time zone summary" am: 1d6e9cfdf2 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2077567

Change-Id: If1ab5d3f0934a3803ae81b45aedbcfa41bcc8590
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 13:32:43 +00:00
Victor Chang
1d6e9cfdf2 Merge "Titlecasing time zone summary" 2022-05-03 11:10:20 +00:00
Victor Chang
20e9b76818 Titlecasing time zone summary 
Additional fix:
1. Fixed the SpannableUtil.getResourcesText to actually
preserve Spannable (TtsSpan in this use case)  during formatting.

Bug: 185453652
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.datetime.timezone
Change-Id: Iae5e1d4261ec0a34222ae1d042c7f3f027f2e512
 2022-04-29 17:06:46 +01:00
Treehugger Robot
08f97c9bc0 Merge "Update OWNERS file for enterprise modules in Settings" am: 0edc7fb3cb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064127

Change-Id: Iec813ee718cda4e6d0bd5a32ec6a2af9a136cfaa
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-23 19:38:41 +00:00
Treehugger Robot
0edc7fb3cb Merge "Update OWNERS file for enterprise modules in Settings" 2022-04-23 18:55:44 +00:00
Xin Li
99d834b0b8 Merge sc-v2-dev-plus-aosp-without-vendor@8433047 
Bug: 226662282
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
Change-Id: I71459583120f712298f47b4dbd2c791d8ef4e022
 2022-04-18 21:01:08 +00:00
SongFerng Wang
3b66c18d75 Merge "[LE unicast] Change the default value for LeContactSharingEnabled" am: 48967e6466 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064750

Change-Id: Ie05c32e8c7d358d4cfad14cee4dc5f8849384d75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-15 08:06:58 +00:00
SongFerng Wang
48967e6466 Merge "[LE unicast] Change the default value for LeContactSharingEnabled" 2022-04-15 07:23:39 +00:00
SongFerngWang
b50430e09d [LE unicast] Change the default value for LeContactSharingEnabled 
Bug: 229322144
Test: build pass.
Change-Id: I7673397b9f04df8acb551bdad42dea1f3ece72ff
 2022-04-15 15:19:17 +08:00
SongFerng Wang
459429c182 Merge changes I6871db6c,Ia261e3b4,I1588bd4a,I1b81faf0,I9a596440, ... am: 3e9e489c0c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064409

Change-Id: I0737e21c4a5939de394c418cb9261a52a3f5df86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 08:24:21 +00:00
SongFerngWang
6282d8a5de In E+E, the user can't enable the PSIM am: ccd55cc5c9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064408

Change-Id: If0aeb9e68364fc649d0b3877ba4f8bdc0dd9afec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 08:24:20 +00:00
SongFerngWang
83311b6208 [MEP] psim's logical slot index is 0 am: 2479c9f7bd 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064407

Change-Id: Id29b82927a35b45ca339abbf3896d7a2e788b426
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 08:24:19 +00:00
SongFerngWang
6a0742b2fb [MEP] The condition of "null point check" is wrong am: 5c0df6913b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063566

Change-Id: I4066d3971802aa77ccdf3e11a67dbbf4a66cc9de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 08:24:17 +00:00
SongFerngWang
a800c05ac7 Fix the settings crash when SimDialogActivity is null am: d786b64ff6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063565

Change-Id: I393f4a56a15b1288a0fa5f0bfd1b9e43101f555f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 08:24:16 +00:00