Commit Graph

62920 Commits

Author SHA1 Message Date
TreeHugger Robot
bec28bb63a Merge "Add "Play <APP> to" string" into rvc-dev am: 9fd2ebf9ea am: 70f3a1855e
Change-Id: Ic21aeca7696939864726970b608077cc6e1a8314
2020-04-30 04:34:49 +00:00
TreeHugger Robot
c5f7bb9495 Merge "Add "Play <APP> to" string" into rvc-dev am: 9fd2ebf9ea am: 2712b5b0b3
Change-Id: I34528a9490e3fb3ebcc2a519b1ae10d9db9c1d37
2020-04-30 04:34:35 +00:00
TreeHugger Robot
2712b5b0b3 Merge "Add "Play <APP> to" string" into rvc-dev am: 9fd2ebf9ea
Change-Id: I8f0e37d66d1cd6956611ffd12943bb1e0dc4a59f
2020-04-30 04:20:47 +00:00
TreeHugger Robot
70f3a1855e Merge "Add "Play <APP> to" string" into rvc-dev am: 9fd2ebf9ea
Change-Id: Id500f0c233cf861ef844fd0187542c5f7bc3b862
2020-04-30 04:20:00 +00:00
TreeHugger Robot
9fd2ebf9ea Merge "Add "Play <APP> to" string" into rvc-dev 2020-04-30 04:10:39 +00:00
Blake Kragten
d361ccdc34 Merge "Remove enhanced connectivity switch for non-pixel" into rvc-dev am: 6fe60521d1 am: d328f9c80d
Change-Id: I32a4c405930b28711d235f1feafb6dea6681ee9a
2020-04-30 04:03:09 +00:00
Blake Kragten
a6c32c6a41 Merge "Remove enhanced connectivity switch for non-pixel" into rvc-dev am: 6fe60521d1 am: ba264a325f
Change-Id: I538ba9a0d1b62eb720621de79b1b515bdf02c25f
2020-04-30 03:54:45 +00:00
Treehugger Robot
071beb9544 [automerger skipped] Merge changes I6194592d,I5a02f847 am: 44146c8e3b am: ebea74264a -s ours am: 37ee14a792 -s ours
am skip reason: Change-Id I6194592d9a7bf4d4b7993fc344d7392bf5c296aa with SHA-1 c67a0d853b is in history

Change-Id: I51f80b9e2eb590cf9a5b7567980ae85a96a2d17b
2020-04-30 03:54:31 +00:00
Malcolm Chen
67a9e9b3cf [automerger skipped] Define a helper link for 5G limitation in DSDS footer. am: 5e68080b1f am: b6fa2277f6 -s ours am: 38687bab76 -s ours
am skip reason: Change-Id I5a02f847531988217cc6ab47e3b35ed319c1027c with SHA-1 80be9de6d0 is in history

Change-Id: I25a3a7d37dcd3d15ec53a287d01961ee78423268
2020-04-30 03:54:29 +00:00
Blake Kragten
ba264a325f Merge "Remove enhanced connectivity switch for non-pixel" into rvc-dev am: 6fe60521d1
Change-Id: I057a92706e916b54ee5caa4780ec8471c8cb17e9
2020-04-30 03:48:08 +00:00
Blake Kragten
d328f9c80d Merge "Remove enhanced connectivity switch for non-pixel" into rvc-dev am: 6fe60521d1
Change-Id: I9527c519a2daa31ae79a0c3d3ea6f5ccbbca492b
2020-04-30 03:46:56 +00:00
Treehugger Robot
37ee14a792 [automerger skipped] Merge changes I6194592d,I5a02f847 am: 44146c8e3b am: ebea74264a -s ours
am skip reason: Change-Id I6194592d9a7bf4d4b7993fc344d7392bf5c296aa with SHA-1 c67a0d853b is in history

Change-Id: I3e9b8218b9ad4fdeb4b7d91b66f66881344b5036
2020-04-30 03:33:51 +00:00
Malcolm Chen
38687bab76 [automerger skipped] Define a helper link for 5G limitation in DSDS footer. am: 5e68080b1f am: b6fa2277f6 -s ours
am skip reason: Change-Id I5a02f847531988217cc6ab47e3b35ed319c1027c with SHA-1 80be9de6d0 is in history

