Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01ad0aab authored by Michael Kwan's avatar Michael Kwan
Browse files

Add resources and hooks required for custom wear global actions.

Bug: 31802693
Test: manual test
Change-Id: Ie5e2082e2121f6f3a7ca847f40e5cebab52aab0d
parent 5395a3ce
Loading
Loading
Loading
Loading
+21 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2018 The Android Open Source Project

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="oval"
        android:tint="?android:attr/colorButtonNormal">
    <solid android:color="@android:color/white"/>
    <size android:height="40dp" android:width="40dp"/>
</shape>
+28 −0
Original line number Diff line number Diff line
<!--
    Copyright (C) 2018 The Android Open Source Project

    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at

         http://www.apache.org/licenses/LICENSE-2.0

    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
        android:autoMirrored="true"
        android:width="32.0dp"
        android:height="32.0dp"
        android:viewportWidth="24.0"
        android:viewportHeight="24.0"
        android:tint="?android:attr/colorControlNormal">
    <path
            android:pathData="M5,3
            l3.5,0 l0,-1.5 l7,0 l0,1.5 l3.5,0 l0,19.5 l-14,0z
            M10.5,8.5 l0,3 l-3,0 l0,3 l3,0 l0,3 l3,0 l0,-3 l3,0 l0,-3 l-3,0 l0,-3 z"
            android:fillColor="#FFFFFF"/>
</vector>
+58 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2018 The Android Open Source Project

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:minHeight="?attr/listPreferredItemHeightSmall"
        android:gravity="center_vertical"
        android:paddingStart="?attr/listPreferredItemPaddingStart"
        android:paddingEnd="?attr/listPreferredItemPaddingEnd"
        android:background="?attr/activatedBackgroundIndicator"
        android:clipToPadding="false">
    <ImageView android:id="@+id/icon"
            android:background="@drawable/global_action_icon_background"
            android:scaleType="centerInside"
            android:layout_width="40dp"
            android:layout_height="40dp"
            android:padding="8dp"
            android:gravity="center"
            android:orientation="horizontal"
            android:layout_marginEnd="8dp"
            android:layout_marginTop="8dp"
            android:layout_marginBottom="8dp"/>

    <RelativeLayout
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_weight="1"
            android:layout_marginTop="8dp"
            android:layout_marginBottom="8dp">

        <TextView android:id="@+id/message"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:textAppearance="?attr/textAppearanceListItem"
                android:ellipsize="end" />

        <TextView android:id="@+id/status"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_below="@id/message"
                android:layout_alignStart="@id/message"
                android:textAppearance="?attr/textAppearanceListItemSecondary"
                android:textColor="?attr/textColorSecondary"/>
    </RelativeLayout>
</LinearLayout>
+9 −0
Original line number Diff line number Diff line
@@ -539,6 +539,15 @@
    <!-- status message in phone options dialog for when airplane mode is off -->
    <string name="global_actions_airplane_mode_off_status">Airplane mode is OFF</string>

    <!-- label for item that enables battery saver in phone options dialog -->
    <string name="global_action_toggle_battery_saver">Battery saver</string>

    <!-- status message in phone options dialog for when battery saver is enabled -->
    <string name="global_action_battery_saver_on_status">Battery saver is OFF</string>

    <!-- status message in phone options dialog for when battery saver is disabled -->
    <string name="global_action_battery_saver_off_status">Battery saver is ON</string>

    <!-- label for item that launches settings in phone options dialog [CHAR LIMIT=15]-->
    <string name="global_action_settings">Settings</string>

+4 −0
Original line number Diff line number Diff line
@@ -1377,6 +1377,7 @@
  <java-symbol type="drawable" name="ic_corp_statusbar_icon" />
  <java-symbol type="drawable" name="ic_instant_icon_badge_bolt" />
  <java-symbol type="drawable" name="emulator_circular_window_overlay" />
  <java-symbol type="drawable" name="ic_qs_battery_saver" />

  <java-symbol type="drawable" name="sim_light_blue" />
  <java-symbol type="drawable" name="sim_light_green" />
@@ -1737,6 +1738,9 @@
  <java-symbol type="string" name="global_action_silent_mode_off_status" />
  <java-symbol type="string" name="global_action_silent_mode_on_status" />
  <java-symbol type="string" name="global_action_toggle_silent_mode" />
  <java-symbol type="string" name="global_action_battery_saver_off_status" />
  <java-symbol type="string" name="global_action_battery_saver_on_status" />
  <java-symbol type="string" name="global_action_toggle_battery_saver" />
  <java-symbol type="string" name="global_action_lockdown" />
  <java-symbol type="string" name="global_action_voice_assist" />
  <java-symbol type="string" name="global_action_assist" />
Loading