Riddle Hsu
7b044fee47
Merge changes Ic966923a,I92c6dfac,Id370d798 into rvc-dev am: 33cf9d091c am: 940d7f37b3 am: 9fee1c6089
...
Change-Id: Ib2f17bd9eae61e174414cc23c655efe0134d3dbc
2020-04-29 09:24:02 +00:00
Tracy Zhou
85974a78b6
Merge "Add pebble shape to Android.mk" into rvc-dev am: e13fab2d48 am: 8a2cf06d8c am: 089d329727 am: 10a96856ac
...
Change-Id: Icff0d5981660df0dbe86fe4a3fc31b13690fe771
2020-04-29 09:08:27 +00:00
Riddle Hsu
9fee1c6089
Merge changes Ic966923a,I92c6dfac,Id370d798 into rvc-dev am: 33cf9d091c am: 940d7f37b3
...
Change-Id: I3f69fd27d99624bff80d2e269384edb8336503b8
2020-04-29 09:08:06 +00:00
Riddle Hsu
940d7f37b3
Merge changes Ic966923a,I92c6dfac,Id370d798 into rvc-dev am: 33cf9d091c
...
Change-Id: If325c31e261487a7adaf3ee99c4655ab15f88df0
2020-04-29 08:51:00 +00:00
Automerger Merge Worker
c79e602475
Merge "Merge "Add pebble shape to Android.mk" into rvc-dev am: e13fab2d48 am: 3965460489" into rvc-d1-dev-plus-aosp am: ef6d2426b9
...
Change-Id: Ie9a367bb7ba49ac3865a26ff1c637ef8478df185
2020-04-29 08:50:56 +00:00
Tracy Zhou
c409dcb51b
Merge "Add pebble shape to Android.mk" into rvc-dev am: e13fab2d48 am: 8a2cf06d8c am: 6eed611bb7
...
Change-Id: I8aefa19fc3ef931b85193983200a32b1221e771c
2020-04-29 08:50:16 +00:00
Tracy Zhou
10a96856ac
Merge "Add pebble shape to Android.mk" into rvc-dev am: e13fab2d48 am: 8a2cf06d8c am: 089d329727
...
Change-Id: I807c53983881ca8ff1569e233c3899d43fdd86db
2020-04-29 08:49:55 +00:00
Automerger Merge Worker
ef6d2426b9
Merge "Merge "Add pebble shape to Android.mk" into rvc-dev am: e13fab2d48 am: 3965460489" into rvc-d1-dev-plus-aosp
2020-04-29 08:34:37 +00:00
Tracy Zhou
293ff0f4b1
Merge "Add pebble shape to Android.mk" into rvc-dev am: e13fab2d48 am: 3965460489
...
Change-Id: I3f2e14954fdb1d5bf747b3fcedece2418e6e880c
2020-04-29 08:34:26 +00:00
Tracy Zhou
089d329727
Merge "Add pebble shape to Android.mk" into rvc-dev am: e13fab2d48 am: 8a2cf06d8c
...
Change-Id: I0290c07902f542e2ea4b52e0d154229e4d03ccdb
2020-04-29 08:34:21 +00:00
Tracy Zhou
6eed611bb7
Merge "Add pebble shape to Android.mk" into rvc-dev am: e13fab2d48 am: 8a2cf06d8c
...
Change-Id: I2f8a0334fc46bbcc716b20120e5684636b395953
2020-04-29 08:34:15 +00:00
Riddle Hsu
33cf9d091c
Merge changes Ic966923a,I92c6dfac,Id370d798 into rvc-dev
...
* changes:
Clear fixed rotation if display config does not change
Polish fixed rotated recents animation
Extensive handling of fixed rotation launching app
2020-04-29 08:32:47 +00:00
Fiona Campbell
b95ea305dd
Merge "Add lights HAL to watchdog" into rvc-dev am: 700c810706 am: 133c7f52ba am: e97f7f4144 am: 62b3ebcf8d
...
Change-Id: Ic2fc224df04f0543052e8c0484f545e5de62ce90
2020-04-29 08:28:57 +00:00
Tracy Zhou
3965460489
Merge "Add pebble shape to Android.mk" into rvc-dev am: e13fab2d48
...
Change-Id: If54ca2c15126212c7c4e2009fe324754399ae946
2020-04-29 08:21:01 +00:00
Tracy Zhou
8a2cf06d8c
Merge "Add pebble shape to Android.mk" into rvc-dev am: e13fab2d48
...
Change-Id: Iec2257a5b00abbbe490b40c245bd324c77d4d7ac
2020-04-29 08:19:33 +00:00
Fiona Campbell
5a0166d81a
Merge "Add lights HAL to watchdog" into rvc-dev am: 700c810706 am: 77b0d5d7c3 am: 3c38b04048
...
Change-Id: I51084d4b508c3948991b481ea648bf9eda9e33c3
2020-04-29 08:14:45 +00:00
Fiona Campbell
62b3ebcf8d
Merge "Add lights HAL to watchdog" into rvc-dev am: 700c810706 am: 133c7f52ba am: e97f7f4144
...
Change-Id: I0cfaef3c08d79186ce97de379deb597964d99261
2020-04-29 08:14:26 +00:00
Fiona Campbell
a433bd8683
Merge "Add lights HAL to watchdog" into rvc-dev am: 700c810706 am: 133c7f52ba am: 208f019388
...
Change-Id: I5a4bff77aebbe4102a72aa9d20813334301493ad
2020-04-29 08:14:12 +00:00
Fiona Campbell
3c38b04048
Merge "Add lights HAL to watchdog" into rvc-dev am: 700c810706 am: 77b0d5d7c3
...
Change-Id: I883792e46ad1cd78a059bf54b9dc74f09b2d4d20
2020-04-29 08:08:09 +00:00
Tracy Zhou
e13fab2d48
Merge "Add pebble shape to Android.mk" into rvc-dev
2020-04-29 08:05:19 +00:00
Fiona Campbell
e97f7f4144
Merge "Add lights HAL to watchdog" into rvc-dev am: 700c810706 am: 133c7f52ba
...
Change-Id: I702494dcee694c7441f8a838846c69e3d49dbd18
2020-04-29 08:02:12 +00:00
Fiona Campbell
208f019388
Merge "Add lights HAL to watchdog" into rvc-dev am: 700c810706 am: 133c7f52ba
...
Change-Id: I8ac68a8dab02d837d6e9c1f9d7118aba78d754a3
2020-04-29 08:02:06 +00:00
Fiona Campbell
77b0d5d7c3
Merge "Add lights HAL to watchdog" into rvc-dev am: 700c810706
...
Change-Id: I4dd31205beb44037fdea6082f4c1d0a3e4210c42
2020-04-29 07:52:20 +00:00
Fiona Campbell
133c7f52ba
Merge "Add lights HAL to watchdog" into rvc-dev am: 700c810706
...
Change-Id: Ibbb84b78a5c972490d6d0a33866bdf98d8d02585
2020-04-29 07:51:47 +00:00
Fiona Campbell
700c810706
Merge "Add lights HAL to watchdog" into rvc-dev
2020-04-29 07:30:12 +00:00
TreeHugger Robot
35dee27490
[automerger skipped] Merge "Fix HdmiCecLocalDevicePlaybackTest" into rvc-dev am: 6b6cf16740 am: a77e246d63 am: 36be3fc81b am: 4f9e748d55 -s ours
...
am skip reason: Change-Id I44a11d8d6365e32332818b08c84583c9afb5aa15 with SHA-1 f29759cd32
2020-04-29 07:07:17 +00:00
TreeHugger Robot
e127de89e4
[automerger skipped] Merge "Fix HdmiCecLocalDevicePlaybackTest" into rvc-dev am: 6b6cf16740 am: fb79f914af am: 5e76e92a34 -s ours
...
am skip reason: Change-Id I44a11d8d6365e32332818b08c84583c9afb5aa15 with SHA-1 f29759cd32
2020-04-29 06:51:38 +00:00
TreeHugger Robot
4f9e748d55
Merge "Fix HdmiCecLocalDevicePlaybackTest" into rvc-dev am: 6b6cf16740 am: a77e246d63 am: 36be3fc81b
...
Change-Id: I91e16735b173a90532234ed8acc619ecce4c3265
2020-04-29 06:51:36 +00:00
TreeHugger Robot
d254997c7b
Merge "Fix HdmiCecLocalDevicePlaybackTest" into rvc-dev am: 6b6cf16740 am: a77e246d63 am: 1a5be56870
...
Change-Id: Iaca73154674d09b2d5cdf872f532d8f677ae126f
2020-04-29 06:51:31 +00:00
TreeHugger Robot
36be3fc81b
Merge "Fix HdmiCecLocalDevicePlaybackTest" into rvc-dev am: 6b6cf16740 am: a77e246d63
...
Change-Id: I4f66ab4f3086cfbee432756af6992f3aed1cec40
2020-04-29 06:40:51 +00:00
TreeHugger Robot
5e76e92a34
Merge "Fix HdmiCecLocalDevicePlaybackTest" into rvc-dev am: 6b6cf16740 am: fb79f914af
...
Change-Id: Iee444b4909f559222bcb7707cc07c4446589bb51
2020-04-29 06:40:47 +00:00
TreeHugger Robot
1a5be56870
Merge "Fix HdmiCecLocalDevicePlaybackTest" into rvc-dev am: 6b6cf16740 am: a77e246d63
...
Change-Id: I744b9562044c59932e1ca75454f6d91cd5f85c33
2020-04-29 06:40:36 +00:00
TreeHugger Robot
fb79f914af
Merge "Fix HdmiCecLocalDevicePlaybackTest" into rvc-dev am: 6b6cf16740
...
Change-Id: I6d9654326dd00d287470c4260cba03e5aba1d66b
2020-04-29 06:28:01 +00:00
TreeHugger Robot
a77e246d63
Merge "Fix HdmiCecLocalDevicePlaybackTest" into rvc-dev am: 6b6cf16740
...
Change-Id: I4a8578dddcb76bbb4c5fc0e971d7185840d471e8
2020-04-29 06:27:56 +00:00
TreeHugger Robot
725f00bba8
Merge "Add RoleControllerManagerTest." into rvc-dev am: 447914fcfe am: 0b5b876873 am: 333730d6d7 am: b727aadaeb
...
Change-Id: I1b12de7453882cf52be5dafc8cb86de88e155bf2
2020-04-29 06:22:45 +00:00
Tracy Zhou
d2c99f79ca
Merge "Update icon shape for Sam" into rvc-dev am: 1bad463073 am: 91cc44c324 am: 55181e8006 am: 9c3f928119
...
Change-Id: I093b725b6549586a861c38685243f00eda8599d9
2020-04-29 06:21:14 +00:00
TreeHugger Robot
cfde90f9c2
Merge "Move ImeAwareTextEdit from Settings to android.widget" into rvc-dev am: d3b000cafe am: 04ef13f4d6 am: 09b1d5d5bf am: 4b7781a72c
...
Change-Id: Ia2d7b086ba1b0747cb84f1be83994de65b4c27bd
2020-04-29 06:20:44 +00:00
TreeHugger Robot
b727aadaeb
Merge "Add RoleControllerManagerTest." into rvc-dev am: 447914fcfe am: 0b5b876873 am: 333730d6d7
...
Change-Id: Ia0eac5defff2e20b2159df42f54ff0d465d2fb4a
2020-04-29 06:12:20 +00:00
TreeHugger Robot
692f491eaf
Merge "Add RoleControllerManagerTest." into rvc-dev am: 447914fcfe am: e1516315da am: 4eddde22e0
...
Change-Id: I16afda64d7d380612d25addbf33af88adee10e3d
2020-04-29 06:11:54 +00:00
TreeHugger Robot
6b6cf16740
Merge "Fix HdmiCecLocalDevicePlaybackTest" into rvc-dev
2020-04-29 06:11:52 +00:00
TreeHugger Robot
079191abb3
Merge "Add RoleControllerManagerTest." into rvc-dev am: 447914fcfe am: 0b5b876873 am: a088f92936
...
Change-Id: I213f7210962a0973e26fdb5928336ef34ecee04a
2020-04-29 06:11:38 +00:00
Tracy Zhou
c5dec251da
Merge "Update icon shape for Sam" into rvc-dev am: 1bad463073 am: 0602525c75 am: 62e0587034
...
Change-Id: I26b13c371562246d7c6897c3e966ca3eb2102dfd
2020-04-29 06:10:14 +00:00
Automerger Merge Worker
55ae9572a6
Merge "Merge "Update icon shape for Sam" into rvc-dev am: 1bad463073 am: 91cc44c324" into rvc-d1-dev-plus-aosp am: 0ea5679f35
...
Change-Id: Id01fdf9007fe3a0fe6575e82e7d329c289b40eb8
2020-04-29 06:09:54 +00:00
Automerger Merge Worker
caef7be38b
Merge "Merge "Move ImeAwareTextEdit from Settings to android.widget" into rvc-dev am: d3b000cafe am: eb284a2bcb" into rvc-d1-dev-plus-aosp am: 926a74b828
...
Change-Id: I2dc34f45aa8378802116cf0b55f26ca86fceadb4
2020-04-29 06:08:45 +00:00
TreeHugger Robot
4eddde22e0
Merge "Add RoleControllerManagerTest." into rvc-dev am: 447914fcfe am: e1516315da
...
Change-Id: I0ccc3caea328e287497dff185b6a2f9068958f4c
2020-04-29 06:08:15 +00:00
TreeHugger Robot
a088f92936
Merge "Add RoleControllerManagerTest." into rvc-dev am: 447914fcfe am: 0b5b876873
...
Change-Id: Ieb5eceadbb7fa3e8af73dc215c77b66d741def10
2020-04-29 06:07:43 +00:00
TreeHugger Robot
333730d6d7
Merge "Add RoleControllerManagerTest." into rvc-dev am: 447914fcfe am: 0b5b876873
...
Change-Id: Id1c4f5d777d03fcf9a07ccae128d42a6e08bc38b
2020-04-29 06:07:36 +00:00
Tracy Zhou
9c3f928119
Merge "Update icon shape for Sam" into rvc-dev am: 1bad463073 am: 91cc44c324 am: 55181e8006
...
Change-Id: I12b3e01966e84dd01b99f6939d87b1744fc7aaf9
2020-04-29 06:07:17 +00:00
TreeHugger Robot
91be4c0266
Merge "Move ImeAwareTextEdit from Settings to android.widget" into rvc-dev am: d3b000cafe am: 04ef13f4d6 am: 24ba41099a
...
Change-Id: I4a517fb090afb1301e64bbfa86b6667b8ae80958
2020-04-29 06:06:46 +00:00
TreeHugger Robot
4b7781a72c
Merge "Move ImeAwareTextEdit from Settings to android.widget" into rvc-dev am: d3b000cafe am: 04ef13f4d6 am: 09b1d5d5bf
...
Change-Id: Ie26e8b0584e22e80a9f5eae52e068126f202f49c
2020-04-29 06:06:41 +00:00
