Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
319 changes: 0 additions & 319 deletions lint-baseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10652,105 +10652,6 @@
column="12"/>
</issue>

<issue
id="NewApi"
message="`@android:color/system_neutral1_900` requires API level 31 (current min is 26)"
errorLine1=" &lt;color name=&quot;a11y_wear_material_color_primary&quot;>@android:color/system_neutral1_900&lt;/color>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/res/values/colors.xml"
line="47"
column="50"/>
</issue>

<issue
id="NewApi"
message="`@android:color/system_neutral1_50` requires API level 31 (current min is 26)"
errorLine1=" &lt;color name=&quot;a11y_wear_material_color_on_primary&quot;>@android:color/system_neutral1_50&lt;/color>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/res/values/colors.xml"
line="48"
column="53"/>
</issue>

<issue
id="NewApi"
message="`@android:color/system_accent1_600` requires API level 31 (current min is 26)"
errorLine1=" &lt;color name=&quot;a11y_wear_material_color_primary_variant&quot;>@android:color/system_accent1_600&lt;/color>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/res/values/colors.xml"
line="49"
column="58"/>
</issue>

<issue
id="NewApi"
message="`@android:color/system_neutral2_700` requires API level 31 (current min is 26)"
errorLine1=" &lt;color name=&quot;a11y_wear_material_color_secondary&quot;>@android:color/system_neutral2_700&lt;/color>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/res/values/colors.xml"
line="50"
column="52"/>
</issue>

<issue
id="NewApi"
message="`@android:color/system_neutral2_200` requires API level 31 (current min is 26)"
errorLine1=" &lt;color name=&quot;a11y_wear_material_color_on_secondary&quot;>@android:color/system_neutral2_200&lt;/color>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/res/values/colors.xml"
line="51"
column="55"/>
</issue>

<issue
id="NewApi"
message="`@android:color/system_neutral2_200` requires API level 31 (current min is 26)"
errorLine1=" &lt;color name=&quot;a11y_wear_material_color_secondary_variant&quot;>@android:color/system_neutral2_200&lt;/color>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/res/values/colors.xml"
line="52"
column="60"/>
</issue>

<issue
id="NewApi"
message="`@android:color/system_neutral1_10` requires API level 31 (current min is 26)"
errorLine1=" &lt;color name=&quot;a11y_wear_material_color_surface&quot;>@android:color/system_neutral1_10&lt;/color>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/res/values/colors.xml"
line="53"
column="50"/>
</issue>

<issue
id="NewApi"
message="`@android:color/system_neutral1_800` requires API level 31 (current min is 26)"
errorLine1=" &lt;color name=&quot;a11y_wear_material_color_on_surface&quot;>@android:color/system_neutral1_800&lt;/color>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/res/values/colors.xml"
line="54"
column="53"/>
</issue>

<issue
id="NewApi"
message="`@android:color/system_neutral1_800` requires API level 31 (current min is 26)"
errorLine1=" &lt;color name=&quot;a11y_wear_material_color_surface_variant&quot;>@android:color/system_neutral1_800&lt;/color>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/res/values/colors.xml"
line="55"
column="58"/>
</issue>

<issue
id="OldTargetApi"
message="Not targeting the latest versions of Android; compatibility modes apply. Consider testing and updating this version. Consult the `android.os.Build.VERSION_CODES` javadoc for details."
Expand Down Expand Up @@ -25628,127 +25529,6 @@




<issue
id="MissingDefaultResource"
message="The color &quot;a11y_wear_material_color_primary&quot; in values-watch-v30 has no declaration in the base `values` folder; this can lead to crashes when the resource is queried in a configuration that does not match this qualifier"
errorLine1=" &lt;color name=&quot;a11y_wear_material_color_primary&quot;>@android:color/system_neutral1_900&lt;/color>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/wear/res/values-watch-v30/colors.xml"
line="19"
column="12"/>
</issue>

<issue
id="MissingDefaultResource"
message="The color &quot;a11y_wear_material_color_on_primary&quot; in values-watch-v30 has no declaration in the base `values` folder; this can lead to crashes when the resource is queried in a configuration that does not match this qualifier"
errorLine1=" &lt;color name=&quot;a11y_wear_material_color_on_primary&quot;>@android:color/system_neutral1_50&lt;/color>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/wear/res/values-watch-v30/colors.xml"
line="20"
column="12"/>
</issue>

<issue
id="MissingDefaultResource"
message="The color &quot;a11y_wear_material_color_primary_variant&quot; in values-watch-v30 has no declaration in the base `values` folder; this can lead to crashes when the resource is queried in a configuration that does not match this qualifier"
errorLine1=" &lt;color name=&quot;a11y_wear_material_color_primary_variant&quot;>@android:color/system_accent1_600&lt;/color>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/wear/res/values-watch-v30/colors.xml"
line="21"
column="12"/>
</issue>

