Commit Graph

10 Commits

Author SHA1 Message Date
zjy
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
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
d890a18090 Android->packoages:modify the display_setting 2015-12-31 18:16:09 +08:00
djw
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
f4e8ee44ff [packages/apps/Settings] Add translations for Security Patch Level.
Bug: 23946860
(cherry picked from commit 8e5f4987f27f52386a2de158fee0e7cb9fff789b)

Change-Id: I996da0f40af222467cf5d9302434927958c27907
2015-12-31 16:49:29 +08:00
cjp
8efdc1c2dd A->systemUI:add hide bar function 2015-09-08 17:12:24 +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