PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
72,470 Commits 1 Branch 0 Tags
b46adff0f4721a7fd801dd19e52a0c703186dd2a
Commit Graph

72470 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Neil Fuller
b46adff0f4 Swap ownership to mingaleev@ 
BUG=189810551

Change-Id: I6304545540947d6695117753309c80b27cf2669a
 2021-09-10 12:20:39 +00:00
Bonian Chen
4c3f454c92 Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed" 2021-09-10 09:46:32 +00:00
Ting Yu
638f12a6c8 Fix Text of VoLTE setting cannot be updated when SIM state is changed 
Text of setting menu for VoLTE should be changed from "VoLTE" to
"4G Calling" if "show_4g_for_lte_data_icon_bool" is true. However, it
is not changed in the following steps.
1. Turn Use SIM off on Mobile Network Setting and close Mobile Network
   Setting screen.
2. Open Mobile Network Setting screen again and turn Use SIM on.

Root cause is that the carrier config value is loaded only when SIM's
subid is changed. So, remove checking subId so that the carrier config
value is updated.

Additional fix:
Removed checking #isModeMatched in # onStart because "4G calling"
Setting was grayed out. It needs to listen to call state change
regardless of display status of the preference because Preference may
be switched even after the screen is displayed.

Test: manual
Test: make RunSettingsRoboTests \
      ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
Bug: 196030198
Change-Id: Ibf4d17aa493f69a3f00e35ae0e9d1419bd9e0d77
Merged-In: Ibf4d17aa493f69a3f00e35ae0e9d1419bd9e0d77
 2021-09-10 01:17:26 +00:00
Bill Yi
f4e2f69f3a Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE" 2021-09-09 21:27:25 +00:00
Treehugger Robot
604c7a7cfa Merge "Remove the option of resetting Euicc data." 2021-09-09 10:09:30 +00:00
Bill Yi
77c6ea6e80 Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE 
Merged-In: I1f20e829bf513d8166458e1749bcc8c9fade07b2
Merged-In: I1a723b5c0ca89f4c8d2e6b5fc3d76518099d7117
Merged-In: I1a723b5c0ca89f4c8d2e6b5fc3d76518099d7117
Change-Id: Icad4036f299d2b082cc617b82f9f900a0f23aa96
 2021-09-08 17:57:10 -07:00
pingzhi wang
860216208f Remove the option of resetting Euicc data. 
Euicc reset option should not be available on devices that do not
support embedded sim cards.

Test: make SettingsUnitTests
Test: Build device without FEATURE_TELEPHONY_EUICC and check in Settings/System/Reset options
Bug: 197280361
Change-Id: I24cc65fbe0f8e3c4f1cf792a7b8c5dbfc49d469b
 2021-09-08 17:34:30 +02:00
Treehugger Robot
6eb702ed63 Merge "Support multi-users for NFC payments" 2021-09-02 08:56:28 +00:00
Jack Yu
d2ca4038ce Support multi-users for NFC payments 
Configure nfc payment settings based on different users.

Bug: 191851086
Bug: 191845397
Bug: 192994529
Test: nfc payment with 2nd user
      make RunSettingsRoboTests
      ROBOTEST_FILTER=DefaultPaymentSettingsPreferenceControllerTest
Change-Id: I52440e77b6b5837b978b381e1c1694d2b29f048e
 2021-08-23 16:18:08 +00:00
Treehugger Robot
9689490c22 Merge "Add biometric OWNERS to unit tests." 2021-08-17 08:43:12 +00:00
Treehugger Robot
0544dc7b92 Merge "Update OWNERS." 2021-08-17 03:57:07 +00:00
Joe Bolinger
6e1ecbd617 Update OWNERS. 
Test: N/A
Change-Id: I6646a2b7dda95f458b95c0fed331b1cb213fcae8
 2021-08-16 17:12:53 -07:00
Joe Bolinger
2296f618cc Add biometric OWNERS to unit tests. 
Fix: 196452210
Test: N/A
Change-Id: I6f76bef97dd61130dd546749591338864665352b
 2021-08-12 16:17:03 -07:00
Treehugger Robot
6cbb4dfbe1 Merge "Add owner to the connected device folder" 2021-08-12 04:23:29 +00:00
Hugh Chen
ddf63eac87 Add owner to the connected device folder 
Bug: 196287361
Test: local test
Change-Id: Ib800955f04bbd6c23b9a1700faa918f8b1126d79
 2021-08-12 11:16:18 +08:00
