Merged with lineage-15.1 branch on 10.03.2018

AndroidManifest.xml

@@ -15,14 +15,16 @@
      limitations under the License.
  -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.cyanogenmod.eleven"
+    package="org.lineageos.eleven"
     android:versionCode="3"
     android:versionName="3.0" >
 
     <uses-sdk
         android:minSdkVersion="14"
         android:targetSdkVersion="27" />
 
+    <original-package android:name="com.cyanogenmod.eleven" />
+
     <!-- Used for caching and creating new playlists -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <!-- Used to check for a network connection -->
@@ -52,14 +54,15 @@
     <uses-feature android:name="android.hardware.sensor.accelerometer" />
 
     <application
-        android:name="com.cyanogenmod.eleven.ElevenApplication"
+        android:name="org.lineageos.eleven.ElevenApplication"
         android:allowBackup="true"
         android:allowTaskReparenting="true"
         android:hardwareAccelerated="@bool/config_hardwareAccelerated"
-        android:icon="@mipmap/ic_launcher_eleven"
+        android:appCategory="audio"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:largeHeap="@bool/config_largeHeap"
-        android:taskAffinity="com.cyanogenmod.eleven.task"
+        android:taskAffinity="org.lineageos.eleven.task"
         android:theme="@style/Eleven.Theme">
 
         <!-- Searchable -->
@@ -68,7 +71,7 @@
             android:value=".ui.activities.SearchActivity" />
         <!-- Main activity -->
         <activity
-            android:name="com.cyanogenmod.eleven.ui.activities.HomeActivity"
+            android:name="org.lineageos.eleven.ui.activities.HomeActivity"
             android:windowSoftInputMode="adjustPan"
             android:launchMode="singleTop"
             android:exported="true"
@@ -91,15 +94,15 @@
                 <data android:mimeType="vnd.android.cursor.dir/artists" />
             </intent-filter>
             <intent-filter>
-                <action android:name="com.cyanogenmod.eleven.AUDIO_PLAYER" />
+                <action android:name="org.lineageos.eleven.AUDIO_PLAYER" />
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
         <!-- Search interface -->
         <activity
-            android:name="com.cyanogenmod.eleven.ui.activities.SearchActivity"
+            android:name="org.lineageos.eleven.ui.activities.SearchActivity"
             android:windowSoftInputMode="adjustResize"
             android:exported="true"
             android:theme="@style/Eleven.Theme">
@@ -116,7 +119,7 @@
         </activity>
         <!-- Used to set options -->
         <activity
-            android:name="com.cyanogenmod.eleven.ui.activities.SettingsActivity"
+            android:name="org.lineageos.eleven.ui.activities.SettingsActivity"
             android:label="@string/menu_settings"
             android:theme="@style/Eleven.Theme.ActionBar.Overlay" />
         <!-- Audio Preview -->
@@ -163,7 +166,7 @@
         </activity>
         <!-- 4x1 App Widget -->
         <receiver
-            android:name="com.cyanogenmod.eleven.appwidgets.AppWidgetSmall"
+            android:name="org.lineageos.eleven.appwidgets.AppWidgetSmall"
             android:exported="false"
             android:label="@string/app_widget_small" >
             <intent-filter>
@@ -176,7 +179,7 @@
         </receiver>
         <!-- 4x2  App Widget -->
         <receiver
-            android:name="com.cyanogenmod.eleven.appwidgets.AppWidgetLarge"
+            android:name="org.lineageos.eleven.appwidgets.AppWidgetLarge"
             android:exported="false"
             android:label="@string/app_widget_large" >
             <intent-filter>
@@ -189,7 +192,7 @@
         </receiver>
         <!-- 4x2 alternate App Widget -->
         <receiver
-            android:name="com.cyanogenmod.eleven.appwidgets.AppWidgetLargeAlternate"
+            android:name="org.lineageos.eleven.appwidgets.AppWidgetLargeAlternate"
             android:exported="false"
             android:label="@string/app_widget_large_alt" >
             <intent-filter>
@@ -201,7 +204,7 @@
                 android:resource="@xml/app_widget_large_alternate" />
         </receiver>
         <!-- Media button receiver -->
