Commit Graph

60805 Commits

Author SHA1 Message Date
Automerger Merge Worker
fe4003fd11 Merge "[Settings] Refactor Telephony PreferenceController" am: 1b00c00f79 am: 6865bece3c am: 66913f8aea am: aef5324ab5
Change-Id: I27dd60358d4b78edda513e7f77aa3c67a58428d1
2020-03-13 11:27:21 +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
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
6865bece3c Merge "[Settings] Refactor Telephony PreferenceController" am: 1b00c00f79
Change-Id: I6360f84936f696431af97c0cafe796c93e21f58a
2020-03-13 10:27:57 +00:00
Automerger Merge Worker
01cd224a89 Merge "Fix tests" into rvc-dev am: 6d8e0fed61 am: f08d965b53 am: 1b87244013 am: 627642cc0d
Change-Id: I046f986fa2470ff66eedf5205363f59584cdc5cb
2020-03-13 10:20:24 +00:00
Bonian Chen
1b00c00f79 Merge "[Settings] Refactor Telephony PreferenceController" 2020-03-13 10:11:54 +00:00
Automerger Merge Worker
be6302cbd0 Merge "[Settings] Refactor MmsMessagePreferenceController" am: 1f1843f11c am: 57e2e2424a am: 13e5aa329d am: a777ff42e8
Change-Id: Iba8dea8ade2b8bd28ff83ca94e58bc038519a9c6
2020-03-13 10:05:52 +00:00
Automerger Merge Worker
ce57a9f11f Merge "Fix tests" into rvc-dev am: 6d8e0fed61 am: 95ada20d2e am: 04b93d19fe
Change-Id: I6c38d5f248b3346c754c5fb2386003083e5de7d2
2020-03-13 10:05:42 +00:00
Automerger Merge Worker
053b614f70 Merge "Fix tests" into rvc-dev am: 6d8e0fed61 am: f08d965b53 am: 648fe31181
Change-Id: I3e4306b9e27e09c007bf2840a58f2faee47f863a
2020-03-13 10:05:27 +00:00
Automerger Merge Worker
627642cc0d Merge "Fix tests" into rvc-dev am: 6d8e0fed61 am: f08d965b53 am: 1b87244013
Change-Id: I984e3390f329188362b9a92b84a24a4d9a9adc73
2020-03-13 10:05:24 +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
1b87244013 Merge "Fix tests" into rvc-dev am: 6d8e0fed61 am: f08d965b53
Change-Id: Ic71e492c19a700e05654cb6b1dfb526fff012e7e
2020-03-13 09:51:57 +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
Automerger Merge Worker
ddc90f776a Merge "Remove ignore test case" into rvc-dev am: ad30345078 am: e94cbd98ff am: d86df5d487 am: 1d2fee6c5a
Change-Id: Iacf81df3640c54cdd774309b0d1c3d6f25bc3c06
2020-03-13 05:57:04 +00:00
Automerger Merge Worker
3ad4eb1014 Merge "Remove ignore test case" into rvc-dev am: ad30345078 am: c0035cfc86 am: 7415aa1ffe
Change-Id: I29c6cea9576dd03ff5b7f87b1ac9e282f09d617b
2020-03-13 05:39:37 +00:00
Automerger Merge Worker
526f23e533 Merge "Remove ignore test case" into rvc-dev am: ad30345078 am: e94cbd98ff am: 9d37d5df00
Change-Id: Iea562ed63fd657a55640cf3085935988d8ad7e04
2020-03-13 05:39:24 +00:00
Automerger Merge Worker
1d2fee6c5a Merge "Remove ignore test case" into rvc-dev am: ad30345078 am: e94cbd98ff am: d86df5d487
Change-Id: Ie0d756b795c9f7721f7ca20b03fd7eee5a748d48
2020-03-13 05:39:17 +00: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
d86df5d487 Merge "Remove ignore test case" into rvc-dev am: ad30345078 am: e94cbd98ff
Change-Id: I53566a529f76c804004941076c4549ab873b470c
2020-03-13 05:15:10 +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
ad30345078 Merge "Remove ignore test case" into rvc-dev 2020-03-13 04:45:59 +00:00
Automerger Merge Worker
9ffb6e386f Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 am: 3f6c723044 am: 897eea3bc4 am: e6502b753a
Change-Id: I2692585d9a4c78c6522d470ada18b8b36533a376
2020-03-13 04:15:25 +00:00
Automerger Merge Worker
b4169939a1 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 am: 857f09a45d
Change-Id: I6581c7ac9073fdd31e9cfcda14fa1992be2e0e9f
2020-03-13 04:01:32 +00:00
Automerger Merge Worker
f2755520a1 Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 am: 3f6c723044 am: 2c3ee203bf
Change-Id: I494bd6614828d3fa8cba87f1bc77ced05d06c89b
2020-03-13 04:00:33 +00:00
Automerger Merge Worker
e6502b753a Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 am: 3f6c723044 am: 897eea3bc4
Change-Id: Ic01687809ab05464a514ffeb4bbfac0c78429829
2020-03-13 04:00:23 +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
897eea3bc4 Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 am: 3f6c723044
Change-Id: Ic1db6caf15ef6aed31e27bf1aedf19c0dc9a93cc
2020-03-13 03:40:08 +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
Automerger Merge Worker
45406e4045 Merge "Remove nested scrolling" into rvc-dev am: 4a1f517585 am: ed92f8425d am: 424982b66a am: 00ef0309cf
Change-Id: Idad7f08ff83965a5425cc579f6668023cdb0b647
2020-03-12 23:20:41 +00:00
Automerger Merge Worker
77ca303911 Merge "Remove nested scrolling" into rvc-dev am: 4a1f517585 am: 370fd8650d am: 9418cfeb11
Change-Id: Ie2362eb7aff02d6dcebe889b77e738c9a5ccc9cd
2020-03-12 23:09:17 +00:00
Automerger Merge Worker
6c090cbd38 Merge "Remove nested scrolling" into rvc-dev am: 4a1f517585 am: ed92f8425d am: 411f8fc4f9
Change-Id: Idd8f37349077d7b4ea3f7e45f8e54bfc5342c796
2020-03-12 23:08:59 +00:00
Automerger Merge Worker
00ef0309cf Merge "Remove nested scrolling" into rvc-dev am: 4a1f517585 am: ed92f8425d am: 424982b66a
Change-Id: Ideabb4637cd2ad3e51f3680418f59b0279daa117
2020-03-12 23:08:56 +00:00
Automerger Merge Worker
460299b90d Merge "Log some actions for changing wifi hotspot config" into rvc-dev am: 0ad0a50538 am: ec6828f05e am: af05a79dd1 am: 920f07228f
Change-Id: I0f572dbda8348430f08b46dc62f74c64b9caf28a
2020-03-12 23:01:06 +00:00
Automerger Merge Worker
af7cd6f85b Mark CHANGE_RESTRICT_SAW_INTENT as logging only am: a84c219c30 am: 9469b91a22 am: f63c3aca11 am: 496773632f
Change-Id: I3259e2a3968a3706268c5695bea44cef42faa86b
2020-03-12 22:30:20 +00:00
Automerger Merge Worker
158de66300 Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: 01d61e49af am: f980963514 am: c477088b78 am: a379802366
Change-Id: Ic6a370374bf6e21c74dc12019316c9fb248f1b1c
2020-03-12 22:28:56 +00:00
Automerger Merge Worker
b24e351a84 [automerger skipped] Merge "DO NOT MERGE" into qt-qpr1-dev am: 8697de6be3 -s ours am: 56274ffaa3 am: 1e2416d458 am: 5f99e79af4 am: 2febd6e59f
Change-Id: Id0997a6e4a479dd8905cbe34c082c019a3b4bc15
2020-03-12 22:28:46 +00:00
Automerger Merge Worker
bc062e6ead Update ManageExternalStorageDetailsTest setUidMode am: 143ec3ec2b am: 5fe624a009 am: 8fdc20fd87 am: aa1a8dc3a5
Change-Id: If1ac9026a90b7ae0ece820cfd620a29226ee6a9d
2020-03-12 22:27:51 +00:00