Treehugger Robot
fdea2eaffa Merge "IAdbManager.getPairDevices returns FingerprintAndPairDevice[]." 2021-08-10 02:54:06 +00:00
Treehugger Robot
a529d8c717 Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1." 2021-08-04 01:05:56 +00:00
Yifan Hong
f7ff663887 Merge "PairDevice to structured Parcelable." 2021-08-03 23:32:27 +00:00
Xin Li
27ade80e6b DO NOT MERGE - Merge RQ3A.210805.001.A1. 
Bug: 192585466
Merged-In: Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e
Change-Id: I2bf4a9589a121a8bc2d2c4680a1fa081784a2e8a
 2021-08-03 16:07:50 -07:00
Yifan Hong
1b586ec8dc IAdbManager.getPairDevices returns FingerprintAndPairDevice[]. 
Map is not supported in C++ backend. To compile IAdbManager in C++,
Map is translated into a list of key, value tuples.

Test: pass
Bug: 190867939
Change-Id: I1a057306161a4f8eaef33e3c40b1db9494aea3e5
 2021-08-03 14:05:32 -07:00
Yifan Hong
d61750990d PairDevice to structured Parcelable. 
Bug: 194829333
Test: pass
Change-Id: I202ae5aa16d4323afa2a48cc3070f8e13c701efd
 2021-08-03 14:05:31 -07:00
Treehugger Robot
060bf953e3 Merge "Fix memory leak in TopLevelBatteryPreferenceController" 2021-07-30 02:18:11 +00:00
Anita Hemrajani
6187ec83a8 Fix memory leak in TopLevelBatteryPreferenceController 
Assigning context.getApplicationContext() as context in
ConditionContextualCardController.

Bug: 181192885
Test: run connectivity module auo test pass

Change-Id: Iff35520f911a9fd62a0bbb5bbda20608e9d99246
 2021-07-29 15:30:28 +08:00
Menghan Li
f36c2bc0a4 Merge "Update OWNERS for package settings > accessibility" 2021-07-14 09:41:41 +00:00
menghanli
b537d169b4 Update OWNERS for package settings > accessibility 
Bug: 193589847
Test: Manual
Change-Id: I57d27181d83cf47df9f4d0d359a2d76df3e3c91a
 2021-07-14 14:16:35 +08:00
Bill Yi
e36e5876d6 Merge "Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE" 2021-07-13 00:48:38 +00:00
Bill Yi
7976c5bc51 Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE 
Merged-In: Ie37d07ed9cbce12b9dcd39b332ed2ae66f3edf6c
Merged-In: I777bae14ea865ecf1607e1d660fe3102a9b8fa6d
Merged-In: I777bae14ea865ecf1607e1d660fe3102a9b8fa6d
Change-Id: I0f793ed1ea64127903c6dc906c5afa1db15fff48
 2021-07-12 11:08:29 -07:00
Treehugger Robot
8dd6ce02d8 Merge "Revise strings for the NFC developer option" 2021-07-12 10:38:43 +00:00
Jack Yu
cfb0bbc0d0 Revise strings for the NFC developer option 
Bug: 187083201
Test: build pass
Change-Id: Id90627235dbdb714d13a78b61826bafeb9f80360
 2021-07-12 16:39:22 +08:00
Treehugger Robot
9d7b0beb87 Merge "Add a developer option to increase nfc stack log level" 2021-07-06 08:05:47 +00:00
Treehugger Robot
88d39847b9 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-07-04 16:00:20 +00:00
Treehugger Robot
964006012c Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-07-04 15:58:19 +00:00
Bill Yi
ac0886d754 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id854c59331a03cf9a05828b1062e3c750c8603ba
 2021-07-03 18:45:56 -07:00
Bill Yi
18708c4f00 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iac0b5598da3ee6dedf95d2cb9f6e32109d9f19af
 2021-07-03 18:42:49 -07:00
Rahul Sabnis
bec574dca7 Merge "Ensure settings maintains its Bluetooth device inquiry state" 2021-07-02 22:01:50 +00:00
Tom Hsu
53f081be37 Merge "[Settings] Prevent crash from abnormal behavior for ApnSettings page." 2021-07-01 12:00:52 +00:00
tom hsu
58d100c3a0 [Settings] Prevent crash from abnormal behavior for ApnSettings page. 
- The problem is user remove SIM when stop in ApnSettings page, and do
 unexpected operation.

 - To figure out this problem, listen SIM absent event and make activity
 finish at this moment.

Bug: 189909956
Test: Manual test.
Merged-In: I179c708debcbc31ba9a93e4e434ae810051f5004
Change-Id: If59f68f595794695600811224cdedb4692b869c0
 2021-07-01 17:10:56 +08:00
