Commit Graph

183 Commits

Author SHA1 Message Date
cjp
e0b865f2fb Android->framework:add SchedulePowerOnOff support 2017-10-19 19:50:54 +08:00
57751d7014 Android->frameworks:add rotation lock toggle 2017-10-14 18:06:05 +08:00
cjp
b2f29e61e3 Android->framework:recent list boot clear 2017-07-22 10:55:03 +08:00
96af4db4f4 Android->USBhost:fix the Configuration read by USB printer 2017-06-09 14:55:45 +08:00
53a1456371 Android->Restore Screenscale Settings 2017-03-28 11:50:09 +08:00
89735783fc Android->set default networkmode LTE 2017-03-21 10:42:17 +08:00
cfbea37129 Android->NtpTime:在同步时间时,加入台湾和美国的3个ntp服务器轮询 2016-11-25 16:50:17 +08:00
b223c82691 Android->Settings:关闭时区同步 2016-11-25 16:50:13 +08:00
c4d334a7d8 Android->SettingsProvider: 修改NTP服务器 2016-11-25 16:50:08 +08:00
cjp
3e3038cb26 Android->framework:fix btn default color 2016-10-26 17:40:55 +08:00
15807170cb Android->DeviceTest:add first time boot go to DeviceTest 2016-10-13 10:58:12 +08:00
5ca51fd184 frameworks->config: enable config_useDevInputEventForAudioJack 2016-08-20 11:34:36 +08:00
cjp
26b7b5e1d7 Android->framework:fix dual screen icon can not show 2016-07-11 16:17:22 +08:00
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
a340eef03f [frameworks/base] fix Bug: VR switch button delay 2016-05-23 20:28:12 +08:00
89f7b50ba3 [frameworks/base] support wfd sink for box version1.0 2016-05-23 20:28:06 +08:00
9cd14fc2ef [frameworks/base] dont start window when enbaled multiwindow 2016-05-23 20:28:00 +08:00
0c6720a065 [frameworks/base] fix error in 3307991f49f820757bc1ad074841d3dfed3876b9
Signed-off-by: Firefly <service@t-firefly.com>
2016-05-23 20:27:54 +08:00
5bd3ddcb4d [frameworks/base] add mem optimise for 1G ddr machine,controlled by BOARD_WITH_MEM_OPTIMISE in BoardConfig.xml
Signed-off-by: Firefly <service@t-firefly.com>
2016-05-23 20:27:47 +08:00
19ac305691 [frameworks/base] From 0fdfb301e73f85b9db2fa4ce6ee8349acebd06be Mon Sep 17 00:00:00 2001
From: Firefly <service@t-firefly.com>
Date: Fri, 13 Nov 2015 21:52:18 +0000
Subject: [PATCH 2/2] DO NOT MERGE. Prevent recents from coming up when in SUW

Bug: 25229538
Change-Id: If4f276d3f7c04fd89011068d90a3c3c60593bc05
(cherry picked from commit 84669ca8de55d38073a0dcb01074233b0a417541)

Signed-off-by: Firefly <service@t-firefly.com>
2016-05-23 20:27:41 +08:00
b3fe9ba71a [frameworks/base] From 5e834aed18b70f2b2af86c5a4a0a3b6873aea5f4 Mon Sep 17 00:00:00 2001
From: Firefly <service@t-firefly.com>
Date: Tue, 10 Nov 2015 16:19:38 -0800
Subject: [PATCH 1/2] DO NOT MERGE Ensure that the device is provisioned before
 showing Recents.

 Bug: 25476219
 Change-Id: I5bb9cca74790521de71c0037b4f2421c3d21b3f6
 (cherry picked from commit 16a76dadcc23a13223e9c2216dad1fe5cad7d6e1)

Signed-off-by: Firefly <service@t-firefly.com>
2016-05-23 20:27:35 +08:00
52eaa643e9 [frameworks/base] fix java.lang.NullPointerException
"Attempt to invoke virtual method
  'java.lang.String android.content.ComponentName.flattenToShortString()' on a null object reference"