Change-Id: I2151c3c3abe64328ef6f69adade622fb7b9700b5
2020-04-30 03:33:49 +00:00
Blake Kragten
6fe60521d1 Merge "Remove enhanced connectivity switch for non-pixel" into rvc-dev 2020-04-30 03:24:52 +00:00
Treehugger Robot
ebea74264a Merge changes I6194592d,I5a02f847 am: 44146c8e3b
Change-Id: I2ebc5edd89fb32b2698c8cfd6acb20342c9cec17
2020-04-30 03:17:19 +00:00
Malcolm Chen
b6fa2277f6 Define a helper link for 5G limitation in DSDS footer. am: 5e68080b1f
Change-Id: I3377b9cbc1d4722a8a96c18f40d1118e476c4ef7
2020-04-30 03:17:16 +00:00
Treehugger Robot
44146c8e3b Merge changes I6194592d,I5a02f847
* changes:
  Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter
  Define a helper link for 5G limitation in DSDS footer.
2020-04-30 02:56:34 +00:00
Tim Peng
be4ed2a3cb Add "Play <APP> to" string
Bug: 155345595
Test: build pass
Change-Id: Ib656f0db2efa6f777ada2c2565493775e72634ae
2020-04-30 02:13:24 +00:00
TreeHugger Robot
4539d41abc Merge "Fix history task stack" into rvc-dev am: 7d1cfa4d84 am: 7a41660242
Change-Id: I12983c2ed072beec2082bd671b35602663437e63
2020-04-29 23:29:41 +00:00
TreeHugger Robot
7c24739c48 Merge "Fix history task stack" into rvc-dev am: 7d1cfa4d84 am: 9e4e794f09
Change-Id: Ibfec3437d07726fda09d4cf4a8976356965930d3
2020-04-29 23:29:05 +00:00
TreeHugger Robot
9e4e794f09 Merge "Fix history task stack" into rvc-dev am: 7d1cfa4d84
Change-Id: Ib54bda42c21dca85c8b58374d03c19f2f9c3ce15
2020-04-29 23:19:53 +00:00
TreeHugger Robot
7a41660242 Merge "Fix history task stack" into rvc-dev am: 7d1cfa4d84
Change-Id: I6112f47da149986b167befee9198d9f62d0c974d
2020-04-29 23:19:32 +00:00
Treehugger Robot
8d55c46017 Merge "Disable 'Mobile data' selection after removing SIM" am: 87d1e30f17 am: d6859736a4 am: 99c2ccf984
Change-Id: I2f8c1e5b290340ae03addbf9eb46b8ac9011a79c
2020-04-29 23:17:54 +00:00
Bob Badour
f761f7f7b5 Merge "Remove MODULE_LICENSE_APACHE2 from apps/Settings" am: 2ab7555be5 am: 2cd2b9e4ab am: 7c198d980d
Change-Id: I76f3dae6858c484dee5ddb09a3956cdaac12f331
2020-04-29 23:17:47 +00:00
TreeHugger Robot
7d1cfa4d84 Merge "Fix history task stack" into rvc-dev 2020-04-29 23:04:13 +00:00
Treehugger Robot
99c2ccf984 Merge "Disable 'Mobile data' selection after removing SIM" am: 87d1e30f17 am: d6859736a4
Change-Id: I77a6c089aec6fe57f79ef7dc7f6630ee8fc68ae7
2020-04-29 23:01:07 +00:00
Bob Badour
7c198d980d Merge "Remove MODULE_LICENSE_APACHE2 from apps/Settings" am: 2ab7555be5 am: 2cd2b9e4ab
Change-Id: I0f269573abc1d68816664f1ef020cb04dacfa69e
2020-04-29 23:00:38 +00:00
Treehugger Robot
d6859736a4 Merge "Disable 'Mobile data' selection after removing SIM" am: 87d1e30f17
Change-Id: I14dc87ff0f185bdbfb5734b6501f727e2cb19792
2020-04-29 22:50:24 +00:00
Bob Badour
2cd2b9e4ab Merge "Remove MODULE_LICENSE_APACHE2 from apps/Settings" am: 2ab7555be5
Change-Id: Ifabb259302be383fad6555849876a4d7e3a0a71a
2020-04-29 22:50:17 +00:00
Treehugger Robot
87d1e30f17 Merge "Disable 'Mobile data' selection after removing SIM" 2020-04-29 22:34:39 +00:00
Grace Jia
7098379555 Disable 'Mobile data' selection after removing SIM
Bug: 153895858
Test: Manually remove SIM and test
Change-Id: I5934b01c047172ae2269e77e2fe0945aacba4ca1
Exempt-From-Owner-Approval: Telephony settings
2020-04-29 22:34:29 +00:00
Bob Badour
2ab7555be5 Merge "Remove MODULE_LICENSE_APACHE2 from apps/Settings" 2020-04-29 22:32:10 +00:00
Bob Badour
edb5a95f5d Remove MODULE_LICENSE_APACHE2 from apps/Settings
Repositories containing third-party code need a METADATA and a
license_type. Repositories containing only first-party code no longer
need a MODULE_LICENSE_* file.

