MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-12-24 01:25:50 +01:00
Code Releases Wiki Activity

Removed call to start intent if no companion, defaulted companion preference to true, and reordered casio alert preferences to match watch order.

Browse Source
This commit is contained in:
foxstidious 2023-10-13 14:00:53 -04:00 committed by José Rebelo
parent 1f115426fc
commit 40af20a176
5 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
View File

@ -274,12 +274,8 @@ public abstract class AbstractDeviceSupport implements DeviceSupport {
context.startActivity(intent); context.startActivity(intent);
LOG.debug("CompanionDeviceManager associations were found, starting intent"); LOG.debug("CompanionDeviceManager associations were found, starting intent");
} else { } else {
LOG.warn("CompanionDeviceManager associations were not found, going to try to start intent anyway");
GB.notify(GB.NOTIFICATION_ID_PHONE_FIND, notification.build(), context); GB.notify(GB.NOTIFICATION_ID_PHONE_FIND, notification.build(), context);
// Originally the Phone Find activity wasn't being started if no companion associations. LOG.warn("CompanionDeviceManager associations were not found, can't start intent");
// Casio GDB-200 doesn't register companion but this still seems to work, so keeping
// warning but starting activity anyway
context.startActivity(intent);
} }
} }

2
app/src/main/res/values/strings.xml
View File

@ -336,7 +336,7 @@
<string name="pref_summary_preview_message_in_title">Shows a preview of the message in the title of a notification as allowed by the device</string> <string name="pref_summary_preview_message_in_title">Shows a preview of the message in the title of a notification as allowed by the device</string>
<string name="pref_title_casio_alert_calendar">Alert for calendar notifications</string> <string name="pref_title_casio_alert_calendar">Alert for calendar notifications</string>
<string name="pref_summary_casio_alert_calendar">Alert (vibrate/beep) for calendar notifications</string> <string name="pref_summary_casio_alert_calendar">Alert (vibrate/beep) for calendar notifications</string>
<string name="pref_title_casio_alert_call">Alert for calendar calls</string> <string name="pref_title_casio_alert_call">Alert for incoming calls</string>
<string name="pref_summary_casio_alert_call">Alert (vibrate/beep) for incoming calls</string> <string name="pref_summary_casio_alert_call">Alert (vibrate/beep) for incoming calls</string>
<string name="pref_title_casio_alert_email">Alert for email notifications</string> <string name="pref_title_casio_alert_email">Alert for email notifications</string>
<string name="pref_summary_casio_alert_email">Alert (vibrate/beep) for email notifications</string> <string name="pref_summary_casio_alert_email">Alert (vibrate/beep) for email notifications</string>

40
app/src/main/res/xml/devicesettings_casio_alert.xml
View File

@ -1,33 +1,33 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<SwitchPreference <SwitchPreferenceCompat
android:defaultValue="true"
android:icon="@android:drawable/ic_menu_my_calendar"
android:key="casio_alert_calendar"
android:summary="@string/pref_summary_casio_alert_calendar"
android:title="@string/pref_title_casio_alert_calendar" />
<SwitchPreference
android:defaultValue="true"
android:icon="@android:drawable/ic_menu_call"
android:key="casio_alert_call"
android:summary="@string/pref_summary_casio_alert_call"
android:title="@string/pref_title_casio_alert_call" />
<SwitchPreference
android:defaultValue="true" android:defaultValue="true"
android:icon="@drawable/ic_email" android:icon="@drawable/ic_email"
android:key="casio_alert_email" android:key="casio_alert_email"
android:summary="@string/pref_summary_casio_alert_email" android:summary="@string/pref_summary_casio_alert_email"
android:title="@string/pref_title_casio_alert_email" /> android:title="@string/pref_title_casio_alert_email" />
<SwitchPreference <SwitchPreferenceCompat
android:defaultValue="true"
android:icon="@android:drawable/ic_menu_help"
android:key="casio_alert_other"
android:summary="@string/pref_summary_casio_alert_other"
android:title="@string/pref_title_casio_alert_other" />
<SwitchPreference
android:defaultValue="true" android:defaultValue="true"
android:icon="@drawable/ic_message_outline" android:icon="@drawable/ic_message_outline"
android:key="casio_alert_sms" android:key="casio_alert_sms"
android:summary="@string/pref_summary_casio_alert_sms" android:summary="@string/pref_summary_casio_alert_sms"
android:title="@string/pref_title_casio_alert_sms" /> android:title="@string/pref_title_casio_alert_sms" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:icon="@android:drawable/ic_menu_call"
android:key="casio_alert_call"
android:summary="@string/pref_summary_casio_alert_call"
android:title="@string/pref_title_casio_alert_call" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:icon="@android:drawable/ic_menu_my_calendar"
android:key="casio_alert_calendar"
android:summary="@string/pref_summary_casio_alert_calendar"
android:title="@string/pref_title_casio_alert_calendar" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:icon="@android:drawable/ic_menu_help"
android:key="casio_alert_other"
android:summary="@string/pref_summary_casio_alert_other"
android:title="@string/pref_title_casio_alert_other" />
</androidx.preference.PreferenceScreen> </androidx.preference.PreferenceScreen>

2
app/src/main/res/xml/devicesettings_preview_message_in_title.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<SwitchPreference <SwitchPreferenceCompat
android:defaultValue="true" android:defaultValue="true"
android:icon="@android:drawable/ic_menu_view" android:icon="@android:drawable/ic_menu_view"
android:key="preview_message_in_title" android:key="preview_message_in_title"

2
app/src/main/res/xml/discovery_pairing_preferences.xml
View File

@ -10,7 +10,7 @@
android:title="@string/ignore_bonded_devices" android:title="@string/ignore_bonded_devices"
app:iconSpaceReserved="false" /> app:iconSpaceReserved="false" />
<SwitchPreferenceCompat <SwitchPreferenceCompat
android:defaultValue="false" android:defaultValue="true"
android:key="enable_companiondevice_pairing" android:key="enable_companiondevice_pairing"
android:layout="@layout/preference_checkbox" android:layout="@layout/preference_checkbox"
android:summary="@string/companiondevice_pairing_details" android:summary="@string/companiondevice_pairing_details"