PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
56,273 Commits 1 Branch 0 Tags
1c97e70641b8ffbc641f2594d1f29dba542e569c
Commit Graph

56273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Betty Chang
56235e44c5 Merge "[Mainline] To use getActiveSubscriptionInfo() instead of get default subscription Info with data/sms/voice" am: 251329c85c am: 74d5ae043c 
Change-Id: Ief23331634bdccae49104db98193d0d842a7c99c
 2020-02-17 07:01:23 +00:00
Betty Chang
74d5ae043c Merge "[Mainline] To use getActiveSubscriptionInfo() instead of get default subscription Info with data/sms/voice" am: 251329c85c 
Change-Id: Iaec059c5f4bc8cef5dd4a6b77205bdd633782ed3
 2020-02-17 06:46:24 +00:00
Betty Chang
251329c85c Merge "[Mainline] To use getActiveSubscriptionInfo() instead of get default subscription Info with data/sms/voice" 2020-02-17 06:38:29 +00:00
changbetty
1a5351c433 [Mainline] To use getActiveSubscriptionInfo() instead of get default subscription Info with data/sms/voice 
- getDefaultDataSubscriptionInfo()
   	- getActiveSubscriptionInfo(getDefaultDataSubscriptionId());
   - getDefaultSmsSubscriptionInfo()
   	- getActiveSubscriptionInfo(getDefaultSmsSubscriptionId());
   - getDefaultVoiceSubscriptionInfo()
   	- getActiveSubscriptionInfo(getDefaultVoiceSubscriptionId());

Bug: 147206736
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageUtilsTest
      make RunSettingsRoboTests ROBOTEST_FILTER=MobileDataSliceTest
      make RunSettingsRoboTests ROBOTEST_FILTER=MobileDataPreferenceControllerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=DefaultSubscriptionControllerTest

Change-Id: I7b5988b3c3068c12e242e123ebb54477093d37ad
Merged-Id: I7b5988b3c3068c12e242e123ebb54477093d37ad
 2020-02-15 14:56:58 +08:00
android-build-team Robot
ea564d6754 Snap for 6209883 from 936ebd0367 to qt-qpr3-release 
Change-Id: Id6368cb21bafd157fbe22818d32e75c35eb70980
 2020-02-15 02:26:36 +00:00
Zoey Chen
3f23659639 Merge "[Settings] Add permission for #getCdmaRoamingMode and use value from TelephonyManager Bug: 145788881 Test: make Change-Id: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1 Merged-In: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1" am: 864bd01efe am: 7b8e8255cd 
Change-Id: I29a8aee4d2c6ac45e3827555455f74c47589ca17
 2020-02-14 07:11:47 +00:00
Zoey Chen
7b8e8255cd Merge "[Settings] Add permission for #getCdmaRoamingMode and use value from TelephonyManager Bug: 145788881 Test: make Change-Id: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1 Merged-In: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1" am: 864bd01efe 
Change-Id: I951346d955f2223fce1b4c88e72cd44a5e33e1a5
 2020-02-14 07:01:49 +00:00
Zoey Chen
864bd01efe Merge "[Settings] Add permission for #getCdmaRoamingMode and use value from TelephonyManager Bug: 145788881 Test: make Change-Id: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1 Merged-In: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1" 2020-02-14 06:49:45 +00:00
TreeHugger Robot
74ad28ff90 Merge "Set the max length of user name field in Profile info" into qt-qpr1-dev am: 936ebd0367 
Change-Id: I5cb48821cb1bd7cc4d88b33844af567dd9cfcf7a
 2020-02-14 06:29:56 +00:00
TreeHugger Robot
936ebd0367 Merge "Set the max length of user name field in Profile info" into qt-qpr1-dev 2020-02-14 06:20:29 +00:00
android-build-team Robot
22e80e4a1e Snap for 6206628 from f8396c5cc0 to qt-qpr3-release 
Change-Id: I7511316c90b2c126b9d4d4557e4fb16c76f8f1db
 2020-02-14 02:06:40 +00:00
Automerger Merge Worker
df93007555 RESTRICT AUTOMERGE am: f8396c5cc0 
Change-Id: I348080b2dc5d6ee8074a1e6275a4bb8644caa417
 2020-02-13 00:12:19 +00:00
Automerger Merge Worker
d8ffaba4ae [automerger skipped] Merge "Import translations. DO NOT MERGE" am: 226ef3d100 -s ours am: 707aeaca7d -s ours 
am skip reason: subject contains skip directive

Change-Id: Idff5a28b6a63996c4f89cfa4493154ddfe022cde
 2020-02-12 01:38:27 +00:00
android-build-team Robot
328b2e27d2 Merge cherrypicks of [10301183, 10301340, 10301110, 10299537, 10300908, 10301450, 10300619, 10301451, 10301654, 10301341, 10301342, 10301343, 10301344, 10301508, 10301184, 10301185, 10301309, 10301290, 10301310, 10301345, 10301346, 10301464, 10301291, 10300931, 10301382, 10301383, 10301465, 10301384, 10301385, 10301408, 10301386, 10299538, 10301387, 10301388, 10301389, 10301390, 10301391, 10301292, 10301392, 10301393, 10301694, 10301695, 10301489, 10299807, 10299808, 10299809, 10300620, 10301491, 10301111, 10301348] into qt-qpr2-release 
Change-Id: I8ff23443d78652a0cdda7542393f1c09b7d5e779
 2020-02-12 01:26:23 +00:00
