|
|
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 |
|
|
|
62f4900ad1
|
[system/displayd] rk322x : support hdmi-cec
Signed-off-by: Firefly <service@t-firefly.com>
|
2016-05-23 20:37:01 +08:00 |
|
|
|
3b8d626796
|
[system/displayd] rk322x 不用SCREEN_TVOUT_TEST类型，所以删除
Signed-off-by: Firefly <service@t-firefly.com>
|
2016-05-23 20:36:55 +08:00 |
|
|
|
eb7ee5b7a7
|
[system/displayd] 添加savemode，用于分辨率自适应：
1. 当用户设置了一个高分辨率，比如4K
2. 再将盒子接入到一个低分辨率电视上，比如1080P
3. 再将盒子接回原高分辨率电视(4K)，分辨率能自动变为设置里的4K。
Signed-off-by: Firefly <service@t-firefly.com>
|
2016-05-23 20:36:49 +08:00 |
|
|
|
49f86563b3
|
[system/displayd] CVBS: rk3228: add read read screen info
Fix CVBS can't display when HDMI accessed and pulled out
in kernel stage.
Signed-off-by: Firefly <service@t-firefly.com>
|
2016-05-23 20:36:36 +08:00 |
|
|
|
8da5d31128
|
[system/displayd] Support read baseparateter on 3228
Signed-off-by: Firefly <service@t-firefly.com>
|
2016-05-23 20:36:11 +08:00 |
|
|
|
2b5f44213a
|
Merge master branch.
Conflicts:
frameworks/base/core/java/android/content/res/Configuration.java
frameworks/base/core/java/android/provider/Settings.java
frameworks/base/packages/SettingsProvider/res/values/defaults.xml
frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/SystemBars.java
frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
frameworks/base/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
frameworks/base/services/core/java/com/android/server/wm/WindowManagerService.java
hardware/rockchip/camera/CameraHal/CameraHal_board_xml_parse.cpp
vendor/rockchip/common/apps/apps.mk
|
2015-12-31 17:54:05 +08:00 |
|
|
|
7cd2eb335b
|
[system/displayd] aux display resolution set by android
Signed-off-by: Firefly <service@t-firefly.com>
|
2015-12-31 16:53:18 +08:00 |
|
|
|
f6d3ce6476
|
[system/displayd] modify process, avoid being closed and reopen when CVBS display
Signed-off-by: Firefly <service@t-firefly.com>
|
2015-12-31 16:53:10 +08:00 |
|
|
|
ded6e6f7c7
|
A->framwork:make vga and hdmi switch function
|
2015-08-20 15:20:45 +08:00 |
|
|
|
93013a6efc
|
Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml
|
2015-05-20 17:06:22 +08:00 |
|
