From f2519b444f658d2d7af8f85b0b95d12f32cf8bd2 Mon Sep 17 00:00:00 2001 From: Tom O'Neill Date: Fri, 11 Dec 2009 11:25:36 -0800 Subject: [PATCH] Add Android.mk files for the Notepad tutorial's solutions Now the tutorial is built as part of the standard build, but not installed as part of the system image. Required localizing an android:text field that was already localized in Notepadv1 but for some odd reason was no longer localized in v2 and v3. Change-Id: I0e1b41a4efa454a503b788b0698593136662a014 --- .../Notepadv1Solution/Android.mk | 30 +++++++++++++++++++ .../Notepadv2/res/layout/notes_list.xml | 2 +- .../Notepadv2Solution/Android.mk | 30 +++++++++++++++++++ .../res/layout/notes_list.xml | 2 +- .../Notepadv3/res/layout/notes_list.xml | 2 +- .../Notepadv3Solution/Android.mk | 30 +++++++++++++++++++ .../res/layout/notes_list.xml | 2 +- 7 files changed, 94 insertions(+), 4 deletions(-) create mode 100644 tutorials/NotepadCodeLab/Notepadv1Solution/Android.mk create mode 100644 tutorials/NotepadCodeLab/Notepadv2Solution/Android.mk create mode 100644 tutorials/NotepadCodeLab/Notepadv3Solution/Android.mk diff --git a/tutorials/NotepadCodeLab/Notepadv1Solution/Android.mk b/tutorials/NotepadCodeLab/Notepadv1Solution/Android.mk new file mode 100644 index 000000000..537503105 --- /dev/null +++ b/tutorials/NotepadCodeLab/Notepadv1Solution/Android.mk @@ -0,0 +1,30 @@ +# +# Copyright (C) 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. +# + +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := optional + +# Only compile source java files in this apk. +LOCAL_SRC_FILES := $(call all-java-files-under, src) + +LOCAL_PACKAGE_NAME := Notepadv1Solution + +# Make the app build against the current SDK +LOCAL_SDK_VERSION := current + +include $(BUILD_PACKAGE) diff --git a/tutorials/NotepadCodeLab/Notepadv2/res/layout/notes_list.xml b/tutorials/NotepadCodeLab/Notepadv2/res/layout/notes_list.xml index 29ae88631..6ae04729e 100755 --- a/tutorials/NotepadCodeLab/Notepadv2/res/layout/notes_list.xml +++ b/tutorials/NotepadCodeLab/Notepadv2/res/layout/notes_list.xml @@ -9,5 +9,5 @@ + android:text="@string/no_notes"/> diff --git a/tutorials/NotepadCodeLab/Notepadv2Solution/Android.mk b/tutorials/NotepadCodeLab/Notepadv2Solution/Android.mk new file mode 100644 index 000000000..8e483519b --- /dev/null +++ b/tutorials/NotepadCodeLab/Notepadv2Solution/Android.mk @@ -0,0 +1,30 @@ +# +# Copyright (C) 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. +# + +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := optional + +# Only compile source java files in this apk. +LOCAL_SRC_FILES := $(call all-java-files-under, src) + +LOCAL_PACKAGE_NAME := Notepadv2Solution + +# Make the app build against the current SDK +LOCAL_SDK_VERSION := current + +include $(BUILD_PACKAGE) diff --git a/tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/notes_list.xml b/tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/notes_list.xml index 29ae88631..6ae04729e 100755 --- a/tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/notes_list.xml +++ b/tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/notes_list.xml @@ -9,5 +9,5 @@ + android:text="@string/no_notes"/> diff --git a/tutorials/NotepadCodeLab/Notepadv3/res/layout/notes_list.xml b/tutorials/NotepadCodeLab/Notepadv3/res/layout/notes_list.xml index 29ae88631..6ae04729e 100755 --- a/tutorials/NotepadCodeLab/Notepadv3/res/layout/notes_list.xml +++ b/tutorials/NotepadCodeLab/Notepadv3/res/layout/notes_list.xml @@ -9,5 +9,5 @@ + android:text="@string/no_notes"/> diff --git a/tutorials/NotepadCodeLab/Notepadv3Solution/Android.mk b/tutorials/NotepadCodeLab/Notepadv3Solution/Android.mk new file mode 100644 index 000000000..177164ed8 --- /dev/null +++ b/tutorials/NotepadCodeLab/Notepadv3Solution/Android.mk @@ -0,0 +1,30 @@ +# +# Copyright (C) 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. +# + +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := optional + +# Only compile source java files in this apk. +LOCAL_SRC_FILES := $(call all-java-files-under, src) + +LOCAL_PACKAGE_NAME := Notepadv3Solution + +# Make the app build against the current SDK +LOCAL_SDK_VERSION := current + +include $(BUILD_PACKAGE) diff --git a/tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/notes_list.xml b/tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/notes_list.xml index 29ae88631..6ae04729e 100755 --- a/tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/notes_list.xml +++ b/tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/notes_list.xml @@ -9,5 +9,5 @@ + android:text="@string/no_notes"/>