-        <receiver android:name="com.cyanogenmod.eleven.MediaButtonIntentReceiver" >
+        <receiver android:name="org.lineageos.eleven.MediaButtonIntentReceiver" >
             <intent-filter>
                 <action android:name="android.intent.action.MEDIA_BUTTON" />
                 <action android:name="android.media.AUDIO_BECOMING_NOISY" />
@@ -215,7 +218,7 @@
         </receiver>
         <!-- Music service -->
         <service
-            android:name="com.cyanogenmod.eleven.MusicPlaybackService"
+            android:name="org.lineageos.eleven.MusicPlaybackService"
             android:label="@string/app_name"
             android:process=":main" />
     </application>

README.md

@@ -4,7 +4,8 @@ Eleven music player (CyanogenMod/LineageOS) - compatible with Android version >1
 
 Copied from https://github.com/LineageOS/android_packages_apps_Eleven/archive/cm-14.1.zip (03.08.2017)
 
-Merged with upstream project on 28.12.2017
+Moved to lineage-15.1 branch.
+Merged with upstream project on 10.03.2018
 
 Made compatibility changes for android version >14 using as much material design as possible
 

build.gradle

@@ -20,7 +20,7 @@ android {
     buildToolsVersion "27.0.3"
 
     defaultConfig {
-        applicationId "com.cyanogenmod.eleven"
+        applicationId "org.lineageos.eleven"
         targetSdkVersion 27
         renderscriptTargetApi 27
         renderscriptSupportModeEnabled true
@@ -84,14 +84,14 @@ android {
     }
 
     dependencies {
-        implementation "com.android.support:appcompat-v7:27.0.2"
-        implementation "com.android.support:palette-v7:27.0.2"
-        implementation "com.android.support:recyclerview-v7:27.0.2"
-        implementation "com.android.support:support-v4:27.0.2"
-        implementation "com.android.support:cardview-v7:27.0.2"
-        implementation "com.android.support:preference-v7:27.0.2"
-        implementation "com.android.support:gridlayout-v7:27.0.2"
-        implementation "com.android.support:support-vector-drawable:27.0.2"
+        implementation "com.android.support:appcompat-v7:27.1.0"
+        implementation "com.android.support:palette-v7:27.1.0"
+        implementation "com.android.support:recyclerview-v7:27.1.0"
+        implementation "com.android.support:support-v4:27.1.0"
+        implementation "com.android.support:cardview-v7:27.1.0"
+        implementation "com.android.support:preference-v7:27.1.0"
+        implementation "com.android.support:gridlayout-v7:27.1.0"
+        implementation "com.android.support:support-vector-drawable:27.1.0"
         implementation "com.google.guava:guava:20.0"
         implementation fileTree(include: ['*.jar'], dir: 'libs')
     }

project.properties

@@ -17,9 +17,9 @@ renderscript.target=27
 renderscript.support.mode=true
 sdk.buildtools=27.0.3
 
-android.library.reference.1=../android-support-v7-appcompat-27.0.2
-android.library.reference.2=../android-support-v7-palette-27.0.2
-android.library.reference.3=../android-support-v7-recyclerview-27.0.2
-android.library.reference.4=../android-support-v4-27.0.2
-android.library.reference.5=../android-support-v7-cardview-27.0.2
-android.library.reference.6=../android-support-v7-preference-27.0.2
+android.library.reference.1=../android-support-v7-appcompat-27.1.0
+android.library.reference.2=../android-support-v7-palette-27.1.0
+android.library.reference.3=../android-support-v7-recyclerview-27.1.0
+android.library.reference.4=../android-support-v4-27.1.0
+android.library.reference.5=../android-support-v7-cardview-27.1.0
+android.library.reference.6=../android-support-v7-preference-27.1.0

res/layout-v21/activity_base.xml

@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<com.cyanogenmod.eleven.slidinguppanel.SlidingUpPanelLayout
+<org.lineageos.eleven.slidinguppanel.SlidingUpPanelLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:sothree="http://schemas.android.com/apk/res-auto"
     android:id="@+id/sliding_layout"
@@ -47,7 +47,7 @@
 
     </FrameLayout>
 
-    <com.cyanogenmod.eleven.slidinguppanel.SlidingUpPanelLayout
+    <org.lineageos.eleven.slidinguppanel.SlidingUpPanelLayout
         android:id="@+id/sliding_layout2"
         android:background="@color/activity_base_background_color"
         android:layout_width="match_parent"
@@ -78,7 +78,7 @@
 
                 <fragment
                     android:id="@+id/audioPlayerFragment"
-                    class="com.cyanogenmod.eleven.ui.fragments.AudioPlayerFragment"
+                    class="org.lineageos.eleven.ui.fragments.AudioPlayerFragment"
                     android:layout_width="match_parent"
                     android:layout_height="0dip"
                     android:layout_weight="1" />
@@ -110,10 +110,10 @@
 
             <fragment
                 android:id="@+id/queueFragment"
-                class="com.cyanogenmod.eleven.ui.fragments.QueueFragment"
+                class="org.lineageos.eleven.ui.fragments.QueueFragment"
                 android:layout_width="match_parent"
                 android:layout_height="0dip"
                 android:layout_weight="1" />
         </LinearLayout>
-    </com.cyanogenmod.eleven.slidinguppanel.SlidingUpPanelLayout>
-</com.cyanogenmod.eleven.slidinguppanel.SlidingUpPanelLayout>
+    </org.lineageos.eleven.slidinguppanel.SlidingUpPanelLayout>
+</org.lineageos.eleven.slidinguppanel.SlidingUpPanelLayout>

res/layout-v21/artist_detail_album.xml

@@ -39,7 +39,7 @@
             android:layout_alignParentLeft="true"
             android:scaleType="centerCrop" />
 
-        <com.cyanogenmod.eleven.widgets.PopupMenuButton
+        <org.lineageos.eleven.widgets.PopupMenuButton
             android:id="@+id/overflow"
             android:layout_width="@dimen/overflow_width"
             android:layout_height="match_parent"

res/layout-v21/bottom_action_bar.xml

@@ -28,7 +28,7 @@
     android:background="@android:color/transparent"
     tools:ignore="ContentDescription" >
 
-    <com.cyanogenmod.eleven.widgets.SquareImageView
+    <org.lineageos.eleven.widgets.SquareImageView
         android:id="@+id/bottom_action_bar_album_art"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

res/layout-v21/fragment_music_browser_phone.xml

@@ -24,7 +24,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" >
 
-        <com.cyanogenmod.eleven.widgets.ViewPagerTabs
+        <org.lineageos.eleven.widgets.ViewPagerTabs
             android:id="@+id/fragment_home_phone_pager_titles"
             android:layout_width="match_parent"
             android:layout_height="@dimen/tpi_height"

res/layout-v21/grid_items_normal.xml

@@ -61,7 +61,7 @@
 
             </LinearLayout>
 
-            <com.cyanogenmod.eleven.widgets.PopupMenuButton
+            <org.lineageos.eleven.widgets.PopupMenuButton
                 android:id="@+id/popup_menu_button"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"

res/layout-v21/header_bar.xml

@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<com.cyanogenmod.eleven.ui.HeaderBar 
+<org.lineageos.eleven.ui.HeaderBar 
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:sothree="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
@@ -69,4 +69,4 @@
         android:background="@drawable/selectable_background"
         sothree:srcCompat="@drawable/menu_button_light"/>
 
-</com.cyanogenmod.eleven.ui.HeaderBar>
+</org.lineageos.eleven.ui.HeaderBar>

res/layout/activity_base.xml

@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<com.cyanogenmod.eleven.slidinguppanel.SlidingUpPanelLayout
+<org.lineageos.eleven.slidinguppanel.SlidingUpPanelLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:sothree="http://schemas.android.com/apk/res-auto"
     android:id="@+id/sliding_layout"
@@ -47,7 +47,7 @@
 
     </FrameLayout>
 
-    <com.cyanogenmod.eleven.slidinguppanel.SlidingUpPanelLayout
+    <org.lineageos.eleven.slidinguppanel.SlidingUpPanelLayout
         android:id="@+id/sliding_layout2"
         android:background="@color/activity_base_background_color"
         android:layout_width="match_parent"
@@ -78,7 +78,7 @@
 
                 <fragment
                     android:id="@+id/audioPlayerFragment"
-                    class="com.cyanogenmod.eleven.ui.fragments.AudioPlayerFragment"
+                    class="org.lineageos.eleven.ui.fragments.AudioPlayerFragment"
                     android:layout_width="match_parent"
                     android:layout_height="0dip"
                     android:layout_weight="1" />
@@ -110,10 +110,10 @@
 
             <fragment
                 android:id="@+id/queueFragment"
-                class="com.cyanogenmod.eleven.ui.fragments.QueueFragment"
+                class="org.lineageos.eleven.ui.fragments.QueueFragment"
                 android:layout_width="match_parent"
                 android:layout_height="0dip"
                 android:layout_weight="1" />
         </LinearLayout>
-    </com.cyanogenmod.eleven.slidinguppanel.SlidingUpPanelLayout>
-</com.cyanogenmod.eleven.slidinguppanel.SlidingUpPanelLayout>
+    </org.lineageos.eleven.slidinguppanel.SlidingUpPanelLayout>
+</org.lineageos.eleven.slidinguppanel.SlidingUpPanelLayout>

res/layout/album_art_fragment.xml

@@ -18,7 +18,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
-    <com.cyanogenmod.eleven.widgets.SquareImageView
+    <org.lineageos.eleven.widgets.SquareImageView
         android:id="@+id/audio_player_album_art"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

res/layout/album_detail_song.xml

@@ -20,7 +20,7 @@
             sothree:srcCompat="@drawable/now_playing_icon"
             android:visibility="gone" />
 
-        <com.cyanogenmod.eleven.widgets.PopupMenuButton
+        <org.lineageos.eleven.widgets.PopupMenuButton
             android:id="@+id/overflow"
             android:layout_width="@dimen/overflow_width"
             android:layout_height="@dimen/overflow_height"

res/layout/artist_detail_album.xml

@@ -39,7 +39,7 @@
             android:layout_alignParentLeft="true"
             android:scaleType="centerCrop" />
 
-        <com.cyanogenmod.eleven.widgets.PopupMenuButton
+        <org.lineageos.eleven.widgets.PopupMenuButton
             android:id="@+id/overflow"
             android:layout_width="@dimen/overflow_width"
             android:layout_height="match_parent"

res/layout/artist_detail_song.xml

@@ -31,7 +31,7 @@
             sothree:srcCompat="@drawable/now_playing_icon"
             android:visibility="gone" />
 
-        <com.cyanogenmod.eleven.widgets.PopupMenuButton
+        <org.lineageos.eleven.widgets.PopupMenuButton
             android:id="@+id/overflow"
             android:layout_width="@dimen/overflow_width"
             android:layout_height="@dimen/overflow_height"

res/layout/blur_scrim_image.xml

@@ -14,7 +14,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.cyanogenmod.eleven.widgets.BlurScrimImage
+<org.lineageos.eleven.widgets.BlurScrimImage
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/blurScrimImage"
     android:layout_width="match_parent"
@@ -31,4 +31,4 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"/>
-</com.cyanogenmod.eleven.widgets.BlurScrimImage>
+</org.lineageos.eleven.widgets.BlurScrimImage>

res/layout/bottom_action_bar.xml

@@ -28,7 +28,7 @@
     android:background="@android:color/transparent"
     tools:ignore="ContentDescription" >
 
-    <com.cyanogenmod.eleven.widgets.SquareImageView
+    <org.lineageos.eleven.widgets.SquareImageView
         android:id="@+id/bottom_action_bar_album_art"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

res/layout/fragment_music_browser_phone.xml

@@ -24,7 +24,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" >
 
-        <com.cyanogenmod.eleven.widgets.ViewPagerTabs
+        <org.lineageos.eleven.widgets.ViewPagerTabs
             android:id="@+id/fragment_home_phone_pager_titles"
             android:layout_width="match_parent"
             android:layout_height="@dimen/tpi_height"

res/layout/grid_items_normal.xml

@@ -61,7 +61,7 @@
 
             </LinearLayout>
 
-            <com.cyanogenmod.eleven.widgets.PopupMenuButton
+            <org.lineageos.eleven.widgets.PopupMenuButton
                 android:id="@+id/popup_menu_button"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"