Automerger Merge Worker
707aeaca7d [automerger skipped] Merge "Import translations. DO NOT MERGE" am: 226ef3d100 -s ours 
am skip reason: subject contains skip directive

Change-Id: Id2f88bf0aa3ce2da5a1666798d1a71e1e20ff62a
 2020-02-12 01:22:22 +00:00
Bill Yi
dae5254cd8 Import translations. DO NOT MERGE 
Bug: 143905457

Change-Id: I14e7311ac25f37bbf8bc846a79963d0c560d98c8
Auto-generated-cl: translation import
(cherry picked from commit 4ea25da221)
 2020-02-12 01:18:59 +00:00
Curtis Belmonte
ec2106d5a3 Update L2U string for face unlock in settings 
Test: Checked in Settings for flame-userdebug build
Bug: 143905457
Change-Id: I2705b6bf9ae0a140f69ffaa5490a91500745f1e0
Merged-In: I1e98b95e81dea355c66e8c0f30664db21632d05c
(cherry picked from commit 13a5924c8d)
 2020-02-12 01:18:52 +00:00
Bill Yi
3f7cd6e788 Import translations. DO NOT MERGE 
Change-Id: If28324d88c5dabf515e6ce440d4816b185a39a00
Auto-generated-cl: translation import
(cherry picked from commit 250b9e7012)
 2020-02-12 01:18:43 +00:00
Treehugger Robot
226ef3d100 Merge "Import translations. DO NOT MERGE" 2020-02-12 01:12:50 +00:00
Yanting Yang
f8396c5cc0 RESTRICT AUTOMERGE 
Fix NPE of launching Settings with malicious URL

Add SafetyNet logging for tracing.

Fixes: 122836081
Test: visual, robotests
Change-Id: I97430ea0208c570c46a02dd499dfd944d20eb06e
 2020-02-11 16:17:08 +08:00
Automerger Merge Worker
7863cde18d Merge "Launch TetherSettings via Settings.ACTION_TETHER_SETTINGS" am: bc80ff1630 am: 66864cb891 
Change-Id: I9088e5dc52fec154c884bf5659378ae5bafba8fc
 2020-02-11 02:51:01 +00:00
Automerger Merge Worker
66864cb891 Merge "Launch TetherSettings via Settings.ACTION_TETHER_SETTINGS" am: bc80ff1630 
Change-Id: I71c32a98356d268d90b8c99345041fedd023b06e
 2020-02-11 02:37:24 +00:00
Paul Hu
bc80ff1630 Merge "Launch TetherSettings via Settings.ACTION_TETHER_SETTINGS" 2020-02-11 02:27:00 +00:00
android-build-team Robot
9492e827f4 Snap for 6193784 from d41b716f6c to qt-qpr3-release 
Change-Id: Ib26cdd4d25649eb69ef75edd40dd230c6f472734
 2020-02-10 00:17:39 +00:00
Automerger Merge Worker
2759bebf32 [automerger skipped] Import translations. DO NOT MERGE am: d41b716f6c -s ours 
am skip reason: subject contains skip directive

Change-Id: I1c94527f6a741b5e036635c0b89c9e86148c0b1d
 2020-02-09 03:24:35 +00:00
Bill Yi
d41b716f6c Import translations. DO NOT MERGE 
Change-Id: I802d73dcc63414bed8b9b5bba8ff87ad38c22ebc
Auto-generated-cl: translation import
 2020-02-08 01:07:28 -08:00
Automerger Merge Worker
36bc7f92b1 Merge "[Settings] To avoid use APIs in IccCard directly, calling APIs through TelephonyManager" am: 5503c8ea9e am: 4a121f066c 
Change-Id: Ie77bbc3fe379e11bb87b5af9ff8fdf424f503008
 2020-02-08 05:07:12 +00:00
Automerger Merge Worker
4a121f066c Merge "[Settings] To avoid use APIs in IccCard directly, calling APIs through TelephonyManager" am: 5503c8ea9e 
Change-Id: I90ba1b6e6f530b069d504a045d7832a8cf9e5833
 2020-02-08 04:46:59 +00:00
Zoey Chen
5503c8ea9e Merge "[Settings] To avoid use APIs in IccCard directly, calling APIs through TelephonyManager" 2020-02-08 04:25:32 +00:00
android-build-team Robot
a5db63b471 Snap for 6191454 from b5dcd35969 to qt-qpr3-release 
Change-Id: I6034d0bfad77f1aa85b50abb814dbfa7684507a3
 2020-02-08 02:07:08 +00:00
Automerger Merge Worker
c8e044de48 Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" am: af463b86c9 am: cd27b5b901 
Change-Id: I07988bb74d92486adfddb88142c0b3f92d2110ba
 2020-02-08 01:57:10 +00:00
Automerger Merge Worker
b946cbd92c DO NOT MERGE - Merge QQ1A.200205.002 into master am: 8c472e240f am: abf86230e4 
Change-Id: Id79f92e9ea099ca850428be4748f24cd28ea30e0
 2020-02-08 01:55:27 +00:00
Automerger Merge Worker
cd27b5b901 Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" am: af463b86c9 
Change-Id: I58a086074b45bedb194752973412dc4c1e6cd1ab
 2020-02-08 01:48:45 +00:00
Automerger Merge Worker
abf86230e4 DO NOT MERGE - Merge QQ1A.200205.002 into master am: 8c472e240f 
Change-Id: I6aca2687101666e27b3a20d0dc54bad50739cfb1
 2020-02-08 01:38:43 +00:00
Treehugger Robot
af463b86c9 Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" 2020-02-08 01:29:23 +00:00
Rafael Matias de Lima
9ddd3445f0 Fix for User edit info dialog during rotation 
[issue]
1. Go to Settings > System > Multiple users;
2. Edit user info;
3. Take a picture in portrait mode;
4. Turn the device to landscape mode;

Observe selected image is not retained;

[rootcause]
Fragments no longer need to check if the dialog
is showing up during onSaveInstanceState.

[test]
1. Edit user info;
2. Select a picture;
3. Turn the device to landscape mode;
 2020-02-07 11:35:48 -03:00
Automerger Merge Worker
b29e64ace1 Bug:PreferredNetworkModePreferenceController.java not being refreshed am: b5dcd35969 
Change-Id: Ib2e8c6b3249a1137559fa9259348dcf26b7d8a0e
 2020-02-07 12:54:50 +00:00
paulhu
08efd36bf2 Launch TetherSettings via Settings.ACTION_TETHER_SETTINGS 
Bug: 149068177
Test: Build, Flash, manual test.
Change-Id: If01bdeb7f6ea021cc28c462360a969985882348b
 2020-02-07 14:42:08 +08:00
zoey chen
9d49a395c3 [Settings] Add permission for #getCdmaRoamingMode and use value from TelephonyManager 
Bug: 145788881
Test: make
Change-Id: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1
Merged-In: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1
 2020-02-07 14:31:08 +08:00
Automerger Merge Worker
9e876f6919 Merge "Update profile api" am: 4f4c05addb am: 7425059fc9 
Change-Id: I40d4b126bda90a0bc5725325f84b15c99823dcdc
 2020-02-07 03:11:42 +00:00
Automerger Merge Worker
42d5890a96 Merge "[Settings] fix failure test case - ConditionContextualCardController" am: c2823ab2ce am: f227708d08 
Change-Id: I3dc450cb4a91c496e6a7c8306e4cd4a6b4a19a5b
 2020-02-07 03:11:15 +00:00
Automerger Merge Worker
7425059fc9 Merge "Update profile api" am: 4f4c05addb 
Change-Id: I8d3010852f55959ea7247b6487e197cd7c67a997
 2020-02-07 02:57:38 +00:00
Automerger Merge Worker
f227708d08 Merge "[Settings] fix failure test case - ConditionContextualCardController" am: c2823ab2ce 
Change-Id: I3fdabb38a0056f1b596ba4e1924e2116ba600f74
 2020-02-07 02:55:05 +00:00
Treehugger Robot
4f4c05addb Merge "Update profile api" 2020-02-07 02:46:12 +00:00
Bonian Chen
c2823ab2ce Merge "[Settings] fix failure test case - ConditionContextualCardController" 2020-02-07 02:40:17 +00:00
android-build-team Robot
7fbec9e25d Snap for 6188276 from 74ded43527 to qt-qpr3-release 
Change-Id: I264c1faafd174a36d91a8ee8158fae57b0241db5
 2020-02-07 02:29:04 +00:00
Automerger Merge Worker
403ab5da4d Merge "Refactored cell broadcast area info support" am: c36cc4e120 am: 62480277ed 
Change-Id: Ibb2f1dd5e007a78ab77dab21f086749df3a5a9cf
 2020-02-06 17:40:08 +00:00
Automerger Merge Worker
62480277ed Merge "Refactored cell broadcast area info support" am: c36cc4e120 
Change-Id: Ib1648fc64bc12d11b889468cd6a6c5c4ff09f0c2
 2020-02-06 17:26:15 +00:00
Jack Yu
c36cc4e120 Merge "Refactored cell broadcast area info support" 2020-02-06 17:17:49 +00:00
SongFerngWang
b5dcd35969 Bug:PreferredNetworkModePreferenceController.java not being refreshed 
Bug: 146594872
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
PreferredNetworkModePreferenceControllerTest (PASS)

Change-Id: Ic3579e630c1d9422d7105a2d8fb619409a5823d6
Merged-In: Ib5cc06cdbfd2fa70cd115d70337b21500e362da6
 2020-02-06 17:11:48 +08:00