Skip to content

Fix compilation errors and restore logic after SDK 35/36 merge#19

Merged
gx-bangsong merged 1 commit intomainfrom
fix-compilation-errors-merge-recovery-9553958418776236841
Mar 26, 2026
Merged

Fix compilation errors and restore logic after SDK 35/36 merge#19
gx-bangsong merged 1 commit intomainfrom
fix-compilation-errors-merge-recovery-9553958418776236841

Conversation

@gx-bangsong
Copy link
Copy Markdown
Owner

This PR resolves over 100 compilation and resource errors in the GKUIClock project that occurred after a large merge with the upstream repository.

Key changes:

  • Fixed syntax errors and misplaced fields in PreferencesDefaultValues.java.
  • Restored missing methods in SettingsDAO, Utils, ThemeUtils, and PermissionUtils that were dropped during the merge but are required by existing UI and provider logic.
  • Re-implemented legacy DialogFragment classes (VibrationPattern, VibrationStartDelay, AlarmMissedRepeatLimit, SpinnerTimePicker) and created their associated XML layout resources.
  • Aligned Alarm and AlarmInstance call sites with the new instance-method based API.
  • Fixed BuildConfig symbol errors by adding missing fields to app/build.gradle.
  • Corrected inheritance for DeskClock (now extends BaseActivity) to fix instanceof compatibility.
  • Resolved duplicate string resource errors in strings.xml.
  • Disabled Room schema export for HolidayDatabase to suppress warnings.

Verified with a successful ./gradlew assembleDebug build.


PR created automatically by Jules for task 9553958418776236841 started by @gx-bangsong

This commit resolves over 100 compilation and resource errors in the
GKUIClock project that occurred after a large merge with the upstream
repository.

Key changes:
- Fixed syntax errors and misplaced fields in `PreferencesDefaultValues.java`.
- Restored missing methods in `SettingsDAO`, `Utils`, `ThemeUtils`, and
  `PermissionUtils` that were dropped during the merge but are required
  by existing UI and provider logic.
- Re-implemented legacy `DialogFragment` classes (`VibrationPattern`,
  `VibrationStartDelay`, `AlarmMissedRepeatLimit`, `SpinnerTimePicker`)
  and created their associated XML layout resources.
- Aligned `Alarm` and `AlarmInstance` call sites with the new
  instance-method based API.
- Fixed `BuildConfig` symbol errors by adding missing fields to `app/build.gradle`.
- Corrected inheritance for `DeskClock` (now extends `BaseActivity`)
  to fix `instanceof` compatibility.
- Resolved duplicate string resource errors in `strings.xml`.
- Disabled Room schema export for `HolidayDatabase` to suppress warnings.

Verified with a successful `./gradlew assembleDebug` build.

Co-authored-by: gx-bangsong <146644201+gx-bangsong@users.noreply.github.com>
@google-labs-jules
Copy link
Copy Markdown

👋 Jules, reporting for duty! I'm here to lend a hand with this pull request.

When you start a review, I'll add a 👀 emoji to each comment to let you know I've read it. I'll focus on feedback directed at me and will do my best to stay out of conversations between you and other bots or reviewers to keep the noise down.

I'll push a commit with your requested changes shortly after. Please note there might be a delay between these steps, but rest assured I'm on the job!

For more direct control, you can switch me to Reactive Mode. When this mode is on, I will only act on comments where you specifically mention me with @jules. You can find this option in the Pull Request section of your global Jules UI settings. You can always switch back!

New to Jules? Learn more at jules.google/docs.


For security, I will only act on instructions from the user who triggered this task.

@gx-bangsong gx-bangsong merged commit e6e5bee into main Mar 26, 2026
1 check passed
@gx-bangsong gx-bangsong deleted the fix-compilation-errors-merge-recovery-9553958418776236841 branch March 26, 2026 04:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant