Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a12998d4 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch '115-Q-fix_merge_conflict_for_automatic_update' into 'v1-q' 

115-Q-fix_merge_conflict_for_automatic_update

See merge request !30
parents f9ef85cf c8274575

.classpath

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<classpath>

	<classpathentry kind="src" path="src"/>

	<classpathentry kind="src" path="gen"/>

	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>

	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>

	<classpathentry kind="lib" path="libs/android-support-v4.jar"/>

	<classpathentry kind="output" path="bin/classes"/>

</classpath>

.project

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<projectDescription>

	<name>Eleven</name>

	<comment></comment>

	<projects>

	</projects>

	<buildSpec>

		<buildCommand>

			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>

			<arguments>

			</arguments>

		</buildCommand>

		<buildCommand>

			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>

			<arguments>

			</arguments>

		</buildCommand>

		<buildCommand>

			<name>org.eclipse.jdt.core.javabuilder</name>

			<arguments>

			</arguments>

		</buildCommand>

		<buildCommand>

			<name>com.android.ide.eclipse.adt.ApkBuilder</name>

			<arguments>

			</arguments>

		</buildCommand>

	</buildSpec>

	<natures>

		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>

		<nature>org.eclipse.jdt.core.javanature</nature>

	</natures>

</projectDescription>

AndroidManifest-gradle.xml

deleted100644 → 0
+0 −201
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2012 Andrew Neal

     Copyright (C) 2014 The CyanogenMod Project

     Copyright (C) 2019-2020 The LineageOS 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="org.lineageos.eleven"

    android:versionCode="3"

    android:versionName="3.0">



    <!-- Used for caching and creating new playlists -->

    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

    <!-- Used to check for a network connection -->

    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

    <!-- Used to keep the service running when the phone sleeps -->

    <uses-permission android:name="android.permission.WAKE_LOCK" />

    <!-- The main service uses a sticky broadcast -->

    <uses-permission android:name="android.permission.BROADCAST_STICKY" />

    <!-- Lower or raise the music based on the phone state -->

    <uses-permission android:name="android.permission.READ_PHONE_STATE" />

    <!-- Used to set the devices's ringtone -->

    <uses-permission android:name="android.permission.WRITE_SETTINGS" />

    <!-- Used to create launcher shortcuts -->

    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />

    <!-- Allows Eleven to read from External Storage -->

    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

    <!-- Allows Eleven to modify media files on external storage -->

    <uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE" />



    <!-- Audio Visualizer Permissions -->

    <uses-permission android:name="android.permission.RECORD_AUDIO" />

    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />



    <!-- Allows Eleven to start services in foreground -->

    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />



    <!-- Accelerometer feature for shake to play -->

    <uses-feature android:name="android.hardware.sensor.accelerometer" />



    <application

        android:name="org.lineageos.eleven.ElevenApplication"

        android:allowBackup="true"

        android:allowTaskReparenting="true"

        android:requestLegacyExternalStorage="true"

        android:hardwareAccelerated="@bool/config_hardwareAccelerated"

        android:appCategory="audio"

        android:icon="@mipmap/ic_launcher"

        android:label="@string/app_name"

        android:largeHeap="@bool/config_largeHeap"

        android:taskAffinity="org.lineageos.eleven.task"

        android:theme="@style/Eleven.Theme">



        <!-- Main activity -->

        <activity

            android:name="org.lineageos.eleven.ui.activities.HomeActivity"

            android:windowSoftInputMode="adjustPan"

            android:launchMode="singleTop"

            android:exported="true"

            android:theme="@style/Eleven.Theme.ActionBar.Overlay">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <action android:name="android.intent.action.MUSIC_PLAYER" />



                <category android:name="android.intent.category.LAUNCHER" />

                <category android:name="android.intent.category.APP_MUSIC" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.VIEW" />



                <category android:name="android.intent.category.DEFAULT" />



                <data android:mimeType="vnd.android.cursor.dir/playlist" />

                <data android:mimeType="vnd.android.cursor.dir/albums" />

                <data android:mimeType="vnd.android.cursor.dir/artists" />

            </intent-filter>

            <intent-filter>

                <action android:name="${applicationId}.AUDIO_PLAYER" />



                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>



        <!-- Used to set options -->

        <activity

            android:name="org.lineageos.eleven.ui.activities.SettingsActivity"

            android:label="@string/menu_settings"

            android:theme="@style/Eleven.Theme"/>

        <!-- Audio Preview -->

        <activity

            android:name="org.lineageos.eleven.ui.activities.preview.AudioPreviewActivity"

            android:launchMode="singleTask"

            android:excludeFromRecents="true"

            android:taskAffinity=""

            android:theme="@style/Theme.AudioPreview">

            <intent-filter>

                <action android:name="android.intent.action.VIEW" />



                <category android:name="android.intent.category.DEFAULT" />



                <data android:scheme="content" />

                <data android:mimeType="audio/*" />

                <data android:mimeType="application/ogg" />

                <data android:mimeType="application/x-ogg" />

                <data android:mimeType="application/itunes" />

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.VIEW" />



                <category android:name="android.intent.category.DEFAULT" />



                <data android:scheme="file" />

                <data android:mimeType="audio/*" />

                <data android:mimeType="application/ogg" />

                <data android:mimeType="application/x-ogg" />

                <data android:mimeType="application/itunes" />

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.VIEW" />



                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.BROWSABLE" />



                <data android:scheme="http" />

                <data android:mimeType="audio/*" />

                <data android:mimeType="application/ogg" />

                <data android:mimeType="application/x-ogg" />

                <data android:mimeType="application/itunes" />

            </intent-filter>

        </activity>

        <!-- 4x1 App Widget -->

        <receiver

            android:name="org.lineageos.eleven.appwidgets.AppWidgetSmall"

            android:exported="false"

            android:label="@string/app_widget_small" >

            <intent-filter>

                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />

            </intent-filter>



            <meta-data

                android:name="android.appwidget.provider"

                android:resource="@xml/app_widget_small" />

        </receiver>

        <!-- 4x2  App Widget -->

        <receiver

            android:name="org.lineageos.eleven.appwidgets.AppWidgetLarge"

            android:exported="false"

            android:label="@string/app_widget_large" >

            <intent-filter>

                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />

            </intent-filter>



            <meta-data

                android:name="android.appwidget.provider"

                android:resource="@xml/app_widget_large" />

        </receiver>

        <!-- 4x2 alternate App Widget -->

        <receiver

            android:name="org.lineageos.eleven.appwidgets.AppWidgetLargeAlternate"

            android:exported="false"

            android:label="@string/app_widget_large_alt" >

            <intent-filter>

                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />

            </intent-filter>



            <meta-data

                android:name="android.appwidget.provider"

                android:resource="@xml/app_widget_large_alternate" />

        </receiver>

        <!-- Media button receiver -->

        <receiver android:name="org.lineageos.eleven.MediaButtonIntentReceiver" >

            <intent-filter>

                <action android:name="android.intent.action.MEDIA_BUTTON" />

            </intent-filter>

        </receiver>

        <!-- Used to recalculate sorting of songs based on the user's locale -->

        <receiver android:name="org.lineageos.eleven.locale.LocaleChangeReceiver">

            <intent-filter>

                <action android:name="android.intent.action.LOCALE_CHANGED"/>

            </intent-filter>

        </receiver>

        <!-- Music service -->

        <service

            android:name="org.lineageos.eleven.MusicPlaybackService"

            android:label="@string/app_name"

            android:process=":main" />

    </application>



