Merge "Cleanup strings for iconoverride" into ub-launcher3-master

This commit is contained in:
TreeHugger Robot 2018-12-27 06:30:39 +00:00 committed by Android (Google) Code Review
commit 3446fb65c4
3 changed files with 0 additions and 46 deletions

View File

@ -29,13 +29,4 @@
android:defaultValue="@bool/allow_rotation"
android:persistent="true" />
<ListPreference
android:key="pref_override_icon_shape"
android:title="@string/icon_shape_override_label"
android:summary="@string/icon_shape_override_label_location"
android:entries="@array/icon_shape_override_paths_names"
android:entryValues="@array/icon_shape_override_paths_values"
android:defaultValue=""
android:persistent="false" />
</PreferenceScreen>

View File

@ -21,25 +21,6 @@
<!-- String representing the fragment class for settings activity.-->
<string name="settings_fragment_name" translatable="false">com.android.launcher3.settings.SettingsActivity$LauncherSettingsFragment</string>
<!-- Values for icon shape overrides. These should correspond to entries defined
in icon_shape_override_paths_names -->
<string-array translatable="false" name="icon_shape_override_paths_values">
<item></item>
<item>M50,0L100,0 100,100 0,100 0,0z</item>
<item>M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z</item>
<item>M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0</item>
<item>M50,0A50,50,0,0 1 100,50 L100,85 A15,15,0,0 1 85,100 L50,100 A50,50,0,0 1 50,0z</item>
</string-array>
<string-array translatable="false" name="icon_shape_override_paths_names">
<!-- Option to not change the icon shape on home screen. [CHAR LIMIT=50] -->
<item>@string/icon_shape_system_default</item>
<item>@string/icon_shape_square</item>
<item>@string/icon_shape_squircle</item>
<item>@string/icon_shape_circle</item>
<item>@string/icon_shape_teardrop</item>
</string-array>
<!-- DragController -->
<item type="id" name="drag_event_parity" />

View File

@ -207,24 +207,6 @@
<!-- Text description of the setting that allows the automatic placement of launcher shortcuts for applications and games installed on the device [CHAR LIMIT=NONE] -->
<string name="auto_add_shortcuts_description">For new apps</string>
<!-- Developer setting to change the shape of icons on home screen. -->
<string name="icon_shape_override_label" translatable="false">Change icon shape</string>
<!-- Subtext explaining that the icons will only be affected on the home screen. This text follows the actual icon action: Change icon shape, on Home screen -->
<string name="icon_shape_override_label_location" translatable="false">on Home screen</string>
<!-- Option to not change the icon shape on home screen and use the system default setting instead. -->
<string name="icon_shape_system_default" translatable="false">Use system default</string>
<!-- Option to change the shape of the home screen icons to a square. -->
<string name="icon_shape_square" translatable="false">Square</string>
<!-- Option to change the shape of the home screen icons to a squircle. This represents the name of the shape somewhere between a circle and a square. -->
<string name="icon_shape_squircle" translatable="false">Squircle</string>
<!-- Option to change the shape of the home screen icons to a circle. -->
<string name="icon_shape_circle" translatable="false">Circle</string>
<!-- Option to change the shape of the home screen icons to a teardrop. This represents the name of the shape similar to a circle with with the bottom right corner pushed out like a square -->
<string name="icon_shape_teardrop" translatable="false">Teardrop</string>
<!-- Message shown in the progress dialog when the icon shape override is being applied -->
<string name="icon_shape_override_progress" translatable="false">Applying icon shape changes</string>
<!-- Label on an icon that references an uninstalled package, for which we have no information about when it might be installed. [CHAR_LIMIT=15] -->
<string name="package_state_unknown">Unknown</string>