cjp ec5e22c526 Merge branch 'rockchip_master' into firefly-git ...

Conflicts:
	frameworks/base/packages/SystemUI/res/layout-sw720dp/navigation_bar_win.xml
	frameworks/base/packages/SystemUI/res/layout-sw800dp/navigation_bar_win.xml
	frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	hardware/rockchip/camera/Config/cam_board_rk3288.xml
	hardware/rockchip/camera/SiliconImage/isi/drv/TC358749XBG_MIPI_YUV/Android.mk
	hardware/rockchip/camera/SiliconImage/isi/drv/TC358749XBG_MIPI_YUV/include_priv/TC358749XBG_priv.h
	hardware/rockchip/camera/SiliconImage/isi/drv/TC358749XBG_MIPI_YUV/source/TC358749XBG_PARREL.c
	hardware/rockchip/camera/SiliconImage/isi/drv/TC358749XBG_MIPI_YUV/source/TC358749XBG_tables.c
	kernel/drivers/video/rockchip/Kconfig
	kernel/drivers/video/rockchip/Makefile
	packages/apps/Settings/res/values/strings.xml
	packages/apps/Settings/src/com/android/settings/dualscreen/DualscreenSettings.java

2016-07-08 11:57:40 +08:00

..

Android.mk

[system/displayd] rk322x : support hdmi-cec

2016-05-23 20:37:01 +08:00

BcshManager.cpp

[system/displayd] bcsh is enabled when bcsh value is changed

2016-05-23 20:36:43 +08:00

BcshManager.h

[system/displayd] bcsh is enabled when bcsh value is changed

2016-05-23 20:36:43 +08:00

Cecmanager.cpp

[system/displayd] rk322x : support hdmi-cec

2016-05-23 20:37:01 +08:00

Cecmanager.h

[system/displayd] rk322x : support hdmi-cec

2016-05-23 20:37:01 +08:00

CommandListener.cpp

Commit of manifest rk3288_box_lollipop_release.xml

2015-08-11 11:01:11 +08:00

CommandListener.h

Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml

2015-05-20 17:06:22 +08:00

Config.h

Android->Displayd:modify DEFALUT_SCREEN_SCALE value

2016-03-10 10:13:32 +08:00

ddc.c

Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml

2015-05-20 17:06:22 +08:00

displayd_add_FOR_ROCKCHIP_RBOX

Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml

2015-05-20 17:06:22 +08:00

DisplaydCommand.cpp

Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml

2015-05-20 17:06:22 +08:00

DisplaydCommand.h

Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml

2015-05-20 17:06:22 +08:00

DisplayManager.cpp

Merge branch 'rockchip_master' into firefly-git

2016-07-08 11:57:40 +08:00

DisplayManager.h

[system/displayd] 添加savemode，用于分辨率自适应：

2016-05-23 20:36:49 +08:00

Hdcp.cpp

Commit of manifest rk3288_box_lollipop_release.xml

2015-08-11 11:01:11 +08:00

Hdcp.h

Commit of manifest rk3288_box_lollipop_release.xml

2015-08-11 11:01:11 +08:00

main.cpp

Commit of manifest rk3288_box_lollipop_release.xml

2015-08-11 11:01:11 +08:00

NetlinkHandler.cpp

[system/displayd] rk322x : support hdmi-cec

2016-05-23 20:37:01 +08:00

NetlinkHandler.h

Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml

2015-05-20 17:06:22 +08:00

NetlinkManager.cpp

Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml

2015-05-20 17:06:22 +08:00

NetlinkManager.h

Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml

2015-05-20 17:06:22 +08:00

OtgManager.cpp

Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml

2015-05-20 17:06:22 +08:00

OtgManager.h

Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml

2015-05-20 17:06:22 +08:00

ResponseCode.h

Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml

2015-05-20 17:06:22 +08:00

ScreenScaleManager.cpp

[system/displayd] 允许通过获取属性值来修改缩放最大等分

2016-05-23 20:37:07 +08:00

ScreenScaleManager.h

Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml

2015-05-20 17:06:22 +08:00