Bar chart preserves data before rotating device

We saw chart view is gone while rotating device.

Fow now, we save the old permission data before
fragment was recreated.
Then, we can initialize the view quickly with
old data.

Test: robotest, visual
Fixes: 123539793
Change-Id: I230fecc6001a17a0c0205f2a1dcb5dd79f32e744

diff --git a/src/com/android/settings/privacy/PermissionBarChartPreferenceController.java b/src/com/android/settings/privacy/PermissionBarChartPreferenceController.java
index 2c6368e..453cdbf 100644 (file)
--- a/src/com/android/settings/privacy/PermissionBarChartPreferenceController.java
+++ b/src/com/android/settings/privacy/PermissionBarChartPreferenceController.java
@@ -24,6 +24,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
+import android.os.Bundle;
 import android.permission.PermissionControllerManager;
 import android.permission.RuntimePermissionUsageInfo;
 import android.provider.DeviceConfig;
@@ -31,12 +32,15 @@ import android.util.Log;
 import android.view.View;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settingslib.Utils;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnCreate;
+import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.widget.BarChartInfo;
 import com.android.settingslib.widget.BarChartPreference;
@@ -48,14 +52,17 @@ import java.util.List;
 
 
 public class PermissionBarChartPreferenceController extends BasePreferenceController implements
-        PermissionControllerManager.OnPermissionUsageResultCallback, LifecycleObserver, OnStart {
+        PermissionControllerManager.OnPermissionUsageResultCallback, LifecycleObserver, OnCreate,
+        OnStart, OnSaveInstanceState {
 
     private static final String TAG = "BarChartPreferenceCtl";
+    private static final String KEY_PERMISSION_USAGE = "usage_infos";
 
+    @VisibleForTesting
+    List<RuntimePermissionUsageInfo> mOldUsageInfos;
     private PackageManager mPackageManager;
     private PrivacyDashboardFragment mParent;
     private BarChartPreference mBarChartPreference;
-    private List<RuntimePermissionUsageInfo> mOldUsageInfos;
 
     public PermissionBarChartPreferenceController(Context context, String preferenceKey) {
         super(context, preferenceKey);
@@ -68,6 +75,18 @@ public class PermissionBarChartPreferenceController extends BasePreferenceContro
     }
 
     @Override
+    public void onCreate(Bundle savedInstanceState) {
+        if (savedInstanceState != null) {
+            mOldUsageInfos = savedInstanceState.getParcelableArrayList(KEY_PERMISSION_USAGE);
+        }
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        outState.putParcelableList(KEY_PERMISSION_USAGE, mOldUsageInfos);
+    }
+
+    @Override
     public int getAvailabilityStatus() {
         return Boolean.parseBoolean(
                 DeviceConfig.getProperty(DeviceConfig.Privacy.NAMESPACE,
@@ -92,6 +111,9 @@ public class PermissionBarChartPreferenceController extends BasePreferenceContro
                 .build();
 
         mBarChartPreference.initializeBarChart(info);
+        if (!mOldUsageInfos.isEmpty()) {
+            mBarChartPreference.setBarViewInfos(createBarViews(mOldUsageInfos));
+        }
     }
 
     @Override
@@ -100,7 +122,9 @@ public class PermissionBarChartPreferenceController extends BasePreferenceContro
             return;
         }
 
-        mBarChartPreference.updateLoadingState(true /* isLoading */);
+        // We don't hide chart when we have existing data.
+        mBarChartPreference.updateLoadingState(mOldUsageInfos.isEmpty() /* isLoading */);
+        // But we still need to hint user with progress bar that we are updating new usage data.
         mParent.setLoadingEnabled(true /* enabled */);
         retrievePermissionUsageData();
     }

diff --git a/tests/robotests/src/com/android/settings/privacy/PermissionBarChartPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/privacy/PermissionBarChartPreferenceControllerTest.java
index f664f4f..332156e 100644 (file)
--- a/tests/robotests/src/com/android/settings/privacy/PermissionBarChartPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/privacy/PermissionBarChartPreferenceControllerTest.java
@@ -125,6 +125,18 @@ public class PermissionBarChartPreferenceControllerTest {
     }
 
     @Test
+    public void displayPreference_usageInfosSet_shouldSetBarViewInfos() {
+        final RuntimePermissionUsageInfo info1 =
+                new RuntimePermissionUsageInfo("permission 1", 10);
+        mController.mOldUsageInfos.add(info1);
+
+        mController.displayPreference(mScreen);
+
+        verify(mPreference).setBarViewInfos(any(BarViewInfo[].class));
+        verify(mPreference).initializeBarChart(any(BarChartInfo.class));
+    }
+
+    @Test
     public void onPermissionUsageResult_differentPermissionResultSet_shouldSetBarViewInfos() {
         final List<RuntimePermissionUsageInfo> infos1 = new ArrayList<>();
         final RuntimePermissionUsageInfo info1 =
@@ -159,7 +171,7 @@ public class PermissionBarChartPreferenceControllerTest {
     }
 
     @Test
-    public void onStart_permissionHubEnabled_shouldShowProgressBar() {
+    public void onStart_usageInfosNotSetAndPermissionHubEnabled_shouldShowProgressBar() {
         DeviceConfig.setProperty(DeviceConfig.Privacy.NAMESPACE,
                 DeviceConfig.Privacy.PROPERTY_PERMISSIONS_HUB_ENABLED, "true", true);
         mController.displayPreference(mScreen);
@@ -171,6 +183,21 @@ public class PermissionBarChartPreferenceControllerTest {
     }
 
     @Test
+    public void onStart_usageInfosSetAndPermissionHubEnabled_shouldNotUpdatePrefLoadingState() {
+        DeviceConfig.setProperty(DeviceConfig.Privacy.NAMESPACE,
+                DeviceConfig.Privacy.PROPERTY_PERMISSIONS_HUB_ENABLED, "true", true);
+        final RuntimePermissionUsageInfo info1 =
+                new RuntimePermissionUsageInfo("permission 1", 10);
+        mController.mOldUsageInfos.add(info1);
+        mController.displayPreference(mScreen);
+
+        mController.onStart();
+
+        verify(mFragment).setLoadingEnabled(true /* enabled */);
+        verify(mPreference).updateLoadingState(false /* isLoading */);
+    }
+
+    @Test
     public void onStart_permissionHubDisabled_shouldNotShowProgressBar() {
         DeviceConfig.setProperty(DeviceConfig.Privacy.NAMESPACE,
                 DeviceConfig.Privacy.PROPERTY_PERMISSIONS_HUB_ENABLED, "false", false);