Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Override for testing when clock is not set" into tm-qpr-dev

Browse Source
This commit is contained in:
Hawkwood Glazier
2022-11-17 15:43:04 +00:00
committed by Android (Google) Code Review
parent 8192434170 c2b519b890
commit 2e1ca7f61a
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/res/values/strings.xml
View File

@@ -1940,6 +1940,9 @@
<!-- SysUI Tuner: Summary of no shortcut being selected [CHAR LIMIT=60] --> <!-- SysUI Tuner: Summary of no shortcut being selected [CHAR LIMIT=60] -->
<string name="lockscreen_none">None</string> <string name="lockscreen_none">None</string>
<!-- ClockId to use when none is set by user -->
<string name="lockscreen_clock_id_fallback" translatable="false">DEFAULT</string>
<!-- SysUI Tuner: Format string for describing launching an app [CHAR LIMIT=60] --> <!-- SysUI Tuner: Format string for describing launching an app [CHAR LIMIT=60] -->
<string name="tuner_launch_app">Launch <xliff:g id="app" example="Settings">%1$s</xliff:g></string> <string name="tuner_launch_app">Launch <xliff:g id="app" example="Settings">%1$s</xliff:g></string>

8
packages/SystemUI/shared/src/com/android/systemui/shared/clocks/ClockRegistry.kt
View File

@@ -41,6 +41,7 @@ open class ClockRegistry(
val isEnabled: Boolean, val isEnabled: Boolean,
userHandle: Int, userHandle: Int,
defaultClockProvider: ClockProvider, defaultClockProvider: ClockProvider,
val fallbackClockId: ClockId = DEFAULT_CLOCK_ID,
) { ) {
// Usually this would be a typealias, but a SAM provides better java interop // Usually this would be a typealias, but a SAM provides better java interop
fun interface ClockChangeListener { fun interface ClockChangeListener {
@@ -69,10 +70,13 @@ open class ClockRegistry(
context.contentResolver, context.contentResolver,
Settings.Secure.LOCK_SCREEN_CUSTOM_CLOCK_FACE Settings.Secure.LOCK_SCREEN_CUSTOM_CLOCK_FACE
) )
ClockSetting.deserialize(json)?.clockId ?: DEFAULT_CLOCK_ID if (json == null || json.isEmpty()) {
return fallbackClockId
}
ClockSetting.deserialize(json).clockId
} catch (ex: Exception) { } catch (ex: Exception) {
Log.e(TAG, "Failed to parse clock setting", ex) Log.e(TAG, "Failed to parse clock setting", ex)
DEFAULT_CLOCK_ID fallbackClockId
} }
} }
set(value) { set(value) {

4
packages/SystemUI/src/com/android/keyguard/dagger/ClockRegistryModule.java
View File

@@ -20,6 +20,7 @@ import android.content.Context;
import android.os.Handler; import android.os.Handler;
import android.os.UserHandle; import android.os.UserHandle;
import com.android.systemui.R;
import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.SysUISingleton;
import com.android.systemui.dagger.qualifiers.Application; import com.android.systemui.dagger.qualifiers.Application;
import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.dagger.qualifiers.Main;
@@ -50,6 +51,7 @@ public abstract class ClockRegistryModule {
handler, handler,
featureFlags.isEnabled(Flags.LOCKSCREEN_CUSTOM_CLOCKS), featureFlags.isEnabled(Flags.LOCKSCREEN_CUSTOM_CLOCKS),
UserHandle.USER_ALL, UserHandle.USER_ALL,
defaultClockProvider); defaultClockProvider,
context.getString(R.string.lockscreen_clock_id_fallback));
} }
} }