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

56144 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
177ce8f017 Merge "Fix mismatching intent filter string in AndroidManifest.xml" 2020-03-16 22:07:18 +00:00
Grace Jia
16092ab56f Fix mismatching intent filter string in AndroidManifest.xml 
Test: Manual
Bug: 149524255
Change-Id: Ic5bfbfa41cba18ccc8166624da33c70b69db73f5
 2020-03-16 13:27:25 -07:00
Automerger Merge Worker
c3936e3961 [automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours 
am skip reason: subject contains skip directive

Change-Id: I5fe7e5bb4890cda70efd8ed4bee9b36a39d8453d
 2020-03-16 18:09:29 +00:00
Bill Yi
d49c677499 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: Ic27dcb9095c3058386601a78f844419467f147a1
 2020-03-16 08:20:15 -07:00
Automerger Merge Worker
5161dccb79 Merge "Address cleanup comments from aosp/1234607" am: 9dec7506d3 am: 008480e019 
Change-Id: I1fd1f571bc19a2c4aa1a1eb2346fa97d2932f2d9
 2020-03-13 23:42:42 +00:00
Automerger Merge Worker
008480e019 Merge "Address cleanup comments from aosp/1234607" am: 9dec7506d3 
Change-Id: I3aaa084901d593f3330469a499f548b6e40b42db
 2020-03-13 23:23:30 +00:00
Treehugger Robot
9dec7506d3 Merge "Address cleanup comments from aosp/1234607" 2020-03-13 23:04:12 +00:00
Revathy Sivalingam
4e00cbcb2b Make URLs in Wi-Fi Calling help description clickable 
Make URLs in Wi-Fi Calling help description clickable. This enables
carriers to add a link in the description that takes the user to a web
page with further information about Wi-Fi Calling.

Bug: 151326849
Test: manual
Change-Id: Icc66faa07105607a36b0d964ffc8ac5aafacb734
 2020-03-13 15:51:03 +01:00
Automerger Merge Worker
327db8c033 Merge "Settings performance testing" am: 4186be0f29 am: 0c0a52cc12 
Change-Id: I0099a4bda75f8acc86e09d142a1bdcc29bbc9684
 2020-03-13 13:57:05 +00:00
Automerger Merge Worker
0c0a52cc12 Merge "Settings performance testing" am: 4186be0f29 
Change-Id: Iaf5b3e75f376bc7dc2e875f1e10adecedc34231a
 2020-03-13 13:35:25 +00:00
Raff Tsai
4186be0f29 Merge "Settings performance testing" 2020-03-13 13:22:57 +00:00
youtengliang
ef861b0e3e Settings performance testing 
Test: atest com.android.settings.tests.perf LaunchSettingsTest

Change-Id: I32a077b22bc4cd36c7aab32dd22dede87b406641
 2020-03-13 13:22:38 +00:00
Automerger Merge Worker
eb4f8d7cca Merge "[Settings] Refactor DataUsageSummaryPreferenceController" am: aa08222778 am: df7216a144 
Change-Id: I3b4e01db0e0290290e6e962ae609f98521de23ee
 2020-03-13 12:25:03 +00:00
Automerger Merge Worker
caa0c9e1e4 Merge "[Settings] Avoid crash when adding new APN" am: 18bf77eef9 am: 3fd54b4e67 
Change-Id: I8700bb0f5035ecc83b9a97c004ffb84ba70d7a6e
 2020-03-13 12:24:57 +00:00
Automerger Merge Worker
7bb65a19dc Merge "[Settings] Code Refactor of MobileNetworkPreferenceController" am: 52dd9f5abf am: 10ff4f4ab6 
Change-Id: I380cb41a50e1dfc1edf9aca30c6dac14e33740d5
 2020-03-13 12:24:48 +00:00
Automerger Merge Worker
fa889d4fec Merge "[Settings] Refactor DisabledSubscriptionController" am: 0972a6dd94 am: 7ecae6dd06 
Change-Id: I7a64297cc60f20d560e811636c4d2678366282c1
 2020-03-13 12:24:42 +00:00
Automerger Merge Worker
df7216a144 Merge "[Settings] Refactor DataUsageSummaryPreferenceController" am: aa08222778 
Change-Id: I15618005ab8331242323d20bbb1c36dd0a8996e1
 2020-03-13 12:14:30 +00:00
Bonian Chen
aa08222778 Merge "[Settings] Refactor DataUsageSummaryPreferenceController" 2020-03-13 12:08:30 +00:00
Automerger Merge Worker
3fd54b4e67 Merge "[Settings] Avoid crash when adding new APN" am: 18bf77eef9 
Change-Id: I0f6034dca48a2f0e6461f6b0559bee0c81410f3f
 2020-03-13 12:07:15 +00:00
Automerger Merge Worker
10ff4f4ab6 Merge "[Settings] Code Refactor of MobileNetworkPreferenceController" am: 52dd9f5abf 
Change-Id: I90719e21019d7acb9cd208b7b282a865919be775
 2020-03-13 12:07:06 +00:00
Automerger Merge Worker
7ecae6dd06 Merge "[Settings] Refactor DisabledSubscriptionController" am: 0972a6dd94 
Change-Id: I07ac521d3822a644cad29667a59fd1ae0bf848a3
 2020-03-13 12:06:59 +00:00
Bonian Chen
18bf77eef9 Merge "[Settings] Avoid crash when adding new APN" 2020-03-13 12:06:15 +00:00
Bonian Chen
52dd9f5abf Merge "[Settings] Code Refactor of MobileNetworkPreferenceController" 2020-03-13 12:05:36 +00:00
Bonian Chen
0972a6dd94 Merge "[Settings] Refactor DisabledSubscriptionController" 2020-03-13 11:52:53 +00:00
Bonian Chen
5a3d379293 [Settings] Avoid crash when adding new APN 
Avoid from crash when adding new APN.

Bug: 150567855
Test: manual
Change-Id: I8af369878eef763df2fcfe808740334d556a58b7
Merged-In: I70362a2aea15c5eb52d10af21025cf9643097803
 2020-03-13 11:00:17 +00:00
Automerger Merge Worker
e628466fc2 Merge "[Settings] Refactor CarrierPreferenceController" am: 985352d172 am: a0d1887a98 
Change-Id: I449647f069d2e356fd6fa7ed06e655e2c0ad9eb9
 2020-03-13 10:48:10 +00:00
Automerger Merge Worker
0587fe1ced Merge "[Settings] Refactor Telephony PreferenceController" am: 1b00c00f79 am: 6865bece3c 
Change-Id: I9f0f6f0f404b35f05ac1b101b7a3e71bae6517c0
 2020-03-13 10:48:05 +00:00
Automerger Merge Worker
a0d1887a98 Merge "[Settings] Refactor CarrierPreferenceController" am: 985352d172 
Change-Id: Ief12d167f83e6898a16963fbd8718993a3e6d48d
 2020-03-13 10:28:12 +00:00
Automerger Merge Worker
6865bece3c Merge "[Settings] Refactor Telephony PreferenceController" am: 1b00c00f79 
Change-Id: I6360f84936f696431af97c0cafe796c93e21f58a
 2020-03-13 10:27:57 +00:00
Bonian Chen
985352d172 Merge "[Settings] Refactor CarrierPreferenceController" 2020-03-13 10:12:29 +00:00
Bonian Chen
1b00c00f79 Merge "[Settings] Refactor Telephony PreferenceController" 2020-03-13 10:11:54 +00:00
Automerger Merge Worker
793fa69cf8 Merge "[Settings] Refactor MmsMessagePreferenceController" am: 1f1843f11c am: 57e2e2424a 
Change-Id: Ibd1693cfa19efadf1cba11180464cb199248780f
 2020-03-13 09:39:00 +00:00
Automerger Merge Worker
57e2e2424a Merge "[Settings] Refactor MmsMessagePreferenceController" am: 1f1843f11c 
Change-Id: I02a5ee42cd8e1f429b4f3031ac10c620eb5e3a16
 2020-03-13 09:29:09 +00:00
Bonian Chen
1f1843f11c Merge "[Settings] Refactor MmsMessagePreferenceController" 2020-03-13 09:08:18 +00:00
Bonian Chen
0971feaeda [Settings] Code Refactor of MobileNetworkPreferenceController 
Code Refactor of MobileNetworkPreferenceController

Bug: 150567855
Test: make
Change-Id: If5de2d0841e2f8705d2e202b6e6a7e53dc1a4897
 2020-03-13 15:58:09 +08:00
Bonian Chen
1c51bd3981 [Settings] Refactor of ApnSettings 
Refactor of ApnSettings

Bug: 150567855
Test: make
Change-Id: I1af5e30006a9e68316968807a2532e13398c7af4
 2020-03-13 15:49:57 +08:00
Rahul Sabnis
27d9ac4f1e Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..." 
Revert submission 10303287-revert-10253996-bt-a2dp-no-null-FQRXACWPIA

Reason for revert: Fixing breakage
Reverted Changes:
I4d9f2f819:Revert "Make sure calls to BluetoothA2dp APIs pass...
I771ca0d57:Revert "Need to now pass in active device instead ...
I76529c7a1:Revert "Pass in active device to all BluetoothA2dp...
I297bda68d:Revert "Require user pass in a non-null BluetoothD...
I525327959:Revert "Pass in active device to all BluetoothA2dp...
I1d8660b11:Revert "Pass in active device to all BluetoothA2dp...

Bug: 147287141
Test: robotests
Merged-In: I5aecfa4b5a8e371b914573ddd080acb98078bfca
Change-Id: I5aecfa4b5a8e371b914573ddd080acb98078bfca
 2020-03-12 16:37:23 -07:00
Automerger Merge Worker
4ce01a847c Merge "[Settings] Fix behavior of mobile data plan" am: ac2c706809 am: 311510b298 
Change-Id: Ie775c149cc731bb606f6dcb86a75512855f4e150
 2020-03-12 16:57:39 +00:00
Automerger Merge Worker
654b19e1d5 Merge "[Settings] Update TelephonyAPI in CallsDefaultSubscriptionController" am: 0f15f98999 am: b9b0dd9bc5 
Change-Id: I151894dc8de726b437ba6715ea783483ac9602fb
 2020-03-12 16:57:33 +00:00
Automerger Merge Worker
311510b298 Merge "[Settings] Fix behavior of mobile data plan" am: ac2c706809 
Change-Id: Icc7b441acfa3001d91a91175c6bf05eee5007984
 2020-03-12 16:30:31 +00:00
Automerger Merge Worker
b9b0dd9bc5 Merge "[Settings] Update TelephonyAPI in CallsDefaultSubscriptionController" am: 0f15f98999 
Change-Id: I36ea27d31eb7ce355e88bc2c4bbd1ed132359bc3
 2020-03-12 16:30:25 +00:00
Bonian Chen
ac2c706809 Merge "[Settings] Fix behavior of mobile data plan" 2020-03-12 16:19:57 +00:00
Bonian Chen
0f15f98999 Merge "[Settings] Update TelephonyAPI in CallsDefaultSubscriptionController" 2020-03-12 16:19:18 +00:00
Bonian Chen
0a00f0c44c [Settings] Update TelephonyAPI in CallsDefaultSubscriptionController 
use TelephonyManager's setDefaultVoiceSubscriptionId instead of setDefaultVoiceSubId

Bug: 150352656
Test: make
Change-Id: I61078c72c9a5374d4840869ecf9b65d4ce8ef85c
 2020-03-12 20:57:09 +08:00
Bonian Chen
332de69f8e [Settings] Refactor CarrierPreferenceController 
Refactor CarrierPreferenceController

Bug: 150352656
Test: make
Change-Id: I8b125eb501cdbf63cbfa84d72d78e44a655bf9a5
 2020-03-12 20:53:10 +08:00
Bonian Chen
99c0f3fe14 [Settings] Refactor MmsMessagePreferenceController 
Refactor MmsMessagePreferenceController

Bug: 150352656
Test: make
Change-Id: Id72f8f95eb12bb5c8f060df6c247312c56f2e69a
 2020-03-12 20:50:25 +08:00
Bonian Chen
b7891e879f [Settings] Refactor Telephony PreferenceController 
Refactor TelephonyBasePreferenceController and TelephonyTogglePreferenceController

Bug: 150352656
Test: make
Change-Id: I3d52054fd9fbc5597db6266686d155a12d5a88d6
 2020-03-12 20:43:54 +08:00
Bonian Chen
29c1be284b [Settings] Refactor DisabledSubscriptionController 
Refactor DisabledSubscriptionController

Bug: 150352656
Test: make
Change-Id: I6d31247d77c8fb515b9ba1b1ead33102f0e9e12f
 2020-03-12 20:17:17 +08:00
Bonian Chen
25abe19e10 [Settings] Refactor DataUsageSummaryPreferenceController 
Refactoring DataUsageSummaryPreferenceController to use public API

Bug: 150352656
Test: make
Change-Id: I95612a1e4ca5e178776dd1042a6ccfef011ba50b
 2020-03-12 20:11:31 +08:00
Automerger Merge Worker
31f9002e3b Merge "[Settings] Code refactor" am: a7a9863a52 am: a99bfeadf9 
Change-Id: I16b8f6d6e48c7f1f8f6ef6e76b6eaf73269b2da0
 2020-03-12 11:31:43 +00:00