<issue
id="MissingDefaultResource"
message="The color &quot;a11y_wear_material_color_secondary&quot; in values-watch-v30 has no declaration in the base `values` folder; this can lead to crashes when the resource is queried in a configuration that does not match this qualifier"
errorLine1=" &lt;color name=&quot;a11y_wear_material_color_secondary&quot;>@android:color/system_neutral2_700&lt;/color>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/wear/res/values-watch-v30/colors.xml"
line="22"
column="12"/>
</issue>

<issue
id="MissingDefaultResource"
message="The color &quot;a11y_wear_material_color_on_secondary&quot; in values-watch-v30 has no declaration in the base `values` folder; this can lead to crashes when the resource is queried in a configuration that does not match this qualifier"
errorLine1=" &lt;color name=&quot;a11y_wear_material_color_on_secondary&quot;>@android:color/system_neutral2_200&lt;/color>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/wear/res/values-watch-v30/colors.xml"
line="23"
column="12"/>
</issue>

<issue
id="MissingDefaultResource"
message="The color &quot;a11y_wear_material_color_secondary_variant&quot; in values-watch-v30 has no declaration in the base `values` folder; this can lead to crashes when the resource is queried in a configuration that does not match this qualifier"
errorLine1=" &lt;color name=&quot;a11y_wear_material_color_secondary_variant&quot;>@android:color/system_neutral2_200&lt;/color>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/wear/res/values-watch-v30/colors.xml"
line="24"
column="12"/>
</issue>

<issue
id="MissingDefaultResource"
message="The color &quot;a11y_wear_material_color_surface&quot; in values-watch-v30 has no declaration in the base `values` folder; this can lead to crashes when the resource is queried in a configuration that does not match this qualifier"
errorLine1=" &lt;color name=&quot;a11y_wear_material_color_surface&quot;>@android:color/system_neutral1_10&lt;/color>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/wear/res/values-watch-v30/colors.xml"
line="25"
column="12"/>
</issue>

<issue
id="MissingDefaultResource"
message="The color &quot;a11y_wear_material_color_on_surface&quot; in values-watch-v30 has no declaration in the base `values` folder; this can lead to crashes when the resource is queried in a configuration that does not match this qualifier"
errorLine1=" &lt;color name=&quot;a11y_wear_material_color_on_surface&quot;>@android:color/system_neutral1_800&lt;/color>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/wear/res/values-watch-v30/colors.xml"
line="26"
column="12"/>
</issue>

<issue
id="MissingDefaultResource"
message="The color &quot;a11y_wear_material_color_surface_variant&quot; in values-watch-v30 has no declaration in the base `values` folder; this can lead to crashes when the resource is queried in a configuration that does not match this qualifier"
errorLine1=" &lt;color name=&quot;a11y_wear_material_color_surface_variant&quot;>@android:color/system_neutral1_800&lt;/color>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/wear/res/values-watch-v30/colors.xml"
line="27"
column="12"/>
</issue>

<issue
id="MissingDefaultResource"
message="The color &quot;a11y_wear_material_color_background&quot; in values-watch-v30 has no declaration in the base `values` folder; this can lead to crashes when the resource is queried in a configuration that does not match this qualifier"
errorLine1=" &lt;color name=&quot;a11y_wear_material_color_background&quot;>@color/google_black&lt;/color>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/wear/res/values-watch-v30/colors.xml"
line="28"
column="12"/>
</issue>

<issue
id="MissingDefaultResource"
message="The color &quot;a11y_wear_material_color_on_background_wear&quot; in values-watch-v30 has no declaration in the base `values` folder; this can lead to crashes when the resource is queried in a configuration that does not match this qualifier"
errorLine1=" &lt;color name=&quot;a11y_wear_material_color_on_background_wear&quot;>@color/google_white&lt;/color>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/wear/res/values-watch-v30/colors.xml"
line="29"
column="12"/>
</issue>

<issue
id="NewApi"
Expand Down Expand Up @@ -25794,105 +25574,6 @@
column="29"/>
</issue>

<issue
id="NewApi"
message="`@android:color/system_neutral1_900` requires API level 31 (current min is 30)"
errorLine1=" &lt;color name=&quot;a11y_wear_material_color_primary&quot;>@android:color/system_neutral1_900&lt;/color>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/wear/res/values-watch-v30/colors.xml"
line="19"
column="52"/>
</issue>

<issue
id="NewApi"
message="`@android:color/system_neutral1_50` requires API level 31 (current min is 30)"
errorLine1=" &lt;color name=&quot;a11y_wear_material_color_on_primary&quot;>@android:color/system_neutral1_50&lt;/color>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/wear/res/values-watch-v30/colors.xml"
line="20"
column="55"/>
</issue>