</manifest>

AndroidManifest.xml

+15 −9
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2012 Andrew Neal

     Copyright (C) 2014 The CyanogenMod Project

     Copyright (C) 2019-2020 The LineageOS Project

     Copyright (C) 2019-2021 The LineageOS Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.
@@ -18,14 +18,19 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:tools="http://schemas.android.com/tools"

    package="org.lineageos.eleven"

    android:versionCode="3"

    android:versionName="3.0"

    android:versionCode="401"

    android:versionName="4.0.1"

    tools:ignore="GradleOverrides">



    <uses-sdk

        android:minSdkVersion="26"

        android:targetSdkVersion="29" />



        android:minSdkVersion="28"

        android:targetSdkVersion="30" />



    <!-- Android Studio will complain about not being able to

         resove the symbol, but it compiles with no problem.

         Do not remove for as long as there are officially supported

         devices that were supported in 14.1 -->

    <!-- suppress AndroidElementNotAllowed -->

    <original-package android:name="com.cyanogenmod.eleven" />



    <!-- Used for caching and creating new playlists -->
@@ -39,13 +44,15 @@ 
    <!-- Lower or raise the music based on the phone state -->

    <uses-permission android:name="android.permission.READ_PHONE_STATE" />

    <!-- Used to set the devices's ringtone -->

    <uses-permission android:name="android.permission.WRITE_SETTINGS" />

    <uses-permission android:name="android.permission.WRITE_SETTINGS"

        tools:ignore="ProtectedPermissions" />

    <!-- Used to create launcher shortcuts -->

    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />

    <!-- Allows Eleven to read from External Storage -->

    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

    <!-- Allows Eleven to modify media files on external storage -->

    <uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE" />

    <uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE"

        tools:ignore="ProtectedPermissions" />



    <!-- Audio Visualizer Permissions -->

    <uses-permission android:name="android.permission.RECORD_AUDIO" />
@@ -205,5 +212,4 @@ 
            android:label="@string/app_name"

            android:process=":main" />

    </application>



</manifest>

assets/licenses.html

deleted100644 → 0
+0 −89
Original line number Diff line number Diff line 
<html><head><style> body { } pre { background-color: #eeeeee; padding: 1em; white-space: pre-wrap; } </style></head><body>

<h3>Notices for files:</h3>

<ul>

<li>ActionBarSherlock</li>

<li>NineOldAndroids.jar</li>

</ul>

<pre>

/*

 * Copyright 2012 Jake Wharton

 *

 * 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.

 */

</pre>



<h3>Notices for file:</h3>

<ul>

<li>AppMsg</li>

</ul>

<pre>

/*

 * Copyright 2012 Evgeny Shishkin

 *

 * 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.

 */

</pre>



<h3>Notices for files:</h3><ul>

<li>DragSortListView</li>

</ul>

<pre>

/*

 * Copyright (C) 2012 Carl Bauer

 *

 * 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.

 */

</pre>

</body></html>



<h3>Notices for file:</h3><ul>

<li>android-support-v4.jar</li>

</ul>

<pre>

/*

 * Copyright (C) 2012 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.

 */

</pre>

</body></html>