diff options
author | Adam Lesinski <adamlesinski@google.com> | 2014-08-27 11:52:52 -0700 |
---|---|---|
committer | Adam Lesinski <adamlesinski@google.com> | 2014-08-29 12:52:41 -0700 |
commit | cc562a811da508b275254f275d6e0c1758a47d07 (patch) | |
tree | 1cf3f45e576d3033bc816a0acf8489a7b2803dcd /tests/UsageStatsTest | |
parent | 5283faba4a75a4d1fd9990637d22768e423895e3 (diff) | |
download | frameworks_base-cc562a811da508b275254f275d6e0c1758a47d07.zip frameworks_base-cc562a811da508b275254f275d6e0c1758a47d07.tar.gz frameworks_base-cc562a811da508b275254f275d6e0c1758a47d07.tar.bz2 |
Make UsageStats API comply with API Council
- Fix documentation to mention units of time in APIs.
- Return a Map instead of an ArrayMap
Bug:17289531
Change-Id: I0a2cfdc0bc003eeeb65a16e37bb7b991624b2853
Diffstat (limited to 'tests/UsageStatsTest')
-rw-r--r-- | tests/UsageStatsTest/src/com/android/tests/usagestats/UsageStatsActivity.java | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/tests/UsageStatsTest/src/com/android/tests/usagestats/UsageStatsActivity.java b/tests/UsageStatsTest/src/com/android/tests/usagestats/UsageStatsActivity.java index b6591bd..c08c1a3 100644 --- a/tests/UsageStatsTest/src/com/android/tests/usagestats/UsageStatsActivity.java +++ b/tests/UsageStatsTest/src/com/android/tests/usagestats/UsageStatsActivity.java @@ -23,7 +23,6 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.text.format.DateUtils; -import android.util.ArrayMap; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -36,6 +35,7 @@ import android.widget.TextView; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; +import java.util.Map; public class UsageStatsActivity extends ListActivity { private static final long USAGE_STATS_PERIOD = 1000 * 60 * 60 * 24 * 14; @@ -84,7 +84,7 @@ public class UsageStatsActivity extends ListActivity { private void updateAdapter() { long now = System.currentTimeMillis(); long beginTime = now - USAGE_STATS_PERIOD; - ArrayMap<String, UsageStats> stats = mUsageStatsManager.queryAndAggregateUsageStats( + Map<String, UsageStats> stats = mUsageStatsManager.queryAndAggregateUsageStats( beginTime, now); mAdapter.update(stats); } @@ -92,17 +92,13 @@ public class UsageStatsActivity extends ListActivity { private class Adapter extends BaseAdapter { private ArrayList<UsageStats> mStats = new ArrayList<>(); - public void update(ArrayMap<String, UsageStats> stats) { + public void update(Map<String, UsageStats> stats) { mStats.clear(); if (stats == null) { return; } - final int packageCount = stats.size(); - for (int i = 0; i < packageCount; i++) { - mStats.add(stats.valueAt(i)); - } - + mStats.addAll(stats.values()); Collections.sort(mStats, mComparator); notifyDataSetChanged(); } |