From 34d5a498856c8568a9d524f3b261f6411e7f5a45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20=C5=A0trobl?= Date: Wed, 22 Dec 2021 12:48:32 +0100 Subject: [PATCH] sdm660-common: DeviceSettings: Adapt Clear Speaker for A12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Štrobl Signed-off-by: pix106 --- .../device/speaker/ClearSpeakerActivity.java | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/DeviceSettings/src/org/lineageos/settings/device/speaker/ClearSpeakerActivity.java b/DeviceSettings/src/org/lineageos/settings/device/speaker/ClearSpeakerActivity.java index c249dc14..eeb78dd1 100644 --- a/DeviceSettings/src/org/lineageos/settings/device/speaker/ClearSpeakerActivity.java +++ b/DeviceSettings/src/org/lineageos/settings/device/speaker/ClearSpeakerActivity.java @@ -16,35 +16,28 @@ package org.lineageos.settings.device.speaker; -import android.app.Activity; import android.app.Fragment; import android.os.Bundle; import android.view.MenuItem; -public class ClearSpeakerActivity extends Activity { +import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity; +import com.android.settingslib.collapsingtoolbar.R; + +public class ClearSpeakerActivity extends CollapsingToolbarBaseActivity { + + private ClearSpeakerFragment clearSpeakerFragment; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - getActionBar().setDisplayHomeAsUpEnabled(true); - Fragment fragment = getFragmentManager().findFragmentById(android.R.id.content); - ClearSpeakerFragment clearSpeakerFragment; + Fragment fragment = getFragmentManager().findFragmentById(R.id.content_frame); if (fragment == null) { clearSpeakerFragment = new ClearSpeakerFragment(); getFragmentManager().beginTransaction() - .add(android.R.id.content, clearSpeakerFragment) + .add(R.id.content_frame, clearSpeakerFragment) .commit(); } } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - if (item.getItemId() == android.R.id.home) { - finish(); - return true; - } - return super.onOptionsItemSelected(item); - } }