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

Commit cc83d8db authored by Adam Cohen's avatar Adam Cohen Committed by Android (Google) Code Review
Browse files

Merge "Specify permission.RECEIVE_LAUNCH_BROADCASTS in String resource" into ub-now-master

parents e8a30577 df3ac430

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,9 @@ 
    <!-- URI used to import old favorites. [DO NOT TRANSLATE] -->

    <string name="old_launcher_provider_uri" translatable="false">content://com.android.launcher2.settings/favorites?notify=true</string>



    <!-- Permission to receive the com.android.launcher3.action.LAUNCH intent -->

    <string name="receive_launch_broadcasts_permission" translatable="false">com.android.launcher3.permission.RECEIVE_LAUNCH_BROADCASTS</string>



    <!-- Application name -->

    <string name="application_name">Launcher3</string>

    <!-- Accessibility-facing application name -->

src/com/android/launcher3/Stats.java

+7 −3
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ public class Stats { 
    private static final boolean LOCAL_LAUNCH_LOG = true;



    public static final String ACTION_LAUNCH = "com.android.launcher3.action.LAUNCH";

    public static final String PERM_LAUNCH = "com.android.launcher3.permission.RECEIVE_LAUNCH_BROADCASTS";

    public static final String EXTRA_INTENT = "intent";

    public static final String EXTRA_CONTAINER = "container";

    public static final String EXTRA_SCREEN = "screen";
@@ -53,6 +52,8 @@ public class Stats { 


    private final Launcher mLauncher;



    private final String mLaunchBroadcastPermission;



    DataOutputStream mLog;



    ArrayList<String> mIntents;
@@ -61,6 +62,9 @@ public class Stats { 
    public Stats(Launcher launcher) {

        mLauncher = launcher;



        mLaunchBroadcastPermission =

                launcher.getResources().getString(R.string.receive_launch_broadcasts_permission);



        loadStats();



        if (LOCAL_LAUNCH_LOG) {
@@ -87,7 +91,7 @@ public class Stats { 
                        }

                    },

                    new IntentFilter(ACTION_LAUNCH),

                    PERM_LAUNCH,

                    mLaunchBroadcastPermission,

                    null

            );

        }
@@ -120,7 +124,7 @@ public class Stats { 
                    .putExtra(EXTRA_CELLX, shortcut.cellX)

                    .putExtra(EXTRA_CELLY, shortcut.cellY);

        }

        mLauncher.sendBroadcast(broadcastIntent, PERM_LAUNCH);

        mLauncher.sendBroadcast(broadcastIntent, mLaunchBroadcastPermission);



        incrementLaunch(flat);