universal7885: parts: Inherit settingslib for main fragment

* Also, drop more custom resources
This commit is contained in:
roynatech2544 2022-04-15 10:47:56 +09:00
commit 7d313f6d93
6 changed files with 34 additions and 87 deletions

View file

@ -1,42 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="CustomOptionsTheme" parent="@android:style/Theme.DeviceDefault.Settings">
<item name="android:navigationBarColor">@android:color/transparent</item>
<item name="preferenceTheme">@style/PreferenceTheme</item>
<item name="dialogTheme">@style/Theme.MaterialComponents.Dialog</item>
<item name="alertDialogTheme">@style/Theme.MaterialComponents.Dialog</item>
</style>
<style name="PreferenceTheme" parent="@style/PreferenceThemeOverlay.v14.Material">
<item name="preferenceCategoryTitleTextAppearance">@style/TextAppearance.CategoryTitle</item>
</style>
<style name="TextAppearance" parent="android:TextAppearance.DeviceDefault"/>
<style name="TextAppearance.CategoryTitle"
parent="@android:style/TextAppearance.DeviceDefault">
<item name="android:textAllCaps">true</item>
<item name="android:textSize">11sp</item>
<!-- 0.8 Spacing, 0.8/11 = 0.072727273 -->
<item name="android:letterSpacing">0.072727273</item>
</style>
<style name="Theme.Settings" parent="@android:style/Theme.Material.Settings">
<item name="android:actionBarStyle">@style/Theme.ActionBar</item>
<item name="android:colorAccent">#ff4285f4</item>
</style>
<style name="Theme.ActionBar" parent="@android:style/Widget.DeviceDefault.Light.ActionBar.Solid">
<item name="android:titleTextStyle">@style/Theme.Actionbar.Title</item>
</style>
<style name="Theme.Actionbar.Title" parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">
<item name="android:textColor">#ff4285f4</item>
</style>
<style name="DeviceSettings.SwitchBar" parent="@android:style/ThemeOverlay.Material.ActionBar">
</style>
<style name="TextAppearance.Medium" parent="@android:style/TextAppearance.Material.Medium" />
</resources>

View file

@ -21,39 +21,39 @@
<Preference
android:key="battery_capacity"
android:title="@string/battery_max_capa"
android:summary="@string/not_shown"
android:title="@string/battery_max_capa"
android:summary="@string/not_shown"
android:selectable="false"/>
<Preference
android:key="battery_charged_up_to"
android:title="@string/battery_chrged_up_to"
android:summary="@string/not_shown"
android:summary="@string/not_shown"
android:selectable="false"/>
<Preference
android:key="battery_charged_up_to_mah"
android:title="@string/battery_chrged_up_to_mah"
android:summary="@string/not_shown"
android:summary="@string/not_shown"
android:selectable="false"/>
<Preference
android:key="battery_current"
android:title="@string/battery_current"
android:summary="@string/not_shown"
android:summary="@string/not_shown"
android:selectable="false"/>
<Preference
android:key="battery_status"
android:title="@string/battery_status"
android:summary="@string/not_shown"
android:selectable="false"/>
android:summary="@string/not_shown"
android:selectable="false"/>
<Preference
android:key="battery_temp"
android:title="@string/battery_temp"
android:summary="@string/not_shown"
android:selectable="false"/>
android:summary="@string/not_shown"
android:selectable="false"/>
<com.android.settingslib.widget.FooterPreference
android:key="footer_preference"

View file

@ -43,7 +43,7 @@
<com.android.settingslib.widget.RadioButtonPreference
android:key="dolby_profile_voice"
android:title="@string/dolby_profile_voice"/>
android:title="@string/dolby_profile_voice"/>
<com.android.settingslib.widget.FooterPreference
android:key="dolby_top_intro"

View file

@ -6,7 +6,7 @@
<com.android.settingslib.widget.MainSwitchPreference
android:defaultValue="false"
android:key="flashlight_enable"
android:title="@string/flash_enable_title" />
android:title="@string/flash_enable_title" />
<SeekBarPreference
android:key="flashlight_pref"

View file

@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/advanced_settings">
<PreferenceCategory
android:key="display"
android:title="@string/display_category">
@ -62,18 +64,19 @@
android:targetClass="com.eurekateam.samsungextras.battery.BatteryActivity"
android:targetPackage="com.eurekateam.samsungextras" />
</Preference>
</PreferenceCategory>
<PreferenceCategory
android:title="@string/misc_category">
android:title="@string/misc_category">
<SwitchPreference
android:key="dt2w_settings"
android:title="@string/dt2w_mode"
android:persistent="true"/>
<SwitchPreference
android:key="glove_mode_settings"
android:title="@string/glove_mode"
android:persistent="true"/>
android:key="dt2w_settings"
android:title="@string/dt2w_mode"
android:persistent="true"/>
<SwitchPreference
android:key="glove_mode_settings"
android:title="@string/glove_mode"
android:persistent="true"/>
</PreferenceCategory>
<com.android.settingslib.widget.FooterPreference
android:title="@string/advanced_settings_summary"
android:selectable="false" />
</PreferenceScreen>

View file

@ -16,29 +16,15 @@
package com.eurekateam.samsungextras
import android.os.Bundle
import android.view.MenuItem
import androidx.fragment.app.FragmentActivity
import com.android.internal.R.id.content
import com.android.internal.R.id.home
import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity
import com.android.settingslib.collapsingtoolbar.R
class DeviceSettingsActivity : FragmentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
class DeviceSettingsActivity : CollapsingToolbarBaseActivity() {
public override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
val fragment = this.supportFragmentManager.findFragmentById(content)
val mDeviceSettingsFragment: DeviceSettings
if (fragment == null) {
mDeviceSettingsFragment = DeviceSettings()
this.supportFragmentManager.beginTransaction()
.add(content, mDeviceSettingsFragment)
.commit()
}
supportFragmentManager.beginTransaction().replace(
R.id.content_frame,
DeviceSettingsFragment()
).commit()
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
if (item.itemId == home) {
finish()
return true
}
return super.onOptionsItemSelected(item)
}
}
}