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

Commit 1ef91389 authored by Joseph Vincent's avatar Joseph Vincent Committed by Android (Google) Code Review
Browse files

Merge "Add toggle to hide private space entry point in All Apps" into main

parents ce8a641d eace2759

res/drawable/counter_1_24dp.xml

0 → 100644
+10 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="960"

    android:viewportHeight="960"

    android:tint="?attr/colorControlNormal">

  <path

      android:fillColor="?android:attr/colorAccent"

      android:pathData="M480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480ZM460,680L540,680L540,280L380,280L380,360L460,360L460,680Z"/>

</vector>

res/drawable/counter_2_24dp.xml

0 → 100644
+10 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="960"

    android:viewportHeight="960"

    android:tint="?attr/colorControlNormal">

  <path

      android:fillColor="?android:attr/colorAccent"

      android:pathData="M480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480ZM360,680L600,680L600,600L440,600L440,520Q440,520 440,520Q440,520 440,520L520,520Q553,520 576.5,496.5Q600,473 600,440L600,360Q600,327 576.5,303.5Q553,280 520,280L360,280L360,360L520,360Q520,360 520,360Q520,360 520,360L520,440Q520,440 520,440Q520,440 520,440L440,440Q407,440 383.5,463.5Q360,487 360,520L360,680Z"/>

</vector>

res/drawable/counter_3_24dp.xml

0 → 100644
+10 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="960"

    android:viewportHeight="960"

    android:tint="?attr/colorControlNormal">

  <path

      android:fillColor="?android:attr/colorAccent"

      android:pathData="M480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480ZM360,680L520,680Q553,680 576.5,656.5Q600,633 600,600L600,540Q600,514 583,497Q566,480 540,480Q566,480 583,463Q600,446 600,420L600,360Q600,327 576.5,303.5Q553,280 520,280L360,280L360,360L520,360Q520,360 520,360Q520,360 520,360L520,440Q520,440 520,440Q520,440 520,440L440,440L440,520L520,520Q520,520 520,520Q520,520 520,520L520,600Q520,600 520,600Q520,600 520,600L360,600L360,680Z"/>

</vector>

res/raw/lottie_privatespace_hide_placeholder.json

0 → 100644
+1 −0

File added.

Preview size limit exceeded, changes collapsed.

res/values/strings.xml

+17 −1
Original line number Diff line number Diff line
@@ -1198,7 +1198,23 @@ 
    <!-- Title for the Private Space one lock preference. [CHAR LIMIT=60] -->

    <string name="private_space_one_lock_title">Unlock using screen lock</string>

    <!-- Title for the preference to hide Private Space. [CHAR LIMIT=60] -->

    <string name="private_space_hide_title">Show Private Space</string>

    <string name="private_space_hide_title">Hide when locked</string>

    <!-- Title for the hide Private Space setting. [CHAR LIMIT=60] -->

    <string name="privatespace_hide_page_title">Hide Private Space when locked</string>

    <!-- Description for hide Private Space settings page. [CHAR LIMIT=60] -->

    <string name="privatespace_hide_page_summary">To stop other people knowing Private Space is on your device, you can hide it from your apps list</string>

    <!-- Header in hide Private Space settings page to access Private Space when hidden. [CHAR LIMIT=60] -->

    <string name="privatespace_access_header">Access Private Space when hidden</string>

    <!-- Text in hide Private Space settings page on how to search Private Space when hidden. [CHAR LIMIT=60] -->

    <string name="privatespace_search_description">Search for \'Private Space\' in the search bar</string>

    <!-- Text in hide Private Space settings page to tap on Private Space tile. [CHAR LIMIT=60] -->

    <string name="privatespace_tap_tile_description">Tap the Private Space tile</string>

    <!-- Text in hide Private Space settings page to Unlock Private Space. [CHAR LIMIT=60] -->

    <string name="privatespace_unlock_description">Unlock your Private Space</string>

    <!-- Used to describe the off state of Private space hidden [CHAR LIMIT=30] -->

    <string name="privatespace_hide_off_summary">Off</string>

    <!-- Used to describe the off state of Private space hidden [CHAR LIMIT=30] -->

    <string name="privatespace_hide_on_summary">On</string>

    <!-- System category for the Private Space page. [CHAR LIMIT=30] -->

    <string name="private_space_category_system">System</string>

    <!-- Title for the preference to create Private Space. [CHAR LIMIT=60] -->