Automerger Merge Worker
73bd63c420
Merge "Set the CHAR_LIMIT to 110 in order to support more translations." into rvc-dev am: 117995aec4 am: 5b859bf70c
...
Change-Id: I11445c34f4388a1ecbfe527b97cbcbebf193f4d0
2020-03-13 16:46:52 +00:00
Automerger Merge Worker
d398a581d0
Merge "Set the CHAR_LIMIT to 110 in order to support more translations." into rvc-dev am: 117995aec4 am: 25b03c9930
...
Change-Id: I464313af4431fac3c8197e6f3ddb73a81de4eb87
2020-03-13 16:46:23 +00:00
TreeHugger Robot
907905bb96
Merge "Refine remove locale warning dialog string" into rvc-dev
2020-03-13 16:43:45 +00:00
Automerger Merge Worker
5b859bf70c
Merge "Set the CHAR_LIMIT to 110 in order to support more translations." into rvc-dev am: 117995aec4
...
Change-Id: If38fe59db1f1ea7ad013a9a3d8c3991ceae689bc
2020-03-13 16:34:31 +00:00
Automerger Merge Worker
25b03c9930
Merge "Set the CHAR_LIMIT to 110 in order to support more translations." into rvc-dev am: 117995aec4
...
Change-Id: I05cbeae87709b99b0fb5a2b7864bbef6071353d9
2020-03-13 16:34:26 +00:00
Brad Ebinger
117995aec4
Merge "Set the CHAR_LIMIT to 110 in order to support more translations." into rvc-dev
2020-03-13 16:23:10 +00:00
Automerger Merge Worker
30a267f96d
Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev am: 37fa5bd059 am: 91002efcd6
...
Change-Id: I7f55bcff2e64cafa60caf7789bc6d7132e04731e
2020-03-13 15:00:24 +00:00
Automerger Merge Worker
92b4f17fe2
Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev am: 37fa5bd059 am: 62d9891328
...
Change-Id: Ia860be60c8487ef08ece2dddf7765f7626f14623
2020-03-13 14:59:59 +00:00
Automerger Merge Worker
91002efcd6
Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev am: 37fa5bd059
...
Change-Id: I19c97f204b39f0097b32f433937fa40e555f03d5
2020-03-13 14:47:29 +00:00
Automerger Merge Worker
62d9891328
Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev am: 37fa5bd059
...
Change-Id: I317bd4c4e23b3738f95b90950e64c1a0181925b9
2020-03-13 14:45:11 +00:00
Alex Johnston
37fa5bd059
Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev
2020-03-13 14:28:15 +00:00
Automerger Merge Worker
00e82ceb9b
Merge "Settings performance testing" am: 4186be0f29 am: 0c0a52cc12 am: 43d0d904c9
...
Change-Id: Icb68bd2fb4823fdf68146c4a0ab337cd6dc24468
2020-03-13 14:11:57 +00: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
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
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
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
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
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
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
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
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
a777ff42e8
Merge "[Settings] Refactor MmsMessagePreferenceController" am: 1f1843f11c am: 57e2e2424a am: 13e5aa329d
...
Change-Id: I9fd88cc085085bd8601ab4be6548d13cddd985cd
2020-03-13 09:52:05 +00:00
