Automerger Merge Worker
8784faa617
Merge "Set the CHAR_LIMIT to 110 in order to support more translations." into rvc-dev am: 117995aec4 am: 25b03c9930 am: 4fd3a55579 am: cb46421ec6
...
Change-Id: I06705ce9fbf7e41277483ce617b92e0a5c67e4cd
2020-03-13 17:12:55 +00:00
Automerger Merge Worker
f0f8eb656a
Merge "Set the CHAR_LIMIT to 110 in order to support more translations." into rvc-dev am: 117995aec4 am: 25b03c9930 am: d398a581d0 am: cd51d3d98c
...
Change-Id: Ia1e43214da4aad148a62f71e6ae9a797efc541b1
2020-03-13 17:12:45 +00:00
Automerger Merge Worker
9993680ac4
Merge "Refine remove locale warning dialog string" into rvc-dev am: 907905bb96 am: e3aaaa8a59
...
Change-Id: Ieae089071a39d89aa8e5682a9e913c9e16ab7b95
2020-03-13 17:07:30 +00:00
Automerger Merge Worker
4a56fb4144
Merge "Refine remove locale warning dialog string" into rvc-dev am: 907905bb96 am: 9f2fb9b595
...
Change-Id: I2ff39501e6979dabd1240db56d0e00057690d825
2020-03-13 17:07:23 +00:00
Automerger Merge Worker
693cb5a2f2
Merge "Refine remove locale warning dialog string" into rvc-dev am: 907905bb96 am: 9f2fb9b595
...
Change-Id: I296a7d6c476a05f41d15b8c7a977d6332ccf60c6
2020-03-13 17:07:22 +00:00
Automerger Merge Worker
31c7de4b07
Merge "Set the CHAR_LIMIT to 110 in order to support more translations." into rvc-dev am: 117995aec4 am: 5b859bf70c am: 73bd63c420
...
Change-Id: Icb80e98bce0bfddba9eee3a43f14783cafbee9ee
2020-03-13 17:01:03 +00:00
Automerger Merge Worker
cb46421ec6
Merge "Set the CHAR_LIMIT to 110 in order to support more translations." into rvc-dev am: 117995aec4 am: 25b03c9930 am: 4fd3a55579
...
Change-Id: I26fefeb9fda7d647be1cb8663e2a1c52191dc700
2020-03-13 17:01:00 +00:00
Automerger Merge Worker
cd51d3d98c
Merge "Set the CHAR_LIMIT to 110 in order to support more translations." into rvc-dev am: 117995aec4 am: 25b03c9930 am: d398a581d0
...
Change-Id: Ibf4c8a1e9672a5401158c9dce6826524050a314b
2020-03-13 17:00:48 +00:00
Automerger Merge Worker
e3aaaa8a59
Merge "Refine remove locale warning dialog string" into rvc-dev am: 907905bb96
...
Change-Id: I84f4e0575e252520704d6afec262ecb6de9f0916
2020-03-13 16:52:18 +00:00
Automerger Merge Worker
9f2fb9b595
Merge "Refine remove locale warning dialog string" into rvc-dev am: 907905bb96
...
Change-Id: Ifd13a1a6501378de9a41440a4a6cfb956fc75c71
2020-03-13 16:52:12 +00:00
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
4fd3a55579
Merge "Set the CHAR_LIMIT to 110 in order to support more translations." into rvc-dev am: 117995aec4 am: 25b03c9930
...
Change-Id: I4820060b085db7384d9bbc6391a95553f6054e7b
2020-03-13 16:46:43 +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
bc0366914a
Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev am: 37fa5bd059 am: 62d9891328 am: cf0e5bb296 am: b5bfc99ee5 am: af10c3fd86
...
Change-Id: I124493c81764ad3582c927e10df6ec82b50df2d1
2020-03-13 15:31:44 +00:00
Automerger Merge Worker
2ed13d9f60
Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev am: 37fa5bd059 am: 91002efcd6 am: 30a267f96d am: 13da68732c
...
Change-Id: I99cb067283b7e7f7ee6a8ceaec73289c06208421
2020-03-13 15:31:36 +00:00
Automerger Merge Worker
74f957c212
Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev am: 37fa5bd059 am: 62d9891328 am: 92b4f17fe2 am: b8743359a3
...
Change-Id: I03ff3d2c1bb45042cced1b8413af357187196d3b
2020-03-13 15:31:28 +00:00
Automerger Merge Worker
af10c3fd86
Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev am: 37fa5bd059 am: 62d9891328 am: cf0e5bb296 am: b5bfc99ee5
...
Change-Id: Ie5e0083e67e16bd8ceedee35d291dab3f13be30c
2020-03-13 15:25:58 +00:00
Automerger Merge Worker
13da68732c
Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev am: 37fa5bd059 am: 91002efcd6 am: 30a267f96d
...
Change-Id: I85411d98f0cc7cafcadc80740d43e8dfd0dd2aa1
2020-03-13 15:24:21 +00:00
Automerger Merge Worker
b8743359a3
Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev am: 37fa5bd059 am: 62d9891328 am: 92b4f17fe2
...
Change-Id: Ibffd92b06db383922f7ba94c048a6b65cfc933ec
2020-03-13 15:20:00 +00:00
Automerger Merge Worker
b5bfc99ee5
Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev am: 37fa5bd059 am: 62d9891328 am: cf0e5bb296
...
Change-Id: I3ec524c950ec2c95aefe97c48ede7cdac75285aa
2020-03-13 15:17:27 +00:00
Automerger Merge Worker
cf0e5bb296
Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev am: 37fa5bd059 am: 62d9891328
...
Change-Id: I26222d3b9175e4b85916a645124ea8a4a0787da6
2020-03-13 15:00:25 +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
Automerger Merge Worker
0a57a71af1
Merge "Settings performance testing" am: 4186be0f29 am: 0c0a52cc12 am: 43d0d904c9 am: 00e82ceb9b am: e0ebc3382b
...
Change-Id: I76e8ad906ecd79f04ba4762dc49860be78dec1b6
2020-03-13 14:35:40 +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
e0ebc3382b
Merge "Settings performance testing" am: 4186be0f29 am: 0c0a52cc12 am: 43d0d904c9 am: 00e82ceb9b
...
Change-Id: I2274b7ea34e9ed20eef7c935dae2acde2c4b912a
2020-03-13 14:23:58 +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
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
Automerger Merge Worker
193fb394a6
Merge "[Settings] Refactor DataUsageSummaryPreferenceController" am: aa08222778 am: df7216a144 am: a100aa0b4a am: ab353c9386 am: 5d46f36fc8
...
Change-Id: I9aafc9fa2341a23ded3a5969fa23d61acecdd64f
2020-03-13 13:22:57 +00:00
Automerger Merge Worker
19a7d1181a
[automerger skipped] Merge "[Settings] Avoid crash when adding new APN" am: 18bf77eef9 am: 3fd54b4e67 -s ours am: 9777ca7dd9 -s ours am: 0d7ec3ca9a -s ours am: 466aded3ea -s ours
...
am skip reason: Change-Id I70362a2aea15c5eb52d10af21025cf9643097803 with SHA-1 cd1fd106c9
2020-03-13 13:22:50 +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
86423292c2
Merge "[Settings] Code Refactor of MobileNetworkPreferenceController" am: 52dd9f5abf am: 10ff4f4ab6 am: 7bb5275105 am: c2a1ae3178 am: cf3f6ebbfa
...
Change-Id: I9b992971eeec178722112c36499f76002f6172f8
2020-03-13 13:22:37 +00:00
Automerger Merge Worker
7873575ae2
Merge "[Settings] Refactor DisabledSubscriptionController" am: 0972a6dd94 am: 7ecae6dd06 am: 68725db15f am: 7f7042e7a1 am: 803eb334a5
...
Change-Id: I5c0e07bb169bd039e53883253f636d7bfc4ac71c
2020-03-13 13:22:22 +00:00
Automerger Merge Worker
5d46f36fc8
Merge "[Settings] Refactor DataUsageSummaryPreferenceController" am: aa08222778 am: df7216a144 am: a100aa0b4a am: ab353c9386
...
Change-Id: Id63b38d0666f21566858889ad4d317f59607ecbc
2020-03-13 13:03:10 +00:00
Automerger Merge Worker
466aded3ea
[automerger skipped] Merge "[Settings] Avoid crash when adding new APN" am: 18bf77eef9 am: 3fd54b4e67 -s ours am: 9777ca7dd9 -s ours am: 0d7ec3ca9a -s ours
...
am skip reason: Change-Id I70362a2aea15c5eb52d10af21025cf9643097803 with SHA-1 cd1fd106c9
2020-03-13 13:03:04 +00:00
Automerger Merge Worker
cf3f6ebbfa
Merge "[Settings] Code Refactor of MobileNetworkPreferenceController" am: 52dd9f5abf am: 10ff4f4ab6 am: 7bb5275105 am: c2a1ae3178
...
Change-Id: Ie38349c7b8fc21dfe426b9a66091ad398e9506ea
2020-03-13 13:02:55 +00:00
Automerger Merge Worker
803eb334a5
Merge "[Settings] Refactor DisabledSubscriptionController" am: 0972a6dd94 am: 7ecae6dd06 am: 68725db15f am: 7f7042e7a1
...
Change-Id: I99206928bf607aadf33b876683816945574bb0c5
2020-03-13 13:02:24 +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
