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

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

Merge "SystemUI: Fix task manager title not change with language issue"

parents 13241ff2 50989183
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@
            android:paddingTop="3dip"
            android:textAppearance="?android:attr/textAppearanceMedium"
            android:textColor="#ffffffff"
            android:text="@string/task_manager_title"
            android:text="@string/tasklistview_title"
            android:layout_alignParentLeft="true" />
        <Button
            android:id="@+id/kill_all_button"
+1 −1
Original line number Diff line number Diff line
@@ -852,7 +852,7 @@
    <string name="empty_shade_text">No notifications</string>

    <!-- Task Manager -->
    <string name="task_manager_title">Task Manager</string>
    <string name="tasklistview_title">Task Manager</string>
    <string name="message_switch_fail">Can not switch to this task, because it has no interface.</string>
    <string name="tasklist_killall">Kill All</string>
    <string name="tasklist_memory_usage">"Free/Total Memory: [<xliff:g id="number">%s</xliff:g>] / [<xliff:g id="name">%s</xliff:g>]"</string>
+11 −0
Original line number Diff line number Diff line
@@ -110,11 +110,22 @@ public class TaskManager {
    }

    public void refreshTaskManagerView () {
        if (DEBUG) Log.e(TAG, "refreshTaskManagerView");
        setTaskManagerTitle();
        loadRunningTasks();
        refreshMemoryUsagePanel();
        inflateTaskListView();
    }

    private void setTaskManagerTitle() {
        final TextView taskManagerTitle =
                (TextView) mTaskManagerPanel.findViewById(R.id.task_manager_title);
        final Button killAllButton =
                (Button) mTaskManagerPanel.findViewById(R.id.kill_all_button);
        taskManagerTitle.setText(R.string.tasklistview_title);
        killAllButton.setText(R.string.tasklist_killall);
    }

    private void loadRunningTasks() {
        // get running task
        List<RunningTaskInfo> runningTaskList = mActivityManager.getRunningTasks(100);