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

Commit 40030b0a authored by linus_lee's avatar linus_lee Committed by Gerrit Code Review
Browse files

Merge "Add improved localized sorting (similar to contacts sorting) to Eleven" into cm-12.0

parents aa02c18e 7124d4f4

Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -11,7 +11,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
    android-common \

    android-visualizer \

    eleven_support_v4 \

    eleven_recyclerview

    eleven_recyclerview \

    guava



LOCAL_PACKAGE_NAME := Eleven

LOCAL_OVERRIDES_PACKAGES := Music

AndroidManifest.xml

+6 −0
Original line number Diff line number Diff line
@@ -206,6 +206,12 @@ 
                <action android:name="android.media.AUDIO_BECOMING_NOISY" />

            </intent-filter>

        </receiver>

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

        <receiver android:name=".locale.LocaleChangeReceiver">

            <intent-filter>

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

            </intent-filter>

        </receiver>

        <!-- Music service -->

        <service

            android:name="com.cyanogenmod.eleven.MusicPlaybackService"

res/layout/fragment_music_browser_phone.xml

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
        <com.viewpagerindicator.TabPageIndicator

            android:id="@+id/fragment_home_phone_pager_titles"

            android:background="@color/tpi_background_color"

            android:layout_width="wrap_content"

            android:layout_width="match_parent"

            android:layout_height="@dimen/tpi_height" />



        <android.support.v4.view.ViewPager

src/com/cyanogenmod/eleven/adapters/ArtistDetailAlbumAdapter.java

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import android.widget.TextView; 
import com.cyanogenmod.eleven.Config;

import com.cyanogenmod.eleven.R;

import com.cyanogenmod.eleven.cache.ImageFetcher;

import com.cyanogenmod.eleven.loaders.ArtistAlbumLoader;

import com.cyanogenmod.eleven.loaders.AlbumLoader;

import com.cyanogenmod.eleven.model.Album;

import com.cyanogenmod.eleven.utils.ApolloUtils;

import com.cyanogenmod.eleven.utils.NavUtils;
@@ -130,7 +130,7 @@ implements LoaderCallbacks<List<Album>>, IPopupMenuCallback { 


    @Override // LoaderCallbacks

    public Loader<List<Album>> onCreateLoader(int id, Bundle args) {

        return new ArtistAlbumLoader(mActivity, args.getLong(Config.ID));

        return new AlbumLoader(mActivity, args.getLong(Config.ID));

    }



    @Override // LoaderCallbacks

src/com/cyanogenmod/eleven/adapters/ArtistDetailSongAdapter.java

+4 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package com.cyanogenmod.eleven.adapters; 


import android.app.Activity;

import android.os.Bundle;

import android.provider.MediaStore;

import android.support.v4.content.Loader;

import android.view.View;

import android.widget.ImageView;
@@ -25,7 +26,7 @@ import android.widget.TextView; 
import com.cyanogenmod.eleven.Config;

import com.cyanogenmod.eleven.R;

import com.cyanogenmod.eleven.cache.ImageFetcher;

import com.cyanogenmod.eleven.loaders.ArtistSongLoader;

import com.cyanogenmod.eleven.loaders.SongLoader;

import com.cyanogenmod.eleven.model.Song;



import java.util.List;
@@ -45,7 +46,8 @@ public abstract class ArtistDetailSongAdapter extends DetailSongAdapter { 
    public Loader<List<Song>> onCreateLoader(int id, Bundle args) {

        onLoading();

        setSourceId(args.getLong(Config.ID));

        return new ArtistSongLoader(mActivity, getSourceId());

        final String selection = MediaStore.Audio.AudioColumns.ARTIST_ID + "=" + getSourceId();

        return new SongLoader(mActivity, selection);

    }



    protected Holder newHolder(View root, ImageFetcher fetcher) {