3 files changed, 20 insertions, 3 deletions

diff --git a/app/src/main/java/mygram/droid/FolderActivity.java b/app/src/main/java/mygram/droid/FolderActivity.java
index c7002c5..dd674c4 100644
--- a/app/src/main/java/mygram/droid/FolderActivity.java
+++ b/app/src/main/java/mygram/droid/FolderActivity.java
@@ -19,6 +19,7 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.Gravity;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
@@ -51,9 +52,15 @@ public final class FolderActivity extends Activity {
 		super.onCreate(state);
 		LinearLayout column = new LinearLayout(this);
 		column.setOrientation(LinearLayout.VERTICAL);
+		LinearLayout header = new LinearLayout(this);
+		header.setGravity(Gravity.CENTER_VERTICAL);
+		int p = Ui.dp(this, 16);
+		header.setPadding(p * 2, p, p * 2, 0);
+		header.addView(Ui.iconButton(this, R.drawable.ic_arrow_back, "Back", v -> finish()));
 		TextView title = Ui.text(this, getIntent().getStringExtra("name"), 24);
-		title.setPadding(Ui.dp(this, 36), Ui.dp(this, 24), 0, 0);
-		column.addView(title);
+		title.setPadding(p, 0, 0, 0);
+		header.addView(title);
+		column.addView(header);
 		content = new FrameLayout(this);
 		column.addView(content, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 0, 1));
 		setContentView(column);
diff --git a/app/src/main/java/mygram/droid/MainActivity.java b/app/src/main/java/mygram/droid/MainActivity.java
index 3292f90..7c29e0a 100644
--- a/app/src/main/java/mygram/droid/MainActivity.java
+++ b/app/src/main/java/mygram/droid/MainActivity.java
@@ -220,6 +220,16 @@ public final class MainActivity extends Activity {
 		handler.removeCallbacks(rotate);
 	}
 
+	/** Back from Liked or Folders returns to Home; from Home it leaves the app. */
+	@Override
+	@SuppressWarnings("deprecation") // no predictive back on this TV; onBackPressed still fires
+	public void onBackPressed() {
+		if (ready && tab != HOME)
+			show(HOME);
+		else
+			super.onBackPressed();
+	}
+
 	@Override
 	protected void onDestroy() {
 		handler.removeCallbacks(rotate);
diff --git a/app/src/main/java/mygram/droid/Ui.java b/app/src/main/java/mygram/droid/Ui.java
index 65de7f8..586aa65 100644
--- a/app/src/main/java/mygram/droid/Ui.java
+++ b/app/src/main/java/mygram/droid/Ui.java
@@ -113,7 +113,7 @@ final class Ui {
 		t.setVisibility(View.INVISIBLE);
 		box.addView(t);
 		box.setFocusable(true);
-		box.setForeground(c.getDrawable(R.drawable.focus_ring));
+		box.setBackground(c.getDrawable(R.drawable.focus_glow));
 		box.setOnFocusChangeListener((v, has) -> {
 			t.setVisibility(has ? View.VISIBLE : View.INVISIBLE);
 			zoom(v, has);