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

Commit 4d337030 authored by lopez05656's avatar lopez05656 Committed by Bruno Martins
Browse files

Eleven: Add title scrolling behavior 

Increment the minor version number to reflect the change (4.1.1)

Change-Id: I934a0d7c39ea6a0052e208ae788f8d409bbf73fb
parent 1b0900aa

AndroidManifest.xml

+3 −3
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-2021 The LineageOS Project

     Copyright (C) 2019-2022 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,8 +18,8 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

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

    package="org.lineageos.eleven"

    android:versionCode="410"

    android:versionName="4.1.0"

    android:versionCode="411"

    android:versionName="4.1.1"

    tools:ignore="GradleOverrides">



    <uses-sdk

build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ android { 
        minSdkVersion 28

        targetSdkVersion 31



        versionCode 410

        versionName '4.1.0'

        versionCode 411

        versionName '4.1.1'

    }



    buildTypes {

res/layout/audio_player_header_bar.xml

+13 −7
Original line number Diff line number Diff line 
<!--

     Copyright (C) 2014 The CyanogenMod Project

     Copyright (C) 2021 The LineageOS Project

     Copyright (C) 2021-2022 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.
@@ -15,7 +15,6 @@ 
     limitations under the License.

-->

<androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

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

    android:id="@+id/audio_player_header"

    android:layout_width="match_parent"
@@ -23,7 +22,6 @@ 
    android:background="@android:color/transparent"

    android:elevation="@dimen/action_bar_elevation"

    android:theme="@style/ToolBarThemeMP"

    app:popupTheme="@style/ToolBarPopupTheme"

    tools:background="@color/blue_dark">



    <LinearLayout
@@ -38,8 +36,12 @@ 
            android:id="@+id/header_bar_song_title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:ellipsize="end"

            android:maxLines="1"

            android:singleLine="true"

            android:ellipsize="marquee"

            android:marqueeRepeatLimit ="marquee_forever"

            android:focusable="true"

            android:focusableInTouchMode="true"

            android:scrollHorizontally="true"

            android:textAllCaps="true"

            android:textColor="@color/white"

            android:textSize="@dimen/text_size_medium"
@@ -50,8 +52,12 @@ 
            android:id="@+id/header_bar_artist_title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:ellipsize="end"

            android:maxLines="1"

            android:singleLine="true"

            android:ellipsize="marquee"

            android:marqueeRepeatLimit ="marquee_forever"

            android:focusable="true"

            android:focusableInTouchMode="true"

            android:scrollHorizontally="true"

            android:paddingBottom="2dp"

            android:textAllCaps="true"

            android:textColor="@color/white"

res/layout/bottom_action_bar.xml

+14 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
<!--

     Copyright (C) 2012 Andrew Neal

     Copyright (C) 2014 The CyanogenMod Project

     Copyright (C) 2021 The LineageOS Project

     Copyright (C) 2021-2022 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.
@@ -44,10 +44,22 @@ 


        <TextView

            android:id="@+id/bottom_action_bar_line_one"

            android:singleLine="true"

            android:ellipsize="marquee"

            android:marqueeRepeatLimit ="marquee_forever"

            android:focusable="true"

            android:focusableInTouchMode="true"

            android:scrollHorizontally="true"

            style="@style/BottomActionBarLineOne" />



        <TextView

            android:id="@+id/bottom_action_bar_line_two"

            android:singleLine="true"

            android:ellipsize="marquee"

            android:marqueeRepeatLimit ="marquee_forever"

            android:focusable="true"

            android:focusableInTouchMode="true"

            android:scrollHorizontally="true"

            style="@style/BottomActionBarLineTwo"

            android:layout_below="@+id/bottom_action_bar_line_one" />

src/org/lineageos/eleven/ui/activities/BaseActivity.java

+3 −1
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 Andrew Neal

 * Copyright (C) 2014 The CyanogenMod Project

 * Copyright (C) 2019-2021 The LineageOS Project

 * Copyright (C) 2019-2022 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.
@@ -300,8 +300,10 @@ public abstract class BaseActivity extends AppCompatActivity implements ServiceC 


        // Track name

        mTrackName = findViewById(R.id.bottom_action_bar_line_one);

        findViewById(R.id.bottom_action_bar_line_one).setSelected(true);

        // Artist name

        mArtistName = findViewById(R.id.bottom_action_bar_line_two);

        findViewById(R.id.bottom_action_bar_line_two).setSelected(true);

        // Album art

        mAlbumArt = findViewById(R.id.bottom_action_bar_album_art);

        // Open to the currently playing album profile