diff options
author | Praneeth Bajjuri | 2017-12-07 18:01:35 -0600 |
---|---|---|
committer | Praneeth Bajjuri | 2017-12-07 18:01:35 -0600 |
commit | ed262d7d502432ae2269dadf61abe4a8547e3959 (patch) | |
tree | cb0bbe1bfaba3e59eb98ffceae0bc064ab1ac993 /overlay/frameworks/base/core | |
parent | 402a287d98b533b763a8bd92ca2afd82fcf1611a (diff) | |
parent | 07c58d221ebef458cc3ee6102e8dd0bc939fd9a7 (diff) | |
download | device-ti-am57xevm-ed262d7d502432ae2269dadf61abe4a8547e3959.tar.gz device-ti-am57xevm-ed262d7d502432ae2269dadf61abe4a8547e3959.tar.xz device-ti-am57xevm-ed262d7d502432ae2269dadf61abe4a8547e3959.zip |
Merge branch 'd-oreo-r6-release' of git://git.omapzoom.org/device/ti/am57xevm into HEAD
* 'd-oreo-r6-release' of git://git.omapzoom.org/device/ti/am57xevm:
am57xevm: fastboot.sh: IDK: update script for picking correct dtb
am57xevm: Install pru modules
am57xevm: Enable general purpose PRU firmwares
am57xevm: Enable PRU Ethernet on IDK boards
am57xevm: change display density to fit small screen
am57xevm: sync with device/ti/jacinto6evm
am57xevm: include dalvik definitions
audio: Combine the JAMR3 HAL into the primary HAL
am57xevm: fastboot.sh: update script to pick right dtb
am57xevm: fastboot.sh: update script based on new device names
am57xevm: update fastboot script for latest u-boot
am57xevm: fastboot: fix board_rev handling
am57xevm: make modules builtin
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Conflicts:
BoardConfig.mk
init.am57xevmboard.rc
init.recovery.am57xevmboard.rc
Change-Id: I5e9999cef10384ddd6202a46eafb02b7ea9b66fb
Diffstat (limited to 'overlay/frameworks/base/core')
-rw-r--r-- | overlay/frameworks/base/core/res/res/values/config.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 6e728a7..da0285a 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml | |||
@@ -26,6 +26,11 @@ | |||
26 | <!-- Arbitrary max 8 users. --> | 26 | <!-- Arbitrary max 8 users. --> |
27 | <integer name="config_multiuserMaximumUsers">8</integer> | 27 | <integer name="config_multiuserMaximumUsers">8</integer> |
28 | 28 | ||
29 | <!-- Car Mode --> | ||
30 | <integer name="config_defaultUiModeType">3</integer> | ||
31 | <!-- Can't leave car mode --> | ||
32 | <bool name="config_lockUiMode">true</bool> | ||
33 | |||
29 | <!-- This device is not "voice capable"; it's data-only. --> | 34 | <!-- This device is not "voice capable"; it's data-only. --> |
30 | <bool name="config_voice_capable">false</bool> | 35 | <bool name="config_voice_capable">false</bool> |
31 | 36 | ||