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

Commit 465b7907 authored by ryanlwlin's avatar ryanlwlin
Browse files

Change illustrations of Magnification Settings 

Bug: 184081570
Test: Treehugger build pass
Change-Id: I3c3d00ebb38af1a3af835305fbaa66d2e9b33018
parent b66207d1

res/drawable/accessibility_magnification_window_screen.xml→res/drawable/ic_illustration_fullscreen.xml

+39 −0
Original line number Diff line number Diff line
@@ -13,38 +13,27 @@ 
     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:width="77dp"

    android:height="134dp"

    android:viewportWidth="77"

    android:viewportHeight="134">

  <path

      android:pathData="M7.4,1.1L69.6,1.1A6.3,6.3 0,0 1,75.9 7.4L75.9,126.6A6.3,6.3 0,0 1,69.6 132.9L7.4,132.9A6.3,6.3 0,0 1,1.1 126.6L1.1,7.4A6.3,6.3 0,0 1,7.4 1.1z"

      android:pathData="M69.6,1.1H7.4C3.921,1.1 1.1,3.921 1.1,7.4V126.6C1.1,130.079 3.921,132.9 7.4,132.9H69.6C73.079,132.9 75.9,130.079 75.9,126.6V7.4C75.9,3.921 73.079,1.1 69.6,1.1Z"

      android:strokeWidth="1.8"

      android:fillColor="#F2F3F4"

      android:strokeColor="#DADCE0"/>

  <group>

    <clip-path

        android:pathData="M7.4,1.1L69.6,1.1A6.3,6.3 0,0 1,75.9 7.4L75.9,126.6A6.3,6.3 0,0 1,69.6 132.9L7.4,132.9A6.3,6.3 0,0 1,1.1 126.6L1.1,7.4A6.3,6.3 0,0 1,7.4 1.1z"/>

  <path

        android:pathData="M10.442,4.948L67.167,4.948A5.4,5.4 0,0 1,72.567 10.348L72.567,123.548A5.4,5.4 0,0 1,67.167 128.948L10.442,128.948A5.4,5.4 0,0 1,5.042 123.548L5.042,10.348A5.4,5.4 0,0 1,10.442 4.948z"

      android:pathData="M66.642,5H10.358C7.399,5 5,7.418 5,10.4V123.6C5,126.582 7.399,129 10.358,129H66.642C69.601,129 72,126.582 72,123.6V10.4C72,7.418 69.601,5 66.642,5Z"

      android:fillColor="#ffffff"/>

    <group>

      <clip-path

          android:pathData="M10.442,4.948L67.167,4.948A5.4,5.4 0,0 1,72.567 10.348L72.567,123.548A5.4,5.4 0,0 1,67.167 128.948L10.442,128.948A5.4,5.4 0,0 1,5.042 123.548L5.042,10.348A5.4,5.4 0,0 1,10.442 4.948z"/>

  <path

          android:pathData="M15,47L64,47A2,2 0,0 1,66 49L66,84A2,2 0,0 1,64 86L15,86A2,2 0,0 1,13 84L13,49A2,2 0,0 1,15 47z"

          android:strokeLineJoin="bevel"

          android:strokeWidth="5"

          android:fillColor="#00000000"

          android:strokeColor="#F29900"/>

      android:pathData="M66,10H11C10.448,10 10,10.448 10,11V123C10,123.552 10.448,124 11,124H66C66.552,124 67,123.552 67,123V11C67,10.448 66.552,10 66,10ZM11,5C7.686,5 5,7.686 5,11V123C5,126.314 7.686,129 11,129H66C69.314,129 72,126.314 72,123V11C72,7.686 69.314,5 66,5H11Z"

      android:fillColor="#F29900"

      android:fillType="evenOdd"/>

  <path

          android:pathData="M47.077,53V57.314H52.612L46,63.958L49.037,67L55.692,60.334V65.921H60V53H47.077Z"

      android:pathData="M49.077,15V19.314H54.612L48,25.958L51.037,29L57.692,22.334V27.921H62V15H49.077Z"

      android:fillColor="#F29900"/>

  <path

          android:pathData="M29.963,66L23.308,72.655V67.077H19V80H31.923V75.692H26.366L33,69.037L29.963,66Z"

      android:pathData="M25.963,105L19.308,111.655V106.077H15V119H27.923V114.692H22.366L29,108.037L25.963,105Z"

      android:fillColor="#F29900"/>

    </group>

  </group>

</vector>

res/drawable/accessibility_magnification_full_screen.xml→res/drawable/ic_illustration_switch.xml

