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

Commit 527c27c0 authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Adding a resource pointer to the app name so that derived projects can... 

Merge "Adding a resource pointer to the app name so that derived projects can easily modify app name" into ub-launcher3-calgary-polish
parents 6b5e60d0 112ce429

AndroidManifest-common.xml

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
        android:fullBackupContent="@xml/backupscheme"

        android:hardwareAccelerated="true"

        android:icon="@mipmap/ic_launcher_home"

        android:label="@string/app_name"

        android:label="@string/derived_app_name"

        android:largeHeap="@bool/config_largeHeap"

        android:restoreAnyVersion="true"

        android:supportsRtl="true" >

res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -9,6 +9,10 @@ 
    <bool name="is_large_tablet">false</bool>

    <bool name="allow_rotation">false</bool>



    <!-- A string pointer to the original app name string. This allows derived projects to

     easily override the app name without providing all translations -->

    <string name="derived_app_name" translatable="false">@string/app_name</string>



<!-- DragController -->

    <item type="id" name="drag_event_parity" />

src/com/android/launcher3/Launcher.java

+1 −1
Original line number Diff line number Diff line
@@ -883,7 +883,7 @@ public class Launcher extends Activity 
            } else {

                // TODO: Show a snack bar with link to settings

                Toast.makeText(this, getString(R.string.msg_no_phone_permission,

                        getString(R.string.app_name)), Toast.LENGTH_SHORT).show();

                        getString(R.string.derived_app_name)), Toast.LENGTH_SHORT).show();

            }

        }

        if (mLauncherCallbacks != null) {