MiPad4/android_device_xiaomi_sdm660-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sdm660-common: DeviceSettings: Adapt to S style

Browse source 
Co-authored-by: pix106 <sbordenave@gmail.com>
Signed-off-by: pix106 <sbordenave@gmail.com>
This commit is contained in:
TheScarastic 2021-12-05 08:23:40 +01:00 committed by pix106
parent 0ac2261ee8
commit c778a3ca9f
6 changed files with 12 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
DeviceSettings/Android.bp
View file

@ -19,7 +19,6 @@ android_app {
static_libs: [
"androidx.core_core",
"androidx.preference_preference",
"org.lineageos.settings.resources",
],

2
DeviceSettings/AndroidManifest.xml
View file

@ -28,7 +28,7 @@
<application
android:label="@string/advanced_settings"
android:supportsRtl="true"
android:theme="@style/AppTheme">
android:theme="@style/Theme.SubSettingsBase">
<receiver
android:name=".BootReceiver"
android:defaultToDeviceProtectedStorage="true"

5
DeviceSettings/res/values/styles.xml
View file

@ -14,9 +14,4 @@
limitations under the License.
-->
<resources>
<style name="AppTheme" parent="@android:style/Theme.DeviceDefault.Settings">
<item name="preferenceTheme">@style/PreferenceTheme</item>
</style>
<style name="PreferenceTheme" parent="@android:style/Theme.DeviceDefault.Settings" />
</resources>

23
DeviceSettings/src/org/lineageos/settings/device/DeviceSettingsActivity.java
View file

@ -16,35 +16,28 @@
package org.lineageos.settings.device;
import android.app.Activity;
import android.app.Fragment;
import android.os.Bundle;
import android.view.MenuItem;
public class DeviceSettingsActivity extends Activity {
import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
import com.android.settingslib.collapsingtoolbar.R;
public class DeviceSettingsActivity extends CollapsingToolbarBaseActivity {
private DeviceSettings deviceSettingsFragment;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
getActionBar().setDisplayHomeAsUpEnabled(true);
Fragment fragment = getFragmentManager().findFragmentById(android.R.id.content);
DeviceSettings deviceSettingsFragment;
Fragment fragment = getFragmentManager().findFragmentById(R.id.content_frame);
if (fragment == null) {
deviceSettingsFragment = new DeviceSettings();
getFragmentManager().beginTransaction()
.add(android.R.id.content, deviceSettingsFragment)
.add(R.id.content_frame, deviceSettingsFragment)
.commit();
}
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == android.R.id.home) {
finish();
return true;
}
return super.onOptionsItemSelected(item);
}
}

1
DeviceSettings/src/org/lineageos/settings/device/kcal/KCalSettings.java
View file

@ -44,7 +44,6 @@ public class KCalSettings extends PreferenceFragment implements
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
getActivity().getActionBar().setDisplayHomeAsUpEnabled(true);
}
@Override

6
DeviceSettings/src/org/lineageos/settings/device/kcal/KCalSettingsActivity.java
View file

@ -16,16 +16,16 @@
package org.lineageos.settings.device.kcal;
import android.app.Activity;
import android.app.Fragment;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import org.lineageos.settings.device.R;
import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
import com.android.settingslib.collapsingtoolbar.R;
public class KCalSettingsActivity extends Activity implements Utils {
public class KCalSettingsActivity extends CollapsingToolbarBaseActivity implements Utils {
private KCalSettings mKCalSettingsFragment;