Commit Graph

60421 Commits

Author SHA1 Message Date
Automerger Merge Worker
ab353c9386 Merge "[Settings] Refactor DataUsageSummaryPreferenceController" am: aa08222778 am: df7216a144 am: a100aa0b4a
Change-Id: I06bf1b8fcaf2033ae01f29b3ecb075ec7f496759
2020-03-13 12:47:25 +00:00
Automerger Merge Worker
0d7ec3ca9a [automerger skipped] Merge "[Settings] Avoid crash when adding new APN" am: 18bf77eef9 am: 3fd54b4e67 -s ours am: 9777ca7dd9 -s ours
am skip reason: Change-Id I70362a2aea15c5eb52d10af21025cf9643097803 with SHA-1 cd1fd106c9 is in history

Change-Id: I2c3f8a933b9bb47ae027cdeb67045a8a4a769ee3
2020-03-13 12:47:20 +00:00
Automerger Merge Worker
c2a1ae3178 Merge "[Settings] Code Refactor of MobileNetworkPreferenceController" am: 52dd9f5abf am: 10ff4f4ab6 am: 7bb5275105
Change-Id: Iaae744e6231dc5ee81a5e4e40cb7e5af2dbe7feb
2020-03-13 12:47:13 +00:00
Automerger Merge Worker
7f7042e7a1 Merge "[Settings] Refactor DisabledSubscriptionController" am: 0972a6dd94 am: 7ecae6dd06 am: 68725db15f
Change-Id: Id45fd1291d70de367e31e3d95665f7a074ad3d6e
2020-03-13 12:46:58 +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
a100aa0b4a Merge "[Settings] Refactor DataUsageSummaryPreferenceController" am: aa08222778 am: df7216a144
Change-Id: Iee70153f85680bcfa442ca4fb75fe5cbacd33a7c
2020-03-13 12:25:02 +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
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
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
Automerger Merge Worker
091f6b0339 Merge "[Settings] Refactor CarrierPreferenceController" am: 985352d172 am: a0d1887a98 am: 0cd7089858
Change-Id: I4fdbd1386df9b0f426138a16fc60910d8f007337
2020-03-13 11:10:25 +00:00
Automerger Merge Worker
aef5324ab5 Merge "[Settings] Refactor Telephony PreferenceController" am: 1b00c00f79 am: 6865bece3c am: 66913f8aea
Change-Id: I7c99ae47c4980d919e671ea927a17fb3053352f1
2020-03-13 11:09:47 +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
0cd7089858 Merge "[Settings] Refactor CarrierPreferenceController" am: 985352d172 am: a0d1887a98
Change-Id: Ieef9db81e296054a8531deca5d457971f8f97a87
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
a777ff42e8 Merge "[Settings] Refactor MmsMessagePreferenceController" am: 1f1843f11c am: 57e2e2424a am: 13e5aa329d
Change-Id: I9fd88cc085085bd8601ab4be6548d13cddd985cd
2020-03-13 09:52:05 +00:00
Automerger Merge Worker
04b93d19fe Merge "Fix tests" into rvc-dev am: 6d8e0fed61 am: 95ada20d2e
Change-Id: I5cc221b745e6515f0724c5b6834aa197e271a93e
2020-03-13 09:51:56 +00:00
Automerger Merge Worker
648fe31181 Merge "Fix tests" into rvc-dev am: 6d8e0fed61 am: f08d965b53
Change-Id: If3e8ac385517d0fcad9160f24b8d6aaa1b3cdacd
2020-03-13 09:51:27 +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
95ada20d2e Merge "Fix tests" into rvc-dev am: 6d8e0fed61
Change-Id: I2ebe208fd9795e122b650b93b8a2dc81fe0ae3e8
2020-03-13 09:38:46 +00:00
Automerger Merge Worker
f08d965b53 Merge "Fix tests" into rvc-dev am: 6d8e0fed61
Change-Id: I76a1639f3530aee4c47fcc3cac1e01bfbe02aea5
2020-03-13 09:38:45 +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
7415aa1ffe Merge "Remove ignore test case" into rvc-dev am: ad30345078 am: c0035cfc86
Change-Id: I9eb7176fce6069dd48caa92fb43b61af1faa40fb
2020-03-13 05:15:14 +00:00
Automerger Merge Worker
9d37d5df00 Merge "Remove ignore test case" into rvc-dev am: ad30345078 am: e94cbd98ff
Change-Id: I772373e7815dceac04431d16cb1de055a6d1634e
2020-03-13 05:14:59 +00: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
Automerger Merge Worker
e94cbd98ff Merge "Remove ignore test case" into rvc-dev am: ad30345078
Change-Id: I6f1e2d5f3429c6fccee5d80403e27b445cd40012
2020-03-13 05:01:38 +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
857f09a45d Merge "Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 am: 0bfda151bf" into rvc-d1-dev-plus-aosp 2020-03-13 03:40:12 +00:00
Automerger Merge Worker
cceef6428c Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 am: 0bfda151bf
Change-Id: I54b0bf1335d21c3b2b45ddb69b175ee4734205f0
2020-03-13 03:40:03 +00:00
Automerger Merge Worker
2c3ee203bf Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 am: 3f6c723044
Change-Id: I5a80461f141c2c96234e05f65b7feb09d20101f3
2020-03-13 03:39:54 +00:00
Automerger Merge Worker
3f6c723044 Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33
Change-Id: Iee7a93a3c65d7bdb432937bcc5b81d2f3dd7fa45
2020-03-13 03:27:02 +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