PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Snap for 9997652 from 5ae083b952 to udc-release

Browse Source 
Change-Id: I221dbd32a94af73b1904801d974afc69bfe44107
This commit is contained in:
Android Build Coastguard Worker
2023-04-24 23:27:47 +00:00
parent 784b75b916 5ae083b952
commit 341a263147
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -3835,7 +3835,7 @@
android:documentLaunchMode="always"
android:exported="true"
android:permission="android.permission.CHANGE_WIFI_STATE"
android:configChanges="orientation|keyboardHidden|screenSize">
android:configChanges="orientation|keyboard|keyboardHidden|screenSize|smallestScreenSize|screenLayout">
<intent-filter>
<action android:name="com.android.settings.WIFI_DIALOG" />
<category android:name="android.intent.category.DEFAULT" />

2
res/values/strings.xml
View File

@@ -5291,7 +5291,7 @@
<string name="battery_missing_link_a11y_message">Tap to learn more about this error</string>
<!-- Label for power consumed by the screen -->
<string name="power_screen">Display</string>
<string name="power_screen">Screen</string>
<!-- Label for power consumed by the CPU -->
<string name="power_cpu">CPU</string>
<!-- Label for power consumed by the flashlight -->

4
src/com/android/settings/accessibility/CameraFlashNotificationPreferenceController.java
View File

@@ -24,7 +24,7 @@ import android.provider.Settings;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
/**
* Controller for Camera flash notification.
@@ -49,6 +49,8 @@ public class CameraFlashNotificationPreferenceController extends TogglePreferenc
@Override
public boolean setChecked(boolean isChecked) {
FeatureFactory.getFactory(mContext).getMetricsFeatureProvider().changed(
getMetricsCategory(), getPreferenceKey(), isChecked ? 1 : 0);
return Settings.System.putInt(mContext.getContentResolver(),
Settings.System.CAMERA_FLASH_NOTIFICATION, (isChecked ? ON : OFF));
}

8
src/com/android/settings/accessibility/ScreenFlashNotificationPreferenceController.java
View File

@@ -30,6 +30,7 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import java.util.function.Consumer;
@@ -62,8 +63,11 @@ public class ScreenFlashNotificationPreferenceController extends TogglePreferenc
@Override
public boolean setChecked(boolean isChecked) {
if (isChecked) checkAndSetInitialColor();
FeatureFactory.getFactory(mContext).getMetricsFeatureProvider().changed(
getMetricsCategory(), getPreferenceKey(), isChecked ? 1 : 0);
if (isChecked) {
checkAndSetInitialColor();
}
return Settings.System.putInt(mContext.getContentResolver(),
Settings.System.SCREEN_FLASH_NOTIFICATION, (isChecked ? ON : OFF));
}