1b25357b13
Android->net_adb:add support net adb button in Developer option
2018-01-25 17:16:40 +08:00
a3ff837be0
Android->setting:add SchedulePowerOnOff function
2017-10-19 19:50:57 +08:00
b97cbde9ce
Android->Setting:Add the save log option at Developer options
2017-03-21 10:42:25 +08:00
e2fa6fd081
Android->setting:close the dual screen
2016-07-12 10:06:15 +08:00
019b7b5041
Android->Setting:fix not main_display HDMI display item can not show
2016-07-11 16:20:20 +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
8a4637332b
modify multiwindow
2016-06-24 16:02:02 +08:00
4ba54904d9
only 3288 can use MultiWindow
2016-06-24 16:01:50 +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
5d164df41b
Android->Eth:fix can not save static ip
2016-06-15 15:12:54 +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
76b761501f
[packages/apps/Settings] Preserve FRP lock if wiped during SUW
...
Guard against FRP attacks by keeping the persistent data block
intact, if a factory reset has been issued during SUW.
Bug: 25290269
Change-Id: Id26b4c10235ad126632b71875592a4fa70a39b24
(cherry picked from commit 14bf226c79ee16fc5dd502d81e12bf18b932f39e)
2016-05-24 11:50:03 +08:00
4d3782b67d
[packages/apps/Settings] Block developer settings during SUW
...
Block access to development settings by tapping on the build number
in "About phone". Once SUW has completed, taps will be allowed.
Bug: 25290269
Change-Id: I9b2787712237f28fba446abab15a9e1c075d0419
(cherry picked from commit 4836ab6df4d4e82f6b2839b6b9faf3e794d66d5f)
2016-05-24 11:49:53 +08:00
5407bf5a48
[packages/apps/Settings] fix bug: bt can not be foud after reopen bt in BluetoothSettings Activity
2016-05-24 11:49:42 +08:00
d815b32343
Android->Settings: modify displayer for screen scale
2016-03-16 17:32:24 +08:00
c9b5d4a6cb
Android->Settings:correct a spell bug for Ethernet
2016-01-05 11:49:50 +08:00
d890a18090
Android->packoages:modify the display_setting
2015-12-31 18:16:09 +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
166307db44
[packages/apps/Settings] Merge tag 'android-5.1.1_r13' into zjwork
...
solve merger android-5.1.1_r13 conflict
Android 5.1.1 release 13
Signed-off-by: Firefly <service@t-firefly.com >
Conflicts:
src/com/android/settings/sim/SimBootReceiver.java
2015-12-31 16:49:37 +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
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
fbdcd2b58e
[packages/apps/Settings] fix problem when set languageAndInputMethod
2015-12-31 16:49:13 +08:00
83d66155aa
[packages/apps/Settings] add support HDMI zoom for rk3128-sdk-5.1
...
Signed-off-by: Firefly <service@t-firefly.com >
2015-12-31 16:49:05 +08:00
12b13ebac9
[packages/apps/Settings] Revert "fix hotspot disable bug"
...
This reverts commit 7083844fb1691d14cce29eb3439ce7998ade1c9f.
2015-12-31 16:48:57 +08:00
fbee57a240
[packages/apps/Settings] Revert "Settings: add skip sim pin feature"
...
This reverts commit e38fb296f3ec59312cfb6af10a4152127fce7634.
2015-12-31 16:48:49 +08:00
41aae64887
[packages/apps/Settings] Revert "Settings: add sim on/off feature"
...
This reverts commit 85f3951d04be38e0e8c5e7d945e4fc5db232a173.
2015-12-31 16:48:40 +08:00
3d8df19fd0
[packages/apps/Settings] Revert "Settings: add missed new file"
...
This reverts commit b827190d0c1c43afe165f7478d256ea8bb8770df.
2015-12-31 16:48:32 +08:00
c0e9740e48
[packages/apps/Settings] Revert "Setting: fix the SIM notification"
...
This reverts commit ccd9a42c78359b01f7ee6bf7ef6799041ab04947.
2015-12-31 16:48:24 +08:00
bb5e27954e
[packages/apps/Settings] Revert "Settings: fix for Wifi-only project"
...
This reverts commit 67d902962f1db5b1a921253ada8e8c5f13803ad8.
2015-12-31 16:48:16 +08:00
ecf4822626
[packages/apps/Settings] Settings: fix for Wifi-only project
...
Do not show sim disable notification for Wifi-only project
2015-12-31 16:48:08 +08:00
25759dd434
[packages/apps/Settings] Setting: fix the SIM notification
...
Optimize bootup SIM setting notification
2015-12-31 16:48:00 +08:00
bda93c0de1
[packages/apps/Settings] BT:fix cannot be searched when on and off in BT setting UI
2015-12-31 16:47:52 +08:00
eed2fc7a98
[packages/apps/Settings] Settings: add missed new file
2015-12-31 16:47:44 +08:00
bd08925161
[packages/apps/Settings] Settings: add sim on/off feature
...
add the sim on/off interface in Setting
2015-12-31 16:47:36 +08:00
12c13c23f6
[packages/apps/Settings] Settings: add skip sim pin feature
...
What's in this commit:
1, add menu item to show SIM PIN unlock UI.
2015-12-31 16:47:28 +08:00
f1d4c7ea0b
[packages/apps/Settings] improve e00b8e5f354eb7b7f9455454d0d7ea10a43af3fd,compatible with RK32
2015-12-31 16:47:20 +08:00
bdd215312f
[packages/apps/Settings] Settings: enhance power save mode
...
add sub items to control if limit cpu frequency, lcd brightness, etc.
Issue: GRANITEFLY-749
Change-Id: Iedd9b7fce8f2fcf01a35a4ef93365a83e9d49976
2015-12-31 16:47:11 +08:00
ea5265c077
[packages/apps/Settings] Settings: set language according to SIM
...
Add a setting in Language settings to enable of disable this function
Issue: GRANITEFLY-745
Change-Id: Ibcdedc20bb629c5757f086fa88cf85cc3dfc5598
2015-12-31 16:47:03 +08:00
b3d3d0e43d
[packages/apps/Settings] Settings: set prebuilt apn not editable
...
Disable edit if the APN is locked.
Property "ro.config.lock_apn" controls if this feature needed or not in provider.
Issue:GRANITEFLY-744
Change-Id: Iabc5b294725e2b7a82c04c71e5ad18bd9fe9eb61
Signed-off-by: Firefly <service@t-firefly.com >
2015-12-31 16:46:55 +08:00
d23971df16
[packages/apps/Settings] remove security encrypted phone
2015-12-31 16:46:47 +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
