Minor update.

- Update support library/gradle versions.
- Fix ellipses in strings file.
- Move "start session" from button to app bar icon.

Change-Id: I1fd036d20d67c2cfaa1b8b3bc9143e0096847a9f

Author: nic0lette

build.gradle

@@ -23,7 +23,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Dec 01 10:33:41 PST 2017
+#Fri Apr 13 10:26:08 KST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

mediacontroller/build.gradle

@@ -18,7 +18,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion "27.0.1"
+    buildToolsVersion '27.0.3'
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -45,15 +45,8 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support:design:27.1.1'
 
-    compile 'com.android.support:appcompat-v7:27.0.2'
-    compile 'com.android.support:design:27.0.2'
-
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
-
-    testCompile 'junit:junit:4.12'
+    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
 }

mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppControllerActivity.java

@@ -54,6 +54,8 @@
 import android.util.Log;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -360,6 +362,25 @@ protected void onRestoreInstanceState(Bundle savedInstanceState) {
         mUriInput.setText(savedInstanceState.getString(STATE_URI_KEY));
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.controller, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item != null && item.getItemId() == R.id.start_session) {
+            if (mController != null) {
+                startSessionActivity(mController);
+            } else {
+                Toast.makeText(this, R.string.no_session, Toast.LENGTH_SHORT).show();
+            }
+            return true;
+        }
+        return false;
+    }
+
     private void setupToolbar(String name, Bitmap icon) {
         final ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
@@ -430,14 +451,6 @@ private void setupButtons() {
         findViewById(R.id.action_prepare).setOnClickListener(preparePlayHandler);
         findViewById(R.id.action_play).setOnClickListener(preparePlayHandler);
 
-        findViewById(R.id.start_session_activity_button).setOnClickListener(v -> {
-            if (mController != null) {
-                startSessionActivity(mController);
-            } else {
-                Log.w(TAG, "Media session does not contain an Activity to start");
-            }
-        });
-
         mAudioFocusHelper = new AudioFocusHelper(this,
                 findViewById(R.id.audio_focus_button),
                 findViewById(R.id.audio_focus_type));
@@ -620,11 +633,10 @@ private void startSessionActivity(MediaControllerCompat mediaController) {
                 intent.send();
                 return;
             } catch (PendingIntent.CanceledException e) {
-                e.printStackTrace();
-                Log.e(TAG, e.toString());
+                Log.e(TAG, "Failed to start session activity", e);
             }
         }
-        Log.w(TAG, "Failed to open app by session activity.");
+        Toast.makeText(this, R.string.session_start_failed, Toast.LENGTH_SHORT).show();
     }
 
     private class PreparePlayHandler implements View.OnClickListener {

mediacontroller/src/main/res/drawable/ic_launch_black_24dp.xml

@@ -0,0 +1,25 @@
+
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19,19H5V5h7V3H5c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2v-7h-2v7zM14,3v2h3.59l-9.83,9.83 1.41,1.41L19,6.41V10h2V3h-7z"/>
+vector>

mediacontroller/src/main/res/layout/media_info.xml

@@ -86,12 +86,6 @@
         android:gravity="top|start"
         android:text="@string/media_info_default" />
 
-    <Button
-        android:id="@+id/start_session_activity_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/start_session_activity" />
-
     <TextView
         style="@style/TextAppearance.AppCompat.Large"
         android:layout_width="wrap_content"

mediacontroller/src/main/res/menu/controller.xml

@@ -0,0 +1,28 @@
+xml version="1.0" encoding="utf-8"?>
+
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/start_session"
+        android:icon="@drawable/ic_launch_black_24dp"
+        android:title="@string/start_session_activity"
+        app:iconTint="@color/appBarIconTint"
+        app:showAsAction="always"/>
+
+menu>

mediacontroller/src/main/res/values/colors.xml

@@ -21,6 +21,8 @@
     <color name="colorAccent">#ff4081color>
     <color name="colorInactive">#a0a0a0color>
 
+    <color name="appBarIconTint">#fffcolor>
+
     <color name="background_grey">#e0e0e0color>
     <color name="background_white">#f0f0f0color>
 

mediacontroller/src/main/res/values/strings.xml

@@ -88,13 +88,16 @@
     <string name="audio_focus_title">Audio Focusstring>
     <string name="audio_focus_gain_focus">Gainstring>
     <string name="audio_focus_abandon_focus">Abandonstring>
+
     <string name="start_session_activity">Start Session Activitystring>
+    <string name="no_session">Media session does not contain an Activity to startstring>
+    <string name="session_start_failed">Failed to open app by session activitystring>
 
     <string name="media_browse_tree_top">Topstring>
     <string name="media_browse_tree_up">Upstring>
     <string name="media_browse_tree_header">App-provided MediaItemsstring>
     <string name="media_no_browser">No Browserstring>
-    <string name="media_browse_tree_loading">Loading...string>
+    <string name="media_browse_tree_loading">Loading…string>
     <string name="media_browse_tree_empty">Empty.string>
     <string name="search_media">Searchstring>