Skip to content

Migrate Android Auto implementation to androidx.car.app:app:1.7.0 #2008

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rainman74 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Migrate Android Auto implementation to androidx.car.app:app:1.7.0 #2008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions TMessagesProj/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@ dependencies {

implementation 'com.google.android.gms:play-services-cast-framework:21.4.0'
implementation "androidx.mediarouter:mediarouter:1.7.0"
implementation "androidx.media:media:1.7.0"
implementation "androidx.lifecycle:lifecycle-runtime:2.7.0"

implementation 'androidx.car.app:app:1.4.0'
implementation 'androidx.car.app:app-projected:1.4.0'
implementation 'androidx.car.app:app:1.7.0'
implementation 'org.nanohttpd:nanohttpd:2.3.1'

compileOnly 'org.checkerframework:checker-qual:2.5.2'
Expand Down
4 changes: 1 addition & 3 deletions TMessagesProj/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,6 @@

<meta-data android:name="com.google.android.gms.wallet.api.enabled" android:value="true" />

<!--
<meta-data android:name="com.google.android.gms.car.notification.SmallIcon" android:resource="@drawable/ic_player" />
<meta-data android:name="com.google.android.gms.car.application" android:resource="@xml/automotive_app_desc" />

Expand All @@ -688,8 +687,7 @@

<meta-data
android:name="androidx.car.app.minCarApiLevel"
android:value="5" />
-->
android:value="7" />

<meta-data android:name="com.google.android.gms.vision.DEPENDENCIES" android:value="face,barcode" />

Expand Down
12 changes: 6 additions & 6 deletions ...j/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@
import android.os.Looper;
import android.os.ResultReceiver;
import android.os.SystemClock;
import android.support.v4.media.MediaDescriptionCompat;
import android.support.v4.media.MediaMetadataCompat;
import android.support.v4.media.RatingCompat;
import android.support.v4.media.session.MediaControllerCompat;
import android.support.v4.media.session.MediaSessionCompat;
import android.support.v4.media.session.PlaybackStateCompat;
import androidx.media.MediaDescriptionCompat;
import androidx.media.MediaMetadataCompat;
import androidx.media.RatingCompat;
import androidx.media.session.MediaControllerCompat;
import androidx.media.session.MediaSessionCompat;
import androidx.media.session.PlaybackStateCompat;
import android.util.Pair;
import android.view.KeyEvent;
import androidx.annotation.LongDef;
Expand Down
6 changes: 3 additions & 3 deletions ...roj/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@

import android.os.Bundle;
import android.os.ResultReceiver;
import android.support.v4.media.MediaDescriptionCompat;
import android.support.v4.media.session.MediaControllerCompat;
import android.support.v4.media.session.MediaSessionCompat;
import androidx.media.MediaDescriptionCompat;
import androidx.media.session.MediaControllerCompat;
import androidx.media.session.MediaSessionCompat;
import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.MediaItem;
Expand Down
6 changes: 3 additions & 3 deletions .../src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@

import android.os.Bundle;
import android.os.ResultReceiver;
import android.support.v4.media.MediaDescriptionCompat;
import android.support.v4.media.session.MediaSessionCompat;
import android.support.v4.media.session.PlaybackStateCompat;
import androidx.media.MediaDescriptionCompat;
import androidx.media.session.MediaSessionCompat;
import androidx.media.session.PlaybackStateCompat;
import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Player;
Expand Down
6 changes: 3 additions & 3 deletions TMessagesProj/src/main/java/org/telegram/messenger/MusicPlayerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
import android.media.AudioManager;
import android.media.MediaMetadataRetriever;
import android.media.RemoteControlClient;
import android.support.v4.media.MediaMetadataCompat;
import android.support.v4.media.session.MediaSessionCompat;
import android.support.v4.media.session.PlaybackStateCompat;
import androidx.media.MediaMetadataCompat;
import androidx.media.session.MediaSessionCompat;
import androidx.media.session.PlaybackStateCompat;
import android.net.Uri;
import android.os.Build;
import android.os.IBinder;
Expand Down
8 changes: 4 additions & 4 deletions TMessagesProj/src/main/java/org/telegram/messenger/TelegramMediaSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
import android.os.Build;
import android.os.Bundle;
import android.os.SystemClock;
import android.support.v4.media.MediaDescriptionCompat;
import android.support.v4.media.MediaMetadataCompat;
import android.support.v4.media.session.MediaSessionCompat;
import android.support.v4.media.session.PlaybackStateCompat;
import androidx.media.MediaDescriptionCompat;
import androidx.media.MediaMetadataCompat;
import androidx.media.session.MediaSessionCompat;
import androidx.media.session.PlaybackStateCompat;
import android.text.TextUtils;

import androidx.annotation.Nullable;
Expand Down
2 changes: 1 addition & 1 deletion TMessagesProj/src/main/java/org/telegram/messenger/car/HomeScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ private CarMessage buildCarMessage(MessageObject mo, long dialogId, boolean isGr
} else if (chat != null) {
senderBuilder.setName(chat.title != null ? chat.title : "").setKey("c" + chat.id);
} else {
senderBuilder.setName("");
senderBuilder.setName("").setKey("d" + dialogId);
}

return new CarMessage.Builder()
Expand Down
2 changes: 1 addition & 1 deletion TMessagesProj/src/main/java/org/telegram/messenger/car/MusicSongsScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.telegram.messenger.car;

import android.support.v4.media.session.MediaControllerCompat;
import androidx.media.session.MediaControllerCompat;

import androidx.annotation.NonNull;
import androidx.car.app.CarContext;
Expand Down
2 changes: 1 addition & 1 deletion TMessagesProj/src/main/java/org/telegram/messenger/pip/PipActivityController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.telegram.messenger.pip;

import android.app.Activity;
import android.support.v4.media.session.MediaSessionCompat;
import androidx.media.session.MediaSessionCompat;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
Expand Down
3 changes: 2 additions & 1 deletion TMessagesProj/src/main/res/xml/automotive_app_desc.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
<automotiveApp>
<uses name="notification"/>
<uses name="template"/>
</automotiveApp>
<uses name="media"/>
</automotiveApp>