Commit Graph

60012 Commits

Author SHA1 Message Date
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
43d0d904c9 Merge "Settings performance testing" am: 4186be0f29 am: 0c0a52cc12
Change-Id: I4ed00fb35eb82352a0609fd089d4fbb06ed01ef0
2020-03-13 13:57:02 +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
menghanli
9785c7e290 Update R accessibility assets and strings (4/n)
- Color inversion preview
- Caption manager preview
- Dwell preview

Bug: 148837311
Test: Manual test
Change-Id: Ia637074c4282bbc51befc44efb0a4ff474f86b26
2020-03-13 12:43:36 +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
a100aa0b4a Merge "[Settings] Refactor DataUsageSummaryPreferenceController" am: aa08222778 am: df7216a144
Change-Id: Iee70153f85680bcfa442ca4fb75fe5cbacd33a7c
2020-03-13 12:25:02 +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
9777ca7dd9 [automerger skipped] Merge "[Settings] Avoid crash when adding new APN" am: 18bf77eef9 am: 3fd54b4e67 -s ours
am skip reason: Change-Id I70362a2aea15c5eb52d10af21025cf9643097803 with SHA-1 cd1fd106c9 is in history

Change-Id: I0492e148b8159abdbfa046667ded907980880877
2020-03-13 12:24:55 +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
7bb5275105 Merge "[Settings] Code Refactor of MobileNetworkPreferenceController" am: 52dd9f5abf am: 10ff4f4ab6
Change-Id: I9ff971f6bdfea2528074064e68997028f55edd7a
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
68725db15f Merge "[Settings] Refactor DisabledSubscriptionController" am: 0972a6dd94 am: 7ecae6dd06
Change-Id: Ic5401b124d3b3e637d5c057477204cd84dde6884
2020-03-13 12:24:38 +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
0cd7089858 Merge "[Settings] Refactor CarrierPreferenceController" am: 985352d172 am: a0d1887a98
Change-Id: Ieef9db81e296054a8531deca5d457971f8f97a87
2020-03-13 10:48:05 +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
66913f8aea Merge "[Settings] Refactor Telephony PreferenceController" am: 1b00c00f79 am: 6865bece3c
Change-Id: Ief981d07dab30741c639edab6cd31bbd20476238
2020-03-13 10:47:39 +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
13e5aa329d Merge "[Settings] Refactor MmsMessagePreferenceController" am: 1f1843f11c am: 57e2e2424a
Change-Id: If39467fa58090b1594c5153fc2c7eb3600a36dfc
2020-03-13 09:39:10 +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
95ada20d2e Merge "Fix tests" into rvc-dev am: 6d8e0fed61
Change-Id: I2ebe208fd9795e122b650b93b8a2dc81fe0ae3e8
2020-03-13 09:38:46 +00:00
Automerger Merge Worker
57e2e2424a Merge "[Settings] Refactor MmsMessagePreferenceController" am: 1f1843f11c
Change-Id: I02a5ee42cd8e1f429b4f3031ac10c620eb5e3a16
2020-03-13 09:29:09 +00:00
TreeHugger Robot
6d8e0fed61 Merge "Fix tests" into rvc-dev 2020-03-13 09:27:16 +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
Automerger Merge Worker
c0035cfc86 Merge "Remove ignore test case" into rvc-dev am: ad30345078
Change-Id: I06bae8e189cfb47a95beedbe732822d21975ddc3
2020-03-13 05:01:47 +00:00
Edgar Wang
3b47408016 Refine remove locale warning dialog string
- If the first language is not selected, just remove the body copy
  else warning user the locale will change to another language.

Fixes: 140723349
Test: manual & robotest
Change-Id: I9fec17ae85889f2864c3f3cae744f7181e6f9b2c
2020-03-13 12:49:21 +08:00
Edgar Wang
ad30345078 Merge "Remove ignore test case" into rvc-dev 2020-03-13 04:45:59 +00:00
Automerger Merge Worker
0bfda151bf Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33
Change-Id: I6ecd56f6855cfd160e491472e1c5276deccde92d
2020-03-13 03:27:00 +00:00
TreeHugger Robot
89a6fafa33 Merge "Use values-night to control the dark mode background color" into rvc-dev 2020-03-13 03:13:27 +00:00
Brad Ebinger
95aeac6790 Set the CHAR_LIMIT to 110 in order to support more translations.
Increase the CHAR_LIMIT for contact_discovery_opt_in_summary.

Fixes: 150941009
Test: manual
Change-Id: Ia71c87b47ed8b5b738f6d5a9b2693e7943f6797c
2020-03-12 18:15:54 -07: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
370fd8650d Merge "Remove nested scrolling" into rvc-dev am: 4a1f517585
Change-Id: I41ab594af6e0c8e3d66e9440f58ef10283217c31
2020-03-12 21:53:58 +00:00
TreeHugger Robot
4a1f517585 Merge "Remove nested scrolling" into rvc-dev 2020-03-12 21:44:27 +00:00
Julia Reynolds
49f40ee77b Fix tests
Fixing one of them by removing an unneeded setting

Test: RunSettingsRoboTests2
Fixes: 151279674
Change-Id: If2b513ba7b4bf8ec5183e2a9457caab3d3e06dc4
2020-03-12 17:27:35 -04:00
Automerger Merge Worker
58f8eded5d Merge "Log some actions for changing wifi hotspot config" into rvc-dev am: 0ad0a50538
Change-Id: I4316b557413cc003049cff812d3b09e6bc3aea4d
2020-03-12 20:03:04 +00:00