Android Build Coastguard Worker
83e626ab60 Merge cherrypicks of [15164514, 15164515, 15164096, 15164078, 15163495, 15164068, 15164480, 15164097, 15164098, 15164482, 15164698, 15164375, 15164485, 15164469, 15164730, 15164731, 15164732, 15164733, 15164734, 15164735, 15164736, 15164737, 15164738, 15163662, 15164486, 15164519, 15164699, 15164700, 15164487, 15164099] into rvc-qpr3-release 
Change-Id: I947f7501bbfc8aeda2fd9b503d6f5c59f54b704f
 2021-07-01 00:00:47 +00:00
Hugh Chen
18c83959b1 RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message 
This CL add more prompts presented for users to avoid phishing attacks.

Screenshot:
https://screenshot.googleplex.com/p5PZbphN46ddPFV.png
https://screenshot.googleplex.com/6Q2wKfPbNQmTtx8.png
https://screenshot.googleplex.com/987VpYgNUZL2K4T.png
https://screenshot.googleplex.com/9eVg6SAGScVXU8U.png

Bug: 167403112
Test: manually test
Change-Id: Iadec059b662fd91754ad573bbe688702cdd3c9af
(cherry picked from commit 10e4599219)
(cherry picked from commit 80d8b03d02)
 2021-06-30 23:59:30 +00:00
Hugh Chen
4217584da9 RESTRICT AUTOMERGE Update string 
1. Replace "An untrusted Bluetooth device" to "A Bluetooth device".
2. Replace "Deny" to "Don't allow"

https://docs.google.com/document/d/18bVSIAyX4MNpNeCvxqyZu7CXcBUcdV0pnh-gzVprjqU/edit?ts=60709637

Bug: 167403112
Test: send intent to test right prompts message is pop up.
make -j42 RunSettingsRoboTests

Change-Id: I38da15d4b1fb08671f6352458cbf3f735b4083bc
(cherry picked from commit 38fc9a91b5)
(cherry picked from commit f4f2fae306)
 2021-06-30 23:59:26 +00:00
Wesley Wang
f4ababa50b Merge "Remove unnecessary converting us to ms in BatteryInfo" 2021-06-29 09:52:07 +00:00
Wesley.CW Wang
30b60195e8 Remove unnecessary converting us to ms in BatteryInfo 
The class "Estimate" has the menber estimateMillis and
the unit of batteryUsageStats.getBatteryTimeRemainingMs() is millisecond,
so converting from us to ms is unnecessary.

Bug: 187379252
Test: make RunSettingsRoboTests
Change-Id: Iefbd8751608eb749367cf08a4a9b184b948a6d33
 2021-06-28 17:59:35 +08:00
Xin Li
a8cf9a798d Merge "DO NOT MERGE - Merge RQ3A.210605.005" 2021-06-21 05:49:05 +00:00
Xin Li
88f92cb4db DO NOT MERGE - Merge RQ3A.210605.005 
Bug: 190855093
Merged-In: I73964718e9b3d66dbe189f48bfe6d1b16ec921f4
Change-Id: Id888e72e86cbc130fec23dd7645d1ceea1ce319d
 2021-06-18 12:24:37 -07:00
Xin Li
e774cf9cd3 DO NOT MERGE - Merge RQ3A.210605.005 
Bug: 190855093
Merged-In: I6e2845cc19dc012cba2933318a067bbb8db90a23
Change-Id: I73964718e9b3d66dbe189f48bfe6d1b16ec921f4
 2021-06-17 23:16:37 -07:00
Xin Li
eb885ad642 DO NOT MERGE - Mark RQ3A.210410.001 as merged 
Bug: 190855093
Merged-In: I2b6c7d579bfa1ce3d3fb4432d92906dc739dde1b
Change-Id: Ieddc2c352e9f0228d3e4c4525054fa6bad106328
 2021-06-17 22:43:30 -07:00
TreeHugger Robot
d9e78dc848 Merge "DO NOT MERGE - Merge ab/7272582" into stage-aosp-master 2021-06-18 00:31:00 +00:00
Xin Li
7d73dec24c DO NOT MERGE - Merge ab/7272582 
Bug: 190855093
Merged-In: I1cc3796f31e7db3d8f062436ebc618d93db19822
Change-Id: I2b6c7d579bfa1ce3d3fb4432d92906dc739dde1b
 2021-06-17 21:56:04 +00:00
Treehugger Robot
b34692c2b5 Merge "Settings: use framework text colors for SwitchBar" am: b09a17bc9e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1708559

Change-Id: I84406695c1822ccda20b74b35ea18a2d51487119
 2021-06-16 15:18:06 +00:00
Treehugger Robot
b09a17bc9e Merge "Settings: use framework text colors for SwitchBar" 2021-06-16 14:59:18 +00:00