diff options
author | Jason Monk <jmonk@google.com> | 2015-01-13 10:08:23 -0500 |
---|---|---|
committer | Jason Monk <jmonk@google.com> | 2015-02-02 11:33:17 -0500 |
commit | 2ba4ce6a064e29ee3415ff8c2b4a9bbcff937a6c (patch) | |
tree | 0a55272f05f142e8e545bf664f5550db70b6dacc | |
parent | ef15d3cf32965aa8965d0168db06446fdf3d60a2 (diff) | |
download | frameworks_base-2ba4ce6a064e29ee3415ff8c2b4a9bbcff937a6c.zip frameworks_base-2ba4ce6a064e29ee3415ff8c2b4a9bbcff937a6c.tar.gz frameworks_base-2ba4ce6a064e29ee3415ff8c2b4a9bbcff937a6c.tar.bz2 |
Create SettingsLib
This will hold common code that SystemUI and Settings (and others)
will share.
Bug: 19180466
Change-Id: I6614b31d6c3b0a2d426a2aa8ce66725245339d22
-rw-r--r-- | packages/SettingsLib/Android.mk | 9 | ||||
-rw-r--r-- | packages/SettingsLib/AndroidManifest.xml | 20 | ||||
-rw-r--r-- | packages/SettingsLib/common.mk | 18 | ||||
-rw-r--r-- | packages/SettingsLib/res/values/strings.xml | 21 | ||||
-rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/Blank.java | 0 | ||||
-rw-r--r-- | packages/SystemUI/Android.mk | 2 | ||||
-rw-r--r-- | packages/SystemUI/tests/Android.mk | 2 |
7 files changed, 72 insertions, 0 deletions
diff --git a/packages/SettingsLib/Android.mk b/packages/SettingsLib/Android.mk new file mode 100644 index 0000000..0245ed3 --- /dev/null +++ b/packages/SettingsLib/Android.mk @@ -0,0 +1,9 @@ +LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_MODULE := SettingsLib + +LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res +LOCAL_SRC_FILES := $(call all-java-files-under, src) + +include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/packages/SettingsLib/AndroidManifest.xml b/packages/SettingsLib/AndroidManifest.xml new file mode 100644 index 0000000..eacafd5 --- /dev/null +++ b/packages/SettingsLib/AndroidManifest.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 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. +--> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.settingslib"> +</manifest> diff --git a/packages/SettingsLib/common.mk b/packages/SettingsLib/common.mk new file mode 100644 index 0000000..b017047 --- /dev/null +++ b/packages/SettingsLib/common.mk @@ -0,0 +1,18 @@ +# +# Include this make file to build your application against this module. +# +# Make sure to include it after you've set all your desired LOCAL variables. +# Note that you must explicitly set your LOCAL_RESOURCE_DIR before including +# this file. +# +# For example: +# +# LOCAL_RESOURCE_DIR := \ +# $(LOCAL_PATH)/res +# +# include frameworks/base/packages/SettingsLib/common.mk +# + +LOCAL_RESOURCE_DIR += $(call my-dir)/res +LOCAL_AAPT_FLAGS += --auto-add-overlay --extra-packages com.android.settingslib +LOCAL_STATIC_JAVA_LIBRARIES += SettingsLib diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml new file mode 100644 index 0000000..a0993b1 --- /dev/null +++ b/packages/SettingsLib/res/values/strings.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2015 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> +</resources> diff --git a/packages/SettingsLib/src/com/android/settingslib/Blank.java b/packages/SettingsLib/src/com/android/settingslib/Blank.java new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/packages/SettingsLib/src/com/android/settingslib/Blank.java diff --git a/packages/SystemUI/Android.mk b/packages/SystemUI/Android.mk index 2ff9a28..47ef42a 100644 --- a/packages/SystemUI/Android.mk +++ b/packages/SystemUI/Android.mk @@ -20,6 +20,8 @@ LOCAL_RESOURCE_DIR := \ $(LOCAL_PATH)/res LOCAL_AAPT_FLAGS := --auto-add-overlay --extra-packages com.android.keyguard +include frameworks/base/packages/SettingsLib/common.mk + include $(BUILD_PACKAGE) ifeq ($(EXCLUDE_SYSTEMUI_TESTS),) diff --git a/packages/SystemUI/tests/Android.mk b/packages/SystemUI/tests/Android.mk index 5a90324..6a7201c 100644 --- a/packages/SystemUI/tests/Android.mk +++ b/packages/SystemUI/tests/Android.mk @@ -36,4 +36,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := mockito-target Keyguard # UI it doesn't own. This is necessary to allow screenshots to be taken LOCAL_CERTIFICATE := platform +include frameworks/base/packages/SettingsLib/common.mk + include $(BUILD_PACKAGE) |