diff --git a/core/res/res/drawable-watch/global_action_icon_background.xml b/core/res/res/drawable-watch/global_action_icon_background.xml deleted file mode 100644 index b7bc7e6ce402c..0000000000000 --- a/core/res/res/drawable-watch/global_action_icon_background.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/core/res/res/drawable-watch/global_action_item_divider.xml b/core/res/res/drawable-watch/global_action_item_divider.xml new file mode 100644 index 0000000000000..89f3ef415e791 --- /dev/null +++ b/core/res/res/drawable-watch/global_action_item_divider.xml @@ -0,0 +1,20 @@ + + + + + + \ No newline at end of file diff --git a/core/res/res/drawable-watch/global_actions_item_grey_background.xml b/core/res/res/drawable-watch/global_actions_item_grey_background.xml new file mode 100644 index 0000000000000..2cff81d63edac --- /dev/null +++ b/core/res/res/drawable-watch/global_actions_item_grey_background.xml @@ -0,0 +1,20 @@ + + + + + \ No newline at end of file diff --git a/core/res/res/drawable-watch/global_actions_item_grey_background_shape.xml b/core/res/res/drawable-watch/global_actions_item_grey_background_shape.xml new file mode 100644 index 0000000000000..f2df319c888de --- /dev/null +++ b/core/res/res/drawable-watch/global_actions_item_grey_background_shape.xml @@ -0,0 +1,22 @@ + + + + + + + \ No newline at end of file diff --git a/core/res/res/drawable-watch/global_actions_item_red_background.xml b/core/res/res/drawable-watch/global_actions_item_red_background.xml new file mode 100644 index 0000000000000..4be8f2df1cf79 --- /dev/null +++ b/core/res/res/drawable-watch/global_actions_item_red_background.xml @@ -0,0 +1,20 @@ + + + + + \ No newline at end of file diff --git a/core/res/res/drawable-watch/global_actions_item_red_background_shape.xml b/core/res/res/drawable-watch/global_actions_item_red_background_shape.xml new file mode 100644 index 0000000000000..b556a1bdaa09e --- /dev/null +++ b/core/res/res/drawable-watch/global_actions_item_red_background_shape.xml @@ -0,0 +1,22 @@ + + + + + + + \ No newline at end of file diff --git a/core/res/res/drawable-watch/ic_lock_bugreport.xml b/core/res/res/drawable-watch/ic_lock_bugreport.xml new file mode 100644 index 0000000000000..66dd392d685fa --- /dev/null +++ b/core/res/res/drawable-watch/ic_lock_bugreport.xml @@ -0,0 +1,31 @@ + + + + + + diff --git a/core/res/res/drawable-watch/ic_lock_power_off.xml b/core/res/res/drawable-watch/ic_lock_power_off.xml new file mode 100644 index 0000000000000..34bc88cad19a6 --- /dev/null +++ b/core/res/res/drawable-watch/ic_lock_power_off.xml @@ -0,0 +1,26 @@ + + + + + diff --git a/core/res/res/drawable-watch/ic_restart.xml b/core/res/res/drawable-watch/ic_restart.xml new file mode 100644 index 0000000000000..24d7c347f673b --- /dev/null +++ b/core/res/res/drawable-watch/ic_restart.xml @@ -0,0 +1,26 @@ + + + + + diff --git a/core/res/res/layout-watch/global_actions.xml b/core/res/res/layout-watch/global_actions.xml index c50d3f771d1ae..b7479d848465f 100644 --- a/core/res/res/layout-watch/global_actions.xml +++ b/core/res/res/layout-watch/global_actions.xml @@ -16,7 +16,6 @@ diff --git a/core/res/res/layout-watch/global_actions_item.xml b/core/res/res/layout-watch/global_actions_item.xml index ae87e63c48210..3d3f34136801b 100644 --- a/core/res/res/layout-watch/global_actions_item.xml +++ b/core/res/res/layout-watch/global_actions_item.xml @@ -13,52 +13,35 @@ See the License for the specific language governing permissions and limitations under the License. --> - - + + + android:scaleType="centerInside" + android:gravity="center" + android:layout_marginEnd="8dp" + android:layout_width="24dp" + android:layout_height="24dp"/> - - - - - - - + + diff --git a/core/res/res/values-notround-watch/dimens.xml b/core/res/res/values-notround-watch/dimens.xml index f0204d0f2d347..b63f9c7b2b154 100644 --- a/core/res/res/values-notround-watch/dimens.xml +++ b/core/res/res/values-notround-watch/dimens.xml @@ -25,4 +25,7 @@ 24dp 24dp 3dp + + 16.7% + 2.8% diff --git a/core/res/res/values-round-watch/dimens.xml b/core/res/res/values-round-watch/dimens.xml index 1d8c669ac55b4..f288b41fb556e 100644 --- a/core/res/res/values-round-watch/dimens.xml +++ b/core/res/res/values-round-watch/dimens.xml @@ -25,4 +25,7 @@ 32dp 32dp 5dp + + 20.8% + 5.2% diff --git a/core/res/res/values-watch/colors.xml b/core/res/res/values-watch/colors.xml new file mode 100644 index 0000000000000..854fbfd9168b3 --- /dev/null +++ b/core/res/res/values-watch/colors.xml @@ -0,0 +1,22 @@ + + + + + + #EE675C + #202124 + \ No newline at end of file diff --git a/core/res/res/values-watch/strings.xml b/core/res/res/values-watch/strings.xml index dde8b2e3ec508..57c136e98132a 100644 --- a/core/res/res/values-watch/strings.xml +++ b/core/res/res/values-watch/strings.xml @@ -25,5 +25,8 @@ %2$d. - Sensors - +Sensors + + + + Emergency SOS diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 8f5cf8a3a0fbc..5b69a73c71206 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -4463,4 +4463,9 @@ + + + + +