diff options
author | Adam Powell <adamp@google.com> | 2011-06-30 20:24:03 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-30 20:24:03 -0700 |
commit | 7df03224777f9545ad1d167f0cce5637bed917f4 (patch) | |
tree | cca111ab61d847f43a23303d9aae839b820e95bd | |
parent | ea64787c9310c368863936b259aaaba55e4b6bb9 (diff) | |
parent | 4b766135202eb3beb2c1d34f37ee5eb69cef2c42 (diff) | |
download | device_samsung_tuna-7df03224777f9545ad1d167f0cce5637bed917f4.zip device_samsung_tuna-7df03224777f9545ad1d167f0cce5637bed917f4.tar.gz device_samsung_tuna-7df03224777f9545ad1d167f0cce5637bed917f4.tar.bz2 |
Merge "Move config_showNavigationBar to framework so it can be read there."
-rw-r--r-- | overlay/frameworks/base/core/res/res/values/config.xml | 4 | ||||
-rw-r--r-- | overlay/frameworks/base/packages/SystemUI/res/values/config.xml | 25 |
2 files changed, 4 insertions, 25 deletions
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 72263b1..365383a 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -25,4 +25,8 @@ This image contains an installer for the AFT file transfer tool. --> <string translatable="false" name="config_isoImagePath">/system/etc/AftInstallerImage.iso</string> + <!-- Whether a software navigation bar should be shown. NOTE: in the future this may be + autodetected from the Configuration. --> + <bool name="config_showNavigationBar">true</bool> + </resources> diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml deleted file mode 100644 index 5ad2f8d..0000000 --- a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 2009, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> - -<resources> - <!-- Whether a software navigation bar should be shown. NOTE: in the future this may be - autodetected from the Configuration. --> - <bool name="config_showNavigationBar">true</bool> -</resources> - |