<issue
id="NewApi"
message="`@android:color/system_accent1_600` requires API level 31 (current min is 30)"
errorLine1=" &lt;color name=&quot;a11y_wear_material_color_primary_variant&quot;>@android:color/system_accent1_600&lt;/color>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/wear/res/values-watch-v30/colors.xml"
line="21"
column="60"/>
</issue>

<issue
id="NewApi"
message="`@android:color/system_neutral2_700` requires API level 31 (current min is 30)"
errorLine1=" &lt;color name=&quot;a11y_wear_material_color_secondary&quot;>@android:color/system_neutral2_700&lt;/color>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/wear/res/values-watch-v30/colors.xml"
line="22"
column="54"/>
</issue>

<issue
id="NewApi"
message="`@android:color/system_neutral2_200` requires API level 31 (current min is 30)"
errorLine1=" &lt;color name=&quot;a11y_wear_material_color_on_secondary&quot;>@android:color/system_neutral2_200&lt;/color>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/wear/res/values-watch-v30/colors.xml"
line="23"
column="57"/>
</issue>

<issue
id="NewApi"
message="`@android:color/system_neutral2_200` requires API level 31 (current min is 30)"
errorLine1=" &lt;color name=&quot;a11y_wear_material_color_secondary_variant&quot;>@android:color/system_neutral2_200&lt;/color>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/wear/res/values-watch-v30/colors.xml"
line="24"
column="62"/>
</issue>

<issue
id="NewApi"
message="`@android:color/system_neutral1_10` requires API level 31 (current min is 30)"
errorLine1=" &lt;color name=&quot;a11y_wear_material_color_surface&quot;>@android:color/system_neutral1_10&lt;/color>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/wear/res/values-watch-v30/colors.xml"
line="25"
column="52"/>
</issue>

<issue
id="NewApi"
message="`@android:color/system_neutral1_800` requires API level 31 (current min is 30)"
errorLine1=" &lt;color name=&quot;a11y_wear_material_color_on_surface&quot;>@android:color/system_neutral1_800&lt;/color>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/wear/res/values-watch-v30/colors.xml"
line="26"
column="55"/>
</issue>

<issue
id="NewApi"
message="`@android:color/system_neutral1_800` requires API level 31 (current min is 30)"
errorLine1=" &lt;color name=&quot;a11y_wear_material_color_surface_variant&quot;>@android:color/system_neutral1_800&lt;/color>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/wear/res/values-watch-v30/colors.xml"
line="27"
column="60"/>
</issue>

<issue
id="WearStandaloneAppFlag"
message="Missing `&lt;meta-data android:name=&quot;com.google.android.wearable.standalone&quot; ../>` element"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,17 +120,17 @@ public static void setTouchStopsSpeech(boolean stops) {
Feedback.sound(R.raw.view_entered).vibration(R.array.view_hovered_pattern).build());
}
case TOUCH_START, TOUCH_ENTERED_UNFOCUSED_NODE -> {
// Speech of an item that touch focuses still interrupts what was being said.
// Without this, speech stops when touch focuses an item instead, below.
return touchStopsSpeech
? Feedback.create(eventId, Feedback.part().setInterruptGentle(true).build())
: null;
}
case TOUCH_FOCUSED_NODE -> {
return toFeedback(
return toTouchFocusFeedback(
eventId, Feedback.focus(FOCUS_FOR_TOUCH).setTarget(touchTarget).setForceRefocus(true));
}
case TOUCH_UNFOCUSED_NODE -> {
return toFeedback(eventId, Feedback.focus(FOCUS_FOR_TOUCH).setTarget(touchTarget));
return toTouchFocusFeedback(eventId, Feedback.focus(FOCUS_FOR_TOUCH).setTarget(touchTarget));
}
case LIFT -> {
return toFeedback(eventId, Feedback.focus(CLICK_NODE).setTarget(touchTarget));
Expand All @@ -154,6 +154,17 @@ private static Feedback toFeedback(@Nullable EventId eventId, Focus.Builder focu
return Feedback.create(eventId, Feedback.part().setFocus(focus.build()).build());
}

/**
* Focuses an item by touch. When touching doesn't stop speech, focusing the item does, as touching
* would have: notifications, toasts and other speech that new speech can't interrupt would
* otherwise keep the item from being spoken until they finish.
*/
private static Feedback toTouchFocusFeedback(@Nullable EventId eventId, Focus.Builder focus) {
return Feedback.create(
eventId,
Feedback.part().setInterruptGentle(!touchStopsSpeech).setFocus(focus.build()).build());
}

/** Feedback-mapping function. */
public static Part.@Nullable Builder onNodeManuallyScrolled(
Variables variables, int depth, FocusFinder focusFinder) {
Expand Down
Loading
Loading