+46 −0
Original line number Diff line number Diff line
@@ -13,38 +13,34 @@ 
     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:width="77dp"

    android:height="134dp"

    android:viewportWidth="77"

    android:viewportHeight="134">

  <path

      android:pathData="M7.4,1.1L69.6,1.1A6.3,6.3 0,0 1,75.9 7.4L75.9,126.6A6.3,6.3 0,0 1,69.6 132.9L7.4,132.9A6.3,6.3 0,0 1,1.1 126.6L1.1,7.4A6.3,6.3 0,0 1,7.4 1.1z"

      android:pathData="M69.6,1.1H7.4C3.921,1.1 1.1,3.921 1.1,7.4V126.6C1.1,130.079 3.921,132.9 7.4,132.9H69.6C73.079,132.9 75.9,130.079 75.9,126.6V7.4C75.9,3.921 73.079,1.1 69.6,1.1Z"

      android:strokeWidth="1.8"

      android:fillColor="#F2F3F4"

      android:strokeColor="#DADCE0"/>

  <group>

    <clip-path

        android:pathData="M7.4,1.1L69.6,1.1A6.3,6.3 0,0 1,75.9 7.4L75.9,126.6A6.3,6.3 0,0 1,69.6 132.9L7.4,132.9A6.3,6.3 0,0 1,1.1 126.6L1.1,7.4A6.3,6.3 0,0 1,7.4 1.1z"/>

  <path

        android:pathData="M10.442,4.948L67.167,4.948A5.4,5.4 0,0 1,72.567 10.348L72.567,123.548A5.4,5.4 0,0 1,67.167 128.948L10.442,128.948A5.4,5.4 0,0 1,5.042 123.548L5.042,10.348A5.4,5.4 0,0 1,10.442 4.948z"

      android:pathData="M66.642,5H10.358C7.399,5 5,7.418 5,10.4V123.6C5,126.582 7.399,129 10.358,129H66.642C69.601,129 72,126.582 72,123.6V10.4C72,7.418 69.601,5 66.642,5Z"

      android:fillColor="#ffffff"/>

  <path

      android:pathData="M63,94H39V118H63V94Z"

      android:fillColor="#000000"

      android:fillAlpha="0.7"/>

  <path

      android:pathData="M43,106V114H59V98H51V99.6H57.4V112.4H44.6V106H43Z"

      android:fillColor="#ffffff"/>

    <group>

      <clip-path

          android:pathData="M10.442,4.948L67.167,4.948A5.4,5.4 0,0 1,72.567 10.348L72.567,123.548A5.4,5.4 0,0 1,67.167 128.948L10.442,128.948A5.4,5.4 0,0 1,5.042 123.548L5.042,10.348A5.4,5.4 0,0 1,10.442 4.948z"/>

  <path

          android:pathData="M13,5L65,5A8,8 0,0 1,73 13L73,120A8,8 0,0 1,65 128L13,128A8,8 0,0 1,5 120L5,13A8,8 0,0 1,13 5z"

          android:strokeLineJoin="bevel"

          android:strokeWidth="10"

          android:fillColor="#00000000"

          android:strokeColor="#F29900"/>

      android:pathData="M49.4,98H43V104.4H49.4V98Z"

      android:fillColor="#ffffff"/>

  <path

          android:pathData="M51.077,14V18.314H56.612L50,24.958L53.037,28L59.692,21.334V26.921H64V14H51.077Z"

          android:fillColor="#F29900"/>

      android:pathData="M55.8,105.2V106.8H52.928L56.56,110.432L55.432,111.56L51.8,107.928V110.8H50.2V105.2H55.8Z"

      android:fillColor="#ffffff"/>

  <path

          android:pathData="M25.963,104L19.308,110.655V105.077H15V118H27.923V113.692H22.366L29,107.037L25.963,104Z"

          android:fillColor="#F29900"/>

    </group>

  </group>

      android:pathData="M66,10H11C10.448,10 10,10.448 10,11V123C10,123.552 10.448,124 11,124H66C66.552,124 67,123.552 67,123V11C67,10.448 66.552,10 66,10ZM11,5C7.686,5 5,7.686 5,11V123C5,126.314 7.686,129 11,129H66C69.314,129 72,126.314 72,123V11C72,7.686 69.314,5 66,5H11Z"

      android:fillColor="#F29900"

      android:fillType="evenOdd"/>

</vector>

res/drawable/accessibility_magnification_switch.xml→res/drawable/ic_illustration_window.xml