at com.android.server.wm.WindowManagerService.addAppToken(WindowManagerService.java:4532)
2016-05-23 20:27:29 +08:00
038e08077a [frameworks/base] update new api for multiwindow jar
v4.0
2016-05-23 20:27:23 +08:00
70125c9a13 [frameworks/base] Add AudioTrack MODE_STREAM_DIRECT mode to enable passthrough through framework 2016-05-23 20:27:16 +08:00
bd3e59f278 [frameworks/base] Set AudioTrack SAMPLE_RATE_HZ_MAX = 192000 2016-05-23 20:27:10 +08:00
dfdbb06d89 [frameworks/base] MultiWindow:surpport longpress Home button for deep cleaning processes 2016-05-23 20:27:04 +08:00
ae4e7bbca6 [frameworks/base] MultiWindow SystemUI:default show notification on HeadsUpNotificationView,fix Calendar 2016-05-23 20:26:58 +08:00
d62086c2af [frameworks/base] 修改qq视频的二分屏适配
更新默认应用启动配置
2016-05-23 20:26:52 +08:00
571ed473a4 [frameworks/base] modify presentation cann't full screen 2016-05-23 20:26:46 +08:00
f28fe8e091 [frameworks/base] Sync extras bundle comparison can throw NPE
BUG: 23591205
Change-Id: Ic6404c0befe70c34b078e0eae6a627826173d82c
(cherry picked from commit 9ad2c8403354a985258c098681067e74b9e2f638)
(cherry picked from commit c0f39c1ece72a05c796f7ba30b7a2b5b580d5025)
2016-05-23 20:26:39 +08:00
c06734c4a3 [frameworks/base] MultiWindow:fix f4fe5a4b1b6fcd4cbb3489872e25010dc02bf9d7 2016-05-23 20:26:33 +08:00
ee8bf3b918 [frameworks/base] 1.修改视频应用二分屏的兼容性
2.修改wifi万能钥匙应用的兼容性
2016-05-23 20:26:26 +08:00
90819e28f7 [frameworks/base] MultiWindow:fix ui error for tudou apk when switch to halfscreen mode 2016-05-23 20:26:20 +08:00
4e8cf7e119 [frameworks/base] Delay hiding the cast icon for 3 seconds. DO NOT MERGE
Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.

(cherry picked from commit 8fd25bf7711aabffe73213ba1f9056f285270695)

Bug: 19121797
Change-Id: I7a5c12b371b735c756ca5a3e8716c385fb3fbfe9
2016-05-23 20:26:14 +08:00
bae66be61c [frameworks/base] DO NOT MERGE Send next alarm's show intent via PendingIntent
Bug: 23909438
Change-Id: I0bb277c8385b7936fbda03cd76f02248c4fc55de
(cherry picked from commit e70e8ac93807c51240b2cd9afed35bf454ea00b3)
2016-05-23 20:26:08 +08:00
c63a02b2b6 [frameworks/base] 1。修改手机模式模式判断
2. 修改某些应用子窗口位置大小
3. office应用界面显示完整
2016-05-23 20:26:02 +08:00
4ce32a0ae8 [frameworks/base] MultiWindow:when change app multiwindow-mode,restart it 2016-05-23 20:25:56 +08:00
42616b95d3 [frameworks/base] MultiWindow:default not show search panel for home button 2016-05-23 20:25:50 +08:00
8b929f8ffb [frameworks/base] MultiWindow:fix notifications panel not dismiss when start activity from panel 2016-05-23 20:25:43 +08:00
49c88b376b [frameworks/base] fix when systemUI died,it can not restart in low ram devices
Signed-off-by: Firefly <service@t-firefly.com>
2016-05-23 20:25:37 +08:00
b6bab2e017 [frameworks/base] modify office merge conflict
commit 8bb17e8affe5ece4ec43608b8beda8934f1cb10b
Author: Firefly <service@t-firefly.com>
Date:   Thu Dec 3 10:12:09 2015 +0800

    force stop packagename when rmTask (office)
2016-05-23 20:25:31 +08:00
6c880edc8d [frameworks/base] 修改视频二分模式问题
修改模式切换不会立即切换问题
修改导航栏背景问题
2016-05-23 20:25:25 +08:00
37490a83d5 [frameworks/base] 修改二分屏移动 2016-05-23 20:25:18 +08:00
b3efc210f5 [frameworks/base] force stop packagename when rmTask (office) 2016-05-23 20:25:12 +08:00
0bd24e6a89 [frameworks/base] MultiWindow:systembar use gross glass effect for new UI style 2016-05-23 20:25:05 +08:00
26cbc2a0e0 [frameworks/base] MultiWindow:fix updateSystemBars when show start menu 2016-05-23 20:24:59 +08:00
1f3b243bab [frameworks/base] MultiWindow: Update new UI style ,it will bring better UE. 2016-05-23 20:24:53 +08:00
a2d04decd1 [frameworks/base] 1.修改二分屏兼容问题
2.修改模式动态切换
2016-05-23 20:24:47 +08:00
994c3f1c2b [frameworks/base] add multiwindow new resource and api 2016-05-23 20:24:41 +08:00
99e32dc04b [frameworks/base] 1.修改模式可选择切换
2.修改某些应用背景黑问题
3.添加SystemUI背景随壁纸变化功能
4.修改二分屏兼容问题
2016-05-23 20:24:34 +08:00