From 5adcb3d353b066a056b86ae66946a06a251ff1fb Mon Sep 17 00:00:00 2001 From: Zachary Kuznia Date: Fri, 7 Aug 2015 16:32:28 -0700 Subject: [PATCH] Allow manual to be read from disk b/22891924 Change-Id: I6014690735403b772f273addba01706441898e23 --- AndroidManifest.xml | 13 +++ res/values/bools.xml | 2 + res/values/strings.xml | 7 ++ res/xml/device_info_settings.xml | 7 ++ .../android/settings/DeviceInfoSettings.java | 4 + .../settings/ManualDisplayActivity.java | 85 +++++++++++++++++++ 6 files changed, 118 insertions(+) create mode 100644 src/com/android/settings/ManualDisplayActivity.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f1996738a4c..cff847e53aa 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2419,6 +2419,19 @@ android:resource="@id/notification_settings" /> + + + + + + + + + false + + false false diff --git a/res/values/strings.xml b/res/values/strings.xml index 75bddc85b95..1e3f44c7b47 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2867,6 +2867,8 @@ Legal information Contributors + + Manual Regulatory information @@ -2886,6 +2888,11 @@ Satellite imagery providers:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky + + Manual + + There is a problem loading the manual. + Open source licenses diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml index 358f3e1cebe..1372ce709ba 100644 --- a/res/xml/device_info_settings.xml +++ b/res/xml/device_info_settings.xml @@ -41,6 +41,13 @@ android:targetClass="com.android.settings.deviceinfo.Status" /> + + + + +