Allow users to turn on or off Android-x86 statistics

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 3805812..d334b01 100644 (file)
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1728,6 +1728,10 @@
     <string name="android_x86_dashboard_summary">兼容模式、统计</string>
     <string name="nativebridge_toggle_title">"兼容模式"</string>
     <string name="nativebridge_toggle_summary">"可兼容於使用 arm 庫的应用"</string>
+    <string name="collect_hw_info_title">收集匿名的硬件信息</string>
+    <string name="collect_hw_info_summary">收集本机的硬件信息并传送给 Android-x86 项目做统计</string>
+    <string name="collect_apps_usage_title">收集匿名的应用信息</string>
+    <string name="collect_apps_usage_summary">收集应用的开启信息并传送给 Android-x86 项目做统计</string>
     <string name="language_input_gesture_title" msgid="8749227808244881255">"语言、输入法和手势"</string>
     <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
     <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>

diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 37b4976..abdf64e 100644 (file)
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -1728,6 +1728,10 @@
     <string name="android_x86_dashboard_summary">原生相容模式、統計</string>
     <string name="nativebridge_toggle_title">"原生相容模式"</string>
     <string name="nativebridge_toggle_summary">"可相容於使用 arm 原生函式庫的應用程式"</string>
+    <string name="collect_hw_info_title">收集匿名的硬體資訊</string>
+    <string name="collect_hw_info_summary">收集本機的硬體資訊並傳送給 Android-x86 計劃以便統計</string>
+    <string name="collect_apps_usage_title">收集匿名的應用程式資訊</string>
+    <string name="collect_apps_usage_summary">收集應用程式的開啟資料並傳送給 Android-x86 計劃以便統計</string>
     <string name="language_input_gesture_title" msgid="8749227808244881255">"語言、輸入和手勢"</string>
     <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
     <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 6357b2f..2c283ed 100644 (file)
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1728,6 +1728,10 @@
     <string name="android_x86_dashboard_summary">原生相容模式、統計</string>
     <string name="nativebridge_toggle_title">"原生相容模式"</string>
     <string name="nativebridge_toggle_summary">"可相容於使用 arm 原生函式庫的應用程式"</string>
+    <string name="collect_hw_info_title">收集匿名的硬體資訊</string>
+    <string name="collect_hw_info_summary">收集本機的硬體資訊並傳送給 Android-x86 計劃以便統計</string>
+    <string name="collect_apps_usage_title">收集匿名的應用程式資訊</string>
+    <string name="collect_apps_usage_summary">收集應用程式的開啟資料並傳送給 Android-x86 計劃以便統計</string>
     <string name="language_input_gesture_title" msgid="8749227808244881255">"語言、輸入和手勢"</string>
     <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
     <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 230659d..4ad3977 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4045,6 +4045,10 @@
     <string name="android_x86_dashboard_summary">Native bridge, statistics</string>
     <string name="nativebridge_toggle_title">Enable native bridge</string>
     <string name="nativebridge_toggle_summary">To support apps with arm native libraries</string>
+    <string name="collect_hw_info_title">Collect anonymous hardware information</string>
+    <string name="collect_hw_info_summary">To collect the hardware information of this device and send to Android-x86 statistics</string>
+    <string name="collect_apps_usage_title">Collect anonymous apps usage</string>
+    <string name="collect_apps_usage_summary">To collect the apps usage information and send to Android-x86 statistics</string>
 
     <!-- Languages Settings --> <skip />
     <!-- Title of Language, input & gestures setting on main settings screen. -->

diff --git a/res/xml/android_x86_options.xml b/res/xml/android_x86_options.xml
index c0561f7..30d64de 100644 (file)
--- a/res/xml/android_x86_options.xml
+++ b/res/xml/android_x86_options.xml
@@ -23,4 +23,14 @@
         android:summary="@string/nativebridge_toggle_summary"
         android:persistent="false" />
 
+    <SwitchPreference android:key="toggle_hw_info"
+        android:title="@string/collect_hw_info_title"
+        android:summary="@string/collect_hw_info_summary"
+        android:persistent="false" />
+
+    <SwitchPreference android:key="toggle_apps_usage"
+        android:title="@string/collect_apps_usage_title"
+        android:summary="@string/collect_apps_usage_summary"
+        android:persistent="false" />
+
 </PreferenceScreen>

diff --git a/src/com/android/settings/AndroidX86DashboardFragment.java b/src/com/android/settings/AndroidX86DashboardFragment.java
index 55d7263..ab1b0f8 100644 (file)
--- a/src/com/android/settings/AndroidX86DashboardFragment.java
+++ b/src/com/android/settings/AndroidX86DashboardFragment.java
@@ -26,9 +26,15 @@ import com.android.settings.SettingsPreferenceFragment;
 public class AndroidX86DashboardFragment extends SettingsPreferenceFragment {
 
     private SwitchPreference mNativeBridgePreference;
+    private SwitchPreference mHwInfoPreference;
+    private SwitchPreference mAppsUsagePreference;
 
     private static final String KEY_TOGGLE_NB = "toggle_nb";
     private static final String PROPERTY_NATIVEBRIDGE = "persist.sys.nativebridge";
+    private static final String KEY_TOGGLE_HW_INFO = "toggle_hw_info";
+    private static final String PROPERTY_HW_INFO = "persist.sys.hw_statistics";
+    private static final String KEY_TOGGLE_APPS_USAGE = "toggle_apps_usage";
+    private static final String PROPERTY_APPS_USAGE = "persist.sys.apps_statistics";
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -37,12 +43,20 @@ public class AndroidX86DashboardFragment extends SettingsPreferenceFragment {
         addPreferencesFromResource(R.xml.android_x86_options);
         mNativeBridgePreference = (SwitchPreference) findPreference(KEY_TOGGLE_NB);
         mNativeBridgePreference.setChecked(SystemProperties.getBoolean(PROPERTY_NATIVEBRIDGE, false));
+        mHwInfoPreference = (SwitchPreference) findPreference(KEY_TOGGLE_HW_INFO);
+        mHwInfoPreference.setChecked(SystemProperties.getBoolean(PROPERTY_HW_INFO, true));
+        mAppsUsagePreference = (SwitchPreference) findPreference(KEY_TOGGLE_APPS_USAGE);
+        mAppsUsagePreference.setChecked(SystemProperties.getBoolean(PROPERTY_APPS_USAGE, false));
     }
 
     @Override
     public boolean onPreferenceTreeClick(Preference preference) {
         if (preference == mNativeBridgePreference) {
             SystemProperties.set(PROPERTY_NATIVEBRIDGE, mNativeBridgePreference.isChecked() ? "1" : "0");
+        } else if (preference == mHwInfoPreference) {
+            SystemProperties.set(PROPERTY_HW_INFO, Boolean.toString(mHwInfoPreference.isChecked()));
+        } else if (preference == mAppsUsagePreference) {
+            SystemProperties.set(PROPERTY_APPS_USAGE, Boolean.toString(mAppsUsagePreference.isChecked()));
         }
         return super.onPreferenceTreeClick(preference);
     }