Automerger Merge Worker
90d0060f81
Merge "Remove duplicated index search data" into rvc-dev am: ed39b5bb1a
...
Change-Id: I394df077b58555d88ffeeb52fe727a772f9f6574
2020-03-16 01:52:03 +00:00
Edgar Wang
ed39b5bb1a
Merge "Remove duplicated index search data" into rvc-dev
2020-03-16 01:42:22 +00:00
Automerger Merge Worker
56d1d84371
Merge "Blur developer setting" into rvc-dev am: 59b3974433 am: e080bd7985
...
Change-Id: I1d730c8e7a35fc97ff9ce0fd48733619198c296f
2020-03-15 23:53:27 +00:00
Automerger Merge Worker
386b605c61
Merge "Blur developer setting" into rvc-dev am: 59b3974433 am: 148b737ef2
...
Change-Id: Icfa3260c1350885bdd7f740a56a86f20cd29c33d
2020-03-15 23:53:08 +00:00
Automerger Merge Worker
e080bd7985
Merge "Blur developer setting" into rvc-dev am: 59b3974433
...
Change-Id: Ibcb04fdd68889f304f67e02261c8484dff3afac5
2020-03-15 23:40:18 +00:00
Automerger Merge Worker
148b737ef2
Merge "Blur developer setting" into rvc-dev am: 59b3974433
...
Change-Id: Iddb1e91eb3aacbc71dde029cbb08873992b92f90
2020-03-15 23:40:09 +00:00
Lucas Dupin
59b3974433
Merge "Blur developer setting" into rvc-dev
2020-03-15 23:28:13 +00:00
Automerger Merge Worker
7d738c3c2f
Merge "Address cleanup comments from aosp/1234607" am: 9dec7506d3 am: 008480e019 am: c7bd3a2336
...
Change-Id: Ibbf56871473d880945601652b90e12b96f09a075
2020-03-13 23:56:35 +00:00
Automerger Merge Worker
c7bd3a2336
Merge "Address cleanup comments from aosp/1234607" am: 9dec7506d3 am: 008480e019
...
Change-Id: I4c52881346cada4fa65d8d9d39f9b461177a3c8e
2020-03-13 23:42:29 +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
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
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
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
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
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
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
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
