summaryrefslogtreecommitdiff
path: root/Android
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2018-03-02 17:26:30 +0000
committerMatthias Melcher <fltk@matthiasm.com>2018-03-02 17:26:30 +0000
commitca98f4b70cca757d59e36512c6db9a82287d7ac4 (patch)
treed65694a9f14101f8bca417b42aa0c06ca49c2df6 /Android
parentabbd7b99182f1d132663923684e5848a2b294ff4 (diff)
Updated Android README
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12697 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'Android')
-rw-r--r--Android/HelloAndroid/README.md45
1 files changed, 9 insertions, 36 deletions
diff --git a/Android/HelloAndroid/README.md b/Android/HelloAndroid/README.md
index 9a1019edb..0a1231969 100644
--- a/Android/HelloAndroid/README.md
+++ b/Android/HelloAndroid/README.md
@@ -1,53 +1,26 @@
-Native Plasma
+Hello Android
=============
-Native Plasma is an Android sample that renders a plasma effect in a Bitmap from C code using [Native Activity](http://developer.android.com/reference/android/app/NativeActivity.html).
-
-This sample uses the new [Android Studio CMake plugin](http://tools.android.com/tech-docs/external-c-builds) with C++ support.
+Hello Android is an FLTK sample app that derives from the Android Studio sample
+project Native Plasma. This sample uses Android Studio 3 and CMake.
Pre-requisites
--------------
-- Android Studio 2.2+ with [NDK](https://developer.android.com/ndk/) bundle.
+- Android Studio 3.0+ with [NDK](https://developer.android.com/ndk/) bundle.
Getting Started
---------------
1. [Download Android Studio](http://developer.android.com/sdk/index.html)
1. Launch Android Studio.
-1. Open the sample directory.
-1. Open *File/Project Structure...*
- - Click *Download* or *Select NDK location*.
-1. Click *Tools/Android/Sync Project with Gradle Files*.
+1. Open the Android directory inside the FLTK directory.
+1. Load the Android Studio project in the HelloAndroid directory.
1. Click *Run/Run 'app'*.
-Screenshots
------------
-![screenshot](screenshot.png)
-
Support
-------
-If you've found an error in these samples, please [file an issue](https://github.com/googlesamples/android-ndk/issues/new).
-
-Patches are encouraged, and may be submitted by [forking this project](https://github.com/googlesamples/android-ndk/fork) and
-submitting a pull request through GitHub. Please see [CONTRIBUTING.md](../CONTRIBUTING.md) for more details.
+If you've found an error in these samples, please [file an issue](http://www.fltk.org/str.php). Patches are encouraged, and may be submitted via the same FLTK Bug & Feature system.
-- [Stack Overflow](http://stackoverflow.com/questions/tagged/android-ndk)
-- [Google+ Community](https://plus.google.com/communities/105153134372062985968)
-- [Android Tools Feedbacks](http://tools.android.com/feedback)
+Please visit the FLTK [Forum](http://www.fltk.org/newsgroups.php) for additional help.
License
-------
-Copyright 2015 Google, Inc.
-
-Licensed to the Apache Software Foundation (ASF) under one or more contributor
-license agreements. See the NOTICE file distributed with this work for
-additional information regarding copyright ownership. The ASF licenses this
-file to you 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.
+FLTK is provided under the terms of the [GNU Library Public License, Version 2 with exceptions](http://www.fltk.org/COPYING.php) that allow for static linking.