OSDN Git Service

Prepare to move libtaskbar into its own repository
authorBraden Farmer <farmerbb@gmail.com>
Fri, 5 Feb 2021 07:09:10 +0000 (00:09 -0700)
committerBraden Farmer <farmerbb@gmail.com>
Fri, 5 Feb 2021 07:09:10 +0000 (00:09 -0700)
15 files changed:
README.md
app/build.gradle
build.gradle
dependencies.gradle [new file with mode: 0644]
lib/README.md [deleted file]
lib/build.gradle [deleted file]
lib/demo/build.gradle [deleted file]
lib/demo/src/main/AndroidManifest.xml [deleted file]
lib/demo/src/main/java/com/farmerbb/taskbar/lib/demo/DemoActivity.java [deleted file]
lib/demo/src/main/res/drawable/ic_launcher_background.xml [deleted file]
lib/demo/src/main/res/drawable/ic_launcher_foreground.xml [deleted file]
lib/demo/src/main/res/layout/activity_main.xml [deleted file]
lib/demo/src/main/res/mipmap/ic_launcher.xml [deleted file]
lib/demo/src/main/res/values/strings.xml [deleted file]
settings.gradle

index 049cdf0..a2dba09 100644 (file)
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@ Taskbar uses [Robolectric](https://github.com/robolectric/robolectric) as its un
 #### Android 10 Desktop Mode support via libtaskbar
 Taskbar can now be included as a library inside any third-party launcher, to quickly and easily add Android 10 Desktop Mode support into your existing launcher with no additional setup.
 
-For more information on including Taskbar inside your application, see the [libtaskbar documentation](https://github.com/farmerbb/Taskbar/blob/master/lib/README.md).
+For more information on including Taskbar inside your application, see the [libtaskbar documentation](https://github.com/farmerbb/libtaskbar/blob/master/README.md).
 
 #### Icon Pack Support
 Taskbar includes support for ADW-style icon packs.  If you are an icon pack developer and would like to include support for applying the icon pack from within your app, simply use the following code:
index 989565a..effaab4 100644 (file)
@@ -1,3 +1,4 @@
+apply from: '../dependencies.gradle'
 apply plugin: 'com.android.application'
 apply plugin: 'jacoco'
 
index f59ea5e..1fb9a54 100644 (file)
@@ -1,4 +1,6 @@
 buildscript {
+    apply from: 'dependencies.gradle'
+
     repositories {
         google()
         jcenter()
@@ -7,8 +9,6 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.1'
-     // classpath 'com.novoda:bintray-release:0.9.2'
-        classpath 'com.github.marandaneto.bintray-release:bintray-release:1.0.3'
     }
 }
 
@@ -17,25 +17,6 @@ plugins {
     id 'com.github.ben-manes.versions' version '0.36.0'
 }
 
-ext {
-    // TODO keep version name and version code in sync with Android-x86 manifest
-    VERSION_CODE = 203
-    VERSION_NAME = "6.1.1"
-
-    MIN_SDK_VERSION = 21
-    COMPILE_SDK_VERSION = 30
-    BUILD_TOOLS_VERSION = "30.0.2"
-
-    // Keep at 29 for now, since bumping to 30 will break freeform mode on Android 11
-    TARGET_SDK_VERSION = 29
-
-    SUPPORT_V4_VERSION = "1.0.0"
-    APPCOMPAT_VERSION = "1.2.0"
-    BROWSER_VERSION = "1.0.0"
-    MATERIAL_VERSION = "1.2.1"
-    POWERMOCK_VERSION = "2.0.9"
-}
-
 dependencyUpdates {
     revision = 'release'
 }
diff --git a/dependencies.gradle b/dependencies.gradle
new file mode 100644 (file)
index 0000000..64814f3
--- /dev/null
@@ -0,0 +1,20 @@
+allprojects {
+    ext {
+        // TODO keep version name and version code in sync with Android-x86 manifest
+        VERSION_CODE = 203
+        VERSION_NAME = "6.1.1"
+
+        MIN_SDK_VERSION = 21
+        COMPILE_SDK_VERSION = 30
+        BUILD_TOOLS_VERSION = "30.0.2"
+
+        // Keep at 29 for now, since bumping to 30 will break freeform mode on Android 11
+        TARGET_SDK_VERSION = 29
+
+        SUPPORT_V4_VERSION = "1.0.0"
+        APPCOMPAT_VERSION = "1.2.0"
+        BROWSER_VERSION = "1.0.0"
+        MATERIAL_VERSION = "1.2.1"
+        POWERMOCK_VERSION = "2.0.9"
+    }
+}
diff --git a/lib/README.md b/lib/README.md
deleted file mode 100644 (file)
index 2d4ce65..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-## libtaskbar
-
-![Bintray](https://img.shields.io/bintray/v/farmerbb/libtaskbar/libtaskbar)
-
-**libtaskbar allows you to quickly and easily add support for Android 10’s Desktop Mode to any third-party launcher, powered by the Taskbar app.**
-
-It's a plug-and-play solution that is lightweight (less than 0.5 MB) and doesn't require Taskbar to already be installed.  libtaskbar gives your users on Android 10+ a fully-featured desktop-style experience with a taskbar, start menu, desktop icons, and more, while being unobtrusive to your launcher's existing phone or tablet experience.
-
-### Setup
-
-Adding Desktop Mode support to your existing launcher is as easy as including these lines in your build.gradle file:
-
-```
-repositories {
-    jcenter()
-}
-
-android {
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-}
-
-dependencies {
-    implementation 'com.farmerbb:libtaskbar:2.1.1' // see badge above for latest version
-}
-```
-
-That's it!  As long as your launcher is set as the system default, and the user has enabled the "Enable freeform windows" and "Force desktop mode" developer options, then Taskbar will appear whenever the user plugs in their HDMI-enabled phone into an external display.
-
-### Additional configuration
-
-You may wish to include a link to the Taskbar settings inside your launcher's settings UI.  To open Taskbar's settings, simply call this function:
-
-    Taskbar.openSettings(context)
-
-If desired, you can also supply a title to show in the top level of the Taskbar settings page, as well as a theme to apply to the activity:
-
-    Taskbar.openSettings(context, "Desktop Mode Settings", R.style.AppTheme)
-
-Finally, while Taskbar's desktop mode functionality is enabled out-of-the-box, it can be programmatically enabled and disabled by calling:
-
-    Taskbar.setEnabled(context, true) // or false
-
-### Things to consider
-
-* libtaskbar doesn't include any UI for informing the user to enable the "Enable freeform windows" and "Force desktop mode" developer options.  You may wish to include a setup flow inside your launcher to guide the user with enabling these options.  Note that a reboot is required for the option to take effect.
-
-* libtaskbar will add the `SYSTEM_ALERT_WINDOW` and `PACKAGE_USAGE_STATS` permissions to your app's manifest, as well as a small number of non-runtime permissions for additional functionality such as displaying a status area on the taskbar.  As a result, your app will appear inside the "Display over other apps" and "Usage access" sections of the "Special app access" page in Android's settings.
-
-* libtaskbar's only transitive dependencies are `androidx.legacy:legacy-support-v4`, `androidx.appcompat:appcompat`, and `com.google.android.material:material`.  As of version 1.0.1, libtaskbar uses AndroidX and therefore requires an AndroidX-based project.  If you're still using the older support libraries, use version 1.0.0 of libtaskbar instead.
-
-* If aapt complains about any resource conflicts, you may need to exclude the `com.google.android.material:material` transitive dependency from libtaskbar inside your build.gradle file.
-
-* libtaskbar currently does not support launchers with a targetSdkVersion of 30 or higher.  For now, please set your targetSdkVersion back to 29 in order to use libtaskbar.
-
-### Example implementation
-
-An example implementation of libtaskbar using Lawnchair is available at https://github.com/farmerbb/libtaskbar-Lawnchair-Example.  
-
-You can also download a prebuilt APK here: https://github.com/farmerbb/libtaskbar-Lawnchair-Example/releases
-
-### Changelog
-
-**v2.1.1**
-* Includes all changes from Taskbar 6.1.1
-
-_Known issues:_
-* libtaskbar currently does not support launchers with a targetSdkVersion of 30 or higher
-
-**v2.1.0**
-* Includes all changes from Taskbar 6.1
-* Prompts for enabling system alert window and usage access permissions now use the actual name of the app
-
-**v2.0.0**
-* Includes all changes from Taskbar 6.0
-* libtaskbar components now run in a separate process from the rest of the app
-* The "Enable freeform windows" developer option is now required, in addition to "Force desktop mode"
-
-**v1.0.1**
-* Includes all changes from Taskbar 5.0.1
-* Migrated to AndroidX
-
-**v1.0.0**
-* Initial release, based off of Taskbar 5.0
diff --git a/lib/build.gradle b/lib/build.gradle
deleted file mode 100644 (file)
index ec727fd..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-apply plugin: 'com.novoda.bintray-release'
-apply plugin: 'com.android.library'
-
-repositories {
-    google()
-}
-
-publish {
-    userOrg = 'farmerbb'
-    repoName = 'libtaskbar'
-    groupId = 'com.farmerbb'
-    artifactId = 'libtaskbar'
-    publishVersion = getLibVersion()
-    desc = 'libtaskbar allows you to quickly and easily add support for Android 10\'s Desktop Mode to any third-party launcher, powered by the Taskbar app.'
-    website = 'https://github.com/farmerbb/Taskbar/blob/master/lib/README.md'
-}
-
-android {
-    compileSdkVersion COMPILE_SDK_VERSION
-    buildToolsVersion BUILD_TOOLS_VERSION
-
-    defaultConfig {
-        minSdkVersion MIN_SDK_VERSION
-        targetSdkVersion TARGET_SDK_VERSION
-        versionCode VERSION_CODE
-        versionName VERSION_NAME
-
-        buildConfigField "String", "APPLICATION_ID", "\"com.farmerbb.taskbar\""
-        buildConfigField "String", "BASE_APPLICATION_ID", "\"com.farmerbb.taskbar\""
-        buildConfigField "String", "PAID_APPLICATION_ID", "\"com.farmerbb.taskbar.paid\""
-        buildConfigField "String", "SUPPORT_APPLICATION_ID", "\"com.farmerbb.taskbar.support\""
-        buildConfigField "String", "ANDROIDX86_APPLICATION_ID", "\"com.farmerbb.taskbar.androidx86\""
-
-        buildConfigField "int", "VERSION_CODE", "$VERSION_CODE"
-
-        buildConfigField "long", "TIMESTAMP", "${System.currentTimeMillis()}L"
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    sourceSets {
-        main {
-            java { srcDirs('../app/src/main/java', '../app/src/lib/java', '../app/src/nonplaystore/java', "../app/src/compat-$COMPILE_SDK_VERSION/java") }
-            res { srcDirs('../app/src/main/res', '../app/src/lib/res') }
-            manifest.srcFile '../app/src/lib/AndroidManifest.xml'
-        }
-    }
-
-    lintOptions {
-        abortOnError false
-    }
-}
-
-dependencies {
-    implementation "androidx.legacy:legacy-support-v4:$SUPPORT_V4_VERSION"
-    implementation "androidx.appcompat:appcompat:$APPCOMPAT_VERSION"
-    implementation "com.google.android.material:material:$MATERIAL_VERSION"
-}
-
-def getLibVersion() {
-    def appVersion = VERSION_NAME
-    if(appVersion.split("\\.").length == 2)
-        appVersion = "$appVersion.0"
-
-    def libVersion = appVersion.split("\\.")
-    libVersion[0] = "${libVersion[0].toInteger() - 4}".toString()
-
-    return libVersion.join('.')
-}
\ No newline at end of file
diff --git a/lib/demo/build.gradle b/lib/demo/build.gradle
deleted file mode 100644 (file)
index 99d1378..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-apply plugin: 'com.android.application'
-
-android {
-    compileSdkVersion COMPILE_SDK_VERSION
-    buildToolsVersion BUILD_TOOLS_VERSION
-
-    defaultConfig {
-        applicationId "com.farmerbb.taskbar.lib.demo"
-
-        minSdkVersion 29
-        targetSdkVersion TARGET_SDK_VERSION
-        versionCode VERSION_CODE
-        versionName VERSION_NAME
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-}
-
-dependencies {
-    implementation project(path: ':lib', configuration: 'default')
-
-    implementation "androidx.legacy:legacy-support-v4:$SUPPORT_V4_VERSION"
-    implementation "androidx.appcompat:appcompat:$APPCOMPAT_VERSION"
-    implementation "com.google.android.material:material:$MATERIAL_VERSION"
-}
diff --git a/lib/demo/src/main/AndroidManifest.xml b/lib/demo/src/main/AndroidManifest.xml
deleted file mode 100644 (file)
index b4f0526..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2020 Braden Farmer
-
-     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.farmerbb.taskbar.lib.demo">
-
-    <application
-        android:allowBackup="false"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/Theme.AppCompat.DayNight">
-        <activity
-            android:name=".DemoActivity"
-            android:launchMode="singleTask">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.DEFAULT"/>
-                <category android:name="android.intent.category.HOME" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>
\ No newline at end of file
diff --git a/lib/demo/src/main/java/com/farmerbb/taskbar/lib/demo/DemoActivity.java b/lib/demo/src/main/java/com/farmerbb/taskbar/lib/demo/DemoActivity.java
deleted file mode 100644 (file)
index 904567a..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright 2020 Braden Farmer
- *
- * 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.
- */
-
-package com.farmerbb.taskbar.lib.demo;
-
-import android.content.ActivityNotFoundException;
-import android.content.Intent;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.view.View;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import com.farmerbb.taskbar.lib.Taskbar;
-
-public class DemoActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-    }
-
-    @Override
-    public void onBackPressed() {}
-
-    public void openDeveloperOptions(View v) {
-        startActivitySafely(Settings.ACTION_APPLICATION_DEVELOPMENT_SETTINGS);
-    }
-
-    public void setDefaultHome(View v) {
-        startActivitySafely(Settings.ACTION_HOME_SETTINGS);
-    }
-
-    public void openSettings(View v) {
-        Taskbar.openSettings(this);
-    }
-
-    private void startActivitySafely(String action) {
-        Intent intent = new Intent(action);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
-        try {
-            startActivity(intent);
-        } catch (ActivityNotFoundException ignored) {}
-    }
-}
diff --git a/lib/demo/src/main/res/drawable/ic_launcher_background.xml b/lib/demo/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644 (file)
index ca3826a..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-    android:height="108dp"
-    android:width="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#3DDC84"
-          android:pathData="M0,0h108v108h-108z"/>
-    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-</vector>
diff --git a/lib/demo/src/main/res/drawable/ic_launcher_foreground.xml b/lib/demo/src/main/res/drawable/ic_launcher_foreground.xml
deleted file mode 100644 (file)
index 8b8fabf..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108"
-    android:tint="#000000">
-  <group android:scaleX="0.13142857"
-      android:scaleY="0.13142857"
-      android:translateX="29.16"
-      android:translateY="42.910713">
-    <group android:translateY="133.59375">
-      <path android:pathData="M11.890625,-0L11.890625,-102L40.78125,-102Q54.140625,-102,64.40625,-96.109375Q74.671875,-90.234375,80.265625,-79.375Q85.859375,-68.515625,85.921875,-54.4375L85.921875,-47.921875Q85.921875,-33.484375,80.328125,-22.625Q74.75,-11.765625,64.375,-5.953125Q54,-0.140625,40.21875,-0L11.890625,-0ZM25.390625,-91L25.390625,-11L39.59375,-11Q55.203125,-11,63.875,-20.671875Q72.5625,-30.34375,72.5625,-48.234375L72.5625,-54.1875Q72.5625,-71.578125,64.375,-81.21875Q56.1875,-90.859375,41.140625,-91L25.390625,-91Z"
-          android:fillColor="#000000"/>
-      <path android:pathData="M135.26562,1Q119.796875,1,110.09375,-9.046875Q100.390625,-19.09375,100.390625,-35.921875L100.390625,-38.28125Q100.390625,-49.46875,104.703125,-58.265625Q109.03125,-67.0625,116.796875,-72.03125Q124.578125,-77,133.64062,-77Q148.48438,-77,156.70312,-67.265625Q164.9375,-57.53125,164.9375,-39.390625L164.9375,-34L113.390625,-34Q113.671875,-23.25,119.96875,-16.625Q126.265625,-10,135.96875,-10Q142.85938,-10,147.64062,-12.640625Q152.42188,-15.28125,156,-19.640625L163.95312,-13.53125Q154.39062,1,135.26562,1ZM133.64062,-66Q125.765625,-66,120.421875,-60.46875Q115.078125,-54.953125,113.8125,-45L151.92188,-45L151.92188,-45.953125Q151.35938,-55.5,146.57812,-60.75Q141.79688,-66,133.64062,-66Z"
-          android:fillColor="#000000"/>
-      <path android:pathData="M191.96875,-76L192.32812,-67.21875Q200.6875,-77,214.89062,-77Q230.85938,-77,236.625,-64.84375Q240.42188,-70.296875,246.5,-73.640625Q252.57812,-77,260.875,-77Q285.90625,-77,286.32812,-50.65625L286.32812,0L273.32812,0L273.32812,-49.859375Q273.32812,-57.96875,269.59375,-61.984375Q265.875,-66,257.07812,-66Q249.84375,-66,245.0625,-61.703125Q240.28125,-57.40625,239.5,-50.140625L239.5,0L226.42188,0L226.42188,-49.515625Q226.42188,-66,210.1875,-66Q197.39062,-66,192.67188,-55.171875L192.67188,0L179.67188,0L179.67188,-76L191.96875,-76Z"
-          android:fillColor="#000000"/>
-      <path android:pathData="M302.34375,-38.6875Q302.34375,-49.75,306.73438,-58.578125Q311.125,-67.40625,318.96875,-72.203125Q326.8125,-77,336.85938,-77Q352.40625,-77,362,-66.359375Q371.59375,-55.734375,371.59375,-38.0625L371.59375,-37.171875Q371.59375,-26.1875,367.34375,-17.453125Q363.09375,-8.734375,355.17188,-3.859375Q347.26562,1,337,1Q321.53125,1,311.9375,-9.625Q302.34375,-20.265625,302.34375,-37.796875L302.34375,-38.6875ZM315.42188,-37.21875Q315.42188,-24.90625,321.28125,-17.453125Q327.15625,-10,337,-10Q346.92188,-10,352.75,-17.546875Q358.59375,-25.109375,358.59375,-38.71875Q358.59375,-50.890625,352.64062,-58.4375Q346.70312,-66,336.85938,-66Q327.23438,-66,321.32812,-58.546875Q315.42188,-51.09375,315.42188,-37.21875Z"
-          android:fillColor="#000000"/>
-    </group>
-  </group>
-</vector>
\ No newline at end of file
diff --git a/lib/demo/src/main/res/layout/activity_main.xml b/lib/demo/src/main/res/layout/activity_main.xml
deleted file mode 100644 (file)
index 0859841..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2020 Braden Farmer
-
-     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.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:orientation="vertical">
-
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_margin="8dp"
-            android:onClick="setDefaultHome"
-            android:text="@string/set_default_home"/>
-        
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_margin="8dp"
-            android:onClick="openDeveloperOptions"
-            android:text="@string/open_developer_options"/>
-
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_margin="8dp"
-            android:onClick="openSettings"
-            android:text="@string/open_settings"/>
-
-    </LinearLayout>
-
-</FrameLayout>
diff --git a/lib/demo/src/main/res/mipmap/ic_launcher.xml b/lib/demo/src/main/res/mipmap/ic_launcher.xml
deleted file mode 100644 (file)
index bbd3e02..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/lib/demo/src/main/res/values/strings.xml b/lib/demo/src/main/res/values/strings.xml
deleted file mode 100644 (file)
index b1fdbe8..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2020 Braden Farmer
-
-     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>
-    <string name="app_name">libtaskbar</string>
-    <string name="open_developer_options">Open developer options</string>
-    <string name="set_default_home">Set default home</string>
-    <string name="open_settings">Open libtaskbar settings</string>
-</resources>
index 7bc699d..e7b4def 100644 (file)
@@ -1 +1 @@
-include ':app', ':lib'//, ':lib:demo'
+include ':app'