Bug: 68860345
Bug: 69058154
Bug: 151953481

Test: no code changes
Change-Id: I818112c2ff1f9c2fffeb92291b03c7753c0b083e
2020-04-29 13:12:26 -07:00
TreeHugger Robot
7bb2488099 Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3 am: f57fcea662
Change-Id: Ic026c305eabbd86dc780292d666d0aa47e0c8ca9
2020-04-29 18:55:06 +00:00
TreeHugger Robot
e22a776b12 Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3 am: 4d6ad1dec9
Change-Id: I72bfce2fd18f59c010ccb89203a7a7b3feb73ca6
2020-04-29 18:54:56 +00:00
TreeHugger Robot
4d6ad1dec9 Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3
Change-Id: Ia1d018e763df06a1bd9c750f805573a3070e7296
2020-04-29 18:40:34 +00:00
TreeHugger Robot
f57fcea662 Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3
Change-Id: Id187f39dc00fc84479f43545b71f70a64fab03d2
2020-04-29 18:40:08 +00:00
TreeHugger Robot
7e94c5e3b3 Merge "Fix icon color in dark theme." into rvc-dev 2020-04-29 18:02:45 +00:00
kholoud mohamed
7c84508e16 Fix icon color in dark theme.
Bug: 154582949
Test: visual testing
Change-Id: Ibb17f06c5b1d9745294af460565aa078c4e2baf2
2020-04-29 17:43:34 +01:00
Julia Reynolds
c50085fed5 Merge "Remove unused development setting" into rvc-dev am: e2eb832033 am: c6fe4407fe
Change-Id: I5a1dd1e140503957a3335b92f0687a928aa40b30
2020-04-29 15:53:15 +00:00
Automerger Merge Worker
e994133351 Merge "Fix bubble tests am: 99b363fb18 am: 8c5d6b6d5f" into rvc-d1-dev-plus-aosp 2020-04-29 15:53:06 +00:00
Julia Reynolds
d695f0e907 Fix bubble tests am: 99b363fb18 am: 8c5d6b6d5f
Change-Id: I6b29bb7f13044a899ef05094851bf9246bf3a283
2020-04-29 15:53:02 +00:00
Julia Reynolds
68d3972a36 Merge "Remove unused development setting" into rvc-dev am: e2eb832033 am: 04b6152ef0
Change-Id: I14a3372d2ca7304667e3923b94d1a377eb927aa9
2020-04-29 15:52:56 +00:00
Julia Reynolds
90d41ad625 Fix bubble tests am: 99b363fb18 am: d4045296ba
Change-Id: I5eef62051373d7efbeb2b1bc63629f60edef931d
2020-04-29 15:52:44 +00:00
Julia Reynolds
04b6152ef0 Merge "Remove unused development setting" into rvc-dev am: e2eb832033
Change-Id: Ic77ae688d2b211a1dc3ad5c0b8e2b5967698604e
2020-04-29 15:42:46 +00:00
Julia Reynolds
c6fe4407fe Merge "Remove unused development setting" into rvc-dev am: e2eb832033
Change-Id: I834d268678426e9173edacb0c5c9a52fe6941946
2020-04-29 15:42:45 +00:00
Julia Reynolds
d4045296ba Fix bubble tests am: 99b363fb18
Change-Id: If84a190e7c59cdaed74c0277a2703860b85785e1
2020-04-29 15:42:00 +00:00
Julia Reynolds
8c5d6b6d5f Fix bubble tests am: 99b363fb18
Change-Id: Ie06e993258c7c3069e28fb280ed24bed32675133
2020-04-29 15:41:47 +00:00
Julia Reynolds
e2eb832033 Merge "Remove unused development setting" into rvc-dev 2020-04-29 15:25:24 +00:00
Julia Reynolds
99b363fb18 Fix bubble tests
Test: atest
Fixes: 155239388
Change-Id: I8a32098b9a36ea1c8eabaf235b37d1e190419937
2020-04-29 13:58:46 +00:00