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

Commit 91f739ad authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge 35337f15 on remote branch"

parents 8d504f8f bbd17890
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -2722,4 +2722,5 @@
    <string name="blur_effect_lockscreen_title">锁屏</string>
    <string name="blur_effect_globalaction_title">全局动作对话框</string>
    <string name="blur_effect_volumecontrol_title">音量控制</string>
    <string name="app_ops_no_applications">无应用</string>
</resources>
+1 −0
Original line number Diff line number Diff line
@@ -6279,4 +6279,5 @@
    <string name="select_sim_card">Select SIM card</string>

    <string name="add_operator_account_label">iTelcel</string>
    <string name="app_ops_no_applications">No applications</string>
</resources>
+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ public class AppOpsCategory extends ListFragment implements

        // Give some text to display if there is no data.  In a real
        // application this would come from a resource.
        setEmptyText("No applications");
        setEmptyText(getResources().getString(R.string.app_ops_no_applications));

        // We have a menu item to show in action bar.
        setHasOptionsMenu(true);