Fix date string in app usage history

See #1 and #2 for requirements.

Bug: 24492965
Change-Id: I98388caac40c9898a28a32d3154500f716aacfa3

Author: tony-mak

app/src/main/java/com/afwsamples/testdpc/policy/networking/NetworkUsageStatsFragment.java

@@ -20,8 +20,8 @@
 import android.app.AlertDialog;
 import android.app.DatePickerDialog;
 import android.app.ListFragment;
-import android.app.usage.NetworkStatsManager;
 import android.app.usage.NetworkStats;
+import android.app.usage.NetworkStatsManager;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
@@ -32,6 +32,8 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.RemoteException;
+import android.text.Html;
+import android.text.Spanned;
 import android.text.format.Formatter;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
@@ -49,6 +51,7 @@
 import com.afwsamples.testdpc.R;
 
 import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
@@ -85,6 +88,15 @@ public class NetworkUsageStatsFragment extends ListFragment implements View.OnCl
     private ArrayAdapter<List<NetworkStats.Bucket>> mListAdapter;
     private ListView mAppHistoryList;
     private Button mBackToAppsListButton;
+    private DateFormat mDateStringFormat;
+    private DateFormat mHourMinuteDateFormat;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mDateStringFormat = new SimpleDateFormat("*dd/MM/YYYY*");
+        mHourMinuteDateFormat = new SimpleDateFormat("kk:mm");
+    }
 
     @Override
     public View onCreateView(final LayoutInflater inflater, ViewGroup container,
@@ -256,22 +268,29 @@ public View getView(int position, View convertView, ViewGroup parent) {
                             View view = convertView;
                             if (convertView == null) {
                                 view = getActivity().getLayoutInflater().inflate(
-                                        android.R.layout.two_line_list_item, parent, false);
+                                        R.layout.network_usage_app_history_item, parent, false);
                             }
-                            DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.SHORT);
                             NetworkStats.Bucket item = getItem(position);
                             Date startDate = new Date(item.getStartTimeStamp());
                             Date endDate = new Date(item.getEndTimeStamp());
-                            TextView text1 = (TextView) view.findViewById(android.R.id.text1);
-                            TextView text2 = (TextView) view.findViewById(android.R.id.text2);
-                            text1.setText(dateFormat.format(startDate) + " - "
-                                    + dateFormat.format(endDate));
+                            TextView text1 = (TextView) view.findViewById(R.id.text1);
+                            TextView text2 = (TextView) view.findViewById(R.id.text2);
+                            text1.setText(getDateString(startDate, endDate));
                             text2.setText(getString(R.string.network_stats_bucket_usage,
                                     formatSize(item.getRxBytes()), item.getRxPackets(),
                                     formatSize(item.getTxBytes()), item.getTxPackets()));
                             return view;
                         }
-                    };
+
+                private Spanned getDateString(Date startDate, Date endDate) {
+                    String startDateString = mDateStringFormat.format(startDate);
+                    String startHourMinuteString = mHourMinuteDateFormat.format(startDate);
+                    String endHourMinuteString = mHourMinuteDateFormat.format(endDate);
+                    String resultString = "<b>" + startDateString + "</b> " +
+                            startHourMinuteString + " - " + endHourMinuteString;
+                    return Html.fromHtml(resultString);
+                }
+            };
             mAppHistoryList.setAdapter(adapter);
         }
     }

app/src/main/res/layout/network_usage_app_history_item.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:orientation="vertical">
+
+    <TextView
+            android:id="@+id/text1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="16sp"/>
+
+    <TextView
+            android:id="@+id/text2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="16sp"/>
+</LinearLayout>