+41 −0
Original line number Diff line number Diff line
@@ -13,40 +13,29 @@ 
     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:width="77dp"

    android:height="134dp"

    android:viewportWidth="77"

    android:viewportHeight="134">

  <path

      android:pathData="M7.4,1.1L69.6,1.1A6.3,6.3 0,0 1,75.9 7.4L75.9,126.6A6.3,6.3 0,0 1,69.6 132.9L7.4,132.9A6.3,6.3 0,0 1,1.1 126.6L1.1,7.4A6.3,6.3 0,0 1,7.4 1.1z"

      android:pathData="M69.6,1.1H7.4C3.921,1.1 1.1,3.921 1.1,7.4V126.6C1.1,130.079 3.921,132.9 7.4,132.9H69.6C73.079,132.9 75.9,130.079 75.9,126.6V7.4C75.9,3.921 73.079,1.1 69.6,1.1Z"

      android:strokeWidth="1.8"

      android:fillColor="#F2F3F4"

      android:strokeColor="#DADCE0"/>

  <group>

    <clip-path

        android:pathData="M7.4,1.1L69.6,1.1A6.3,6.3 0,0 1,75.9 7.4L75.9,126.6A6.3,6.3 0,0 1,69.6 132.9L7.4,132.9A6.3,6.3 0,0 1,1.1 126.6L1.1,7.4A6.3,6.3 0,0 1,7.4 1.1z"/>

  <path

        android:pathData="M10.442,4.948L67.167,4.948A5.4,5.4 0,0 1,72.567 10.348L72.567,123.548A5.4,5.4 0,0 1,67.167 128.948L10.442,128.948A5.4,5.4 0,0 1,5.042 123.548L5.042,10.348A5.4,5.4 0,0 1,10.442 4.948z"

      android:pathData="M66.642,5H10.358C7.399,5 5,7.418 5,10.4V123.6C5,126.582 7.399,129 10.358,129H66.642C69.601,129 72,126.582 72,123.6V10.4C72,7.418 69.601,5 66.642,5Z"

      android:fillColor="#ffffff"/>

    <group>

      <clip-path

          android:pathData="M10.442,4.948L67.167,4.948A5.4,5.4 0,0 1,72.567 10.348L72.567,123.548A5.4,5.4 0,0 1,67.167 128.948L10.442,128.948A5.4,5.4 0,0 1,5.042 123.548L5.042,10.348A5.4,5.4 0,0 1,10.442 4.948z"/>

      <path

          android:pathData="M39,94h24v24h-24z"

          android:fillColor="#000000"

          android:fillAlpha="0.7"/>

      <path

          android:pathData="M51.414,98.138H45.138C44.033,98.138 43.138,99.033 43.138,100.138V112.689C43.138,113.794 44.033,114.689 45.138,114.689H57.69C58.794,114.689 59.69,113.794 59.69,112.689L59.69,106.414H57.69L57.69,112.689L45.138,112.689V100.138H51.414V98.138ZM49.414,108.414H48.448V109.379H49.414V108.414ZM48.448,106.414H46.448V108.414V109.379V111.379H48.448H49.414H51.414V109.379V108.414V106.414H49.414H48.448ZM55.891,103.103L58.035,103.103V104.758L53.069,104.758V99.793L54.724,99.793V101.936L58.275,98.378L59.45,99.553L55.891,103.103Z"

          android:fillColor="#ffffff"

          android:fillType="evenOdd"/>

  <path

          android:pathData="M13,5L65,5A8,8 0,0 1,73 13L73,120A8,8 0,0 1,65 128L13,128A8,8 0,0 1,5 120L5,13A8,8 0,0 1,13 5z"

      android:pathData="M63,48H14C12.895,48 12,48.895 12,50V85C12,86.105 12.895,87 14,87H63C64.105,87 65,86.105 65,85V50C65,48.895 64.105,48 63,48Z"

      android:strokeLineJoin="bevel"

          android:strokeWidth="10"

      android:strokeWidth="5"

      android:fillColor="#00000000"

      android:strokeColor="#F29900"/>

    </group>

  </group>

  <path

      android:pathData="M46.077,54V58.314H51.612L45,64.958L48.037,68L54.692,61.334V66.921H59V54H46.077Z"

      android:fillColor="#F29900"/>

  <path

      android:pathData="M28.963,67L22.308,73.655V68.077H18V81H30.923V76.692H25.366L32,70.037L28.963,67Z"

      android:fillColor="#F29900"/>

</vector>

src/com/android/settings/accessibility/MagnificationSettingsFragment.java

+3 −3
Original line number Diff line number Diff line
@@ -209,15 +209,15 @@ public class MagnificationSettingsFragment extends DashboardFragment { 
        mModeInfos.clear();

        mModeInfos.add(new MagnificationModeInfo(getPrefContext().getText(

                R.string.accessibility_magnification_mode_dialog_option_full_screen), null,

                R.drawable.accessibility_magnification_full_screen, MagnificationMode.FULLSCREEN));

                R.drawable.ic_illustration_fullscreen, MagnificationMode.FULLSCREEN));

        mModeInfos.add(new MagnificationModeInfo(getPrefContext().getText(

                R.string.accessibility_magnification_mode_dialog_option_window), null,

                R.drawable.accessibility_magnification_window_screen, MagnificationMode.WINDOW));

                R.drawable.ic_illustration_window, MagnificationMode.WINDOW));

        mModeInfos.add(new MagnificationModeInfo(getPrefContext().getText(

                R.string.accessibility_magnification_mode_dialog_option_switch),

                getPrefContext().getText(

                        R.string.accessibility_magnification_area_settings_mode_switch_summary),

                R.drawable.accessibility_magnification_switch, MagnificationMode.ALL));

                R.drawable.ic_illustration_switch, MagnificationMode.ALL));

    }



    @VisibleForTesting