|
|
1b25357b13
|
Android->net_adb:add support net adb button in Developer option
|
2018-01-25 17:16:40 +08:00 |
|
|
|
b97cbde9ce
|
Android->Setting:Add the save log option at Developer options
|
2017-03-21 10:42:25 +08:00 |
|
|
|
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 |
|
|
|
579b204dcc
|
add multiwindow control
|
2016-06-24 16:00:13 +08:00 |
|
|
|
d1dd0d369b
|
add dual screen function
|
2016-06-24 16:00:03 +08:00 |
|
|
|
b7f473b5de
|
[packages/apps/Settings] Merge v2.07_20160418
|
2016-05-24 16:47:07 +08:00 |
|
|
|
8a93337635
|
[packages/apps/Settings] fix spelling error: Ehernet -> Ethernet
|
2016-05-24 11:52:02 +08:00 |
|
|
|
c9b5d4a6cb
|
Android->Settings:correct a spell bug for Ethernet
|
2016-01-05 11:49:50 +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 |
|
|
|
efbee11f83
|
[packages/apps/Settings] DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
b/23946860
Change-Id: I2cfcfcbc28d6a1391cae55f505a2b981df9ade2c
(cherry picked from commit 6ceb2ba9b8928b33c30e0c639539c3fe2f27971e)
|
2015-12-31 16:49:21 +08:00 |
|
|
|
8efdc1c2dd
|
A->systemUI:add hide bar function
|
2015-09-08 17:12:24 +08:00 |
|
|
|
5734f56586
|
A->video:set the box version video can support rotation
|
2015-08-18 09:38:23 +08:00 |
|
|
|
3f8870a135
|
Commit of manifest rk3288_box_lollipop_release.xml
|
2015-08-11 11:01:11 +08:00 |
|
|
|
93013a6efc
|
Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml
|
2015-05-20 17:06:22 +08:00 |
|
