am cd03f532: Move backlight brightness from HardwareService to PowerManager

Merge commit 'cd03f5320d42290b1619933954a344b59dc55f4f' into eclair-plus-aosp

* commit 'cd03f5320d42290b1619933954a344b59dc55f4f':
  Move backlight brightness from HardwareService to PowerManager

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7a1760d..db39e3c 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -160,8 +160,8 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="DateTimeSettingsSetupWizard" android:label="@string/date_and_time">
-            android:screenOrientation="portrait"
+        <activity android:name="DateTimeSettingsSetupWizard" android:label="@string/date_and_time"
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index d39c90b..b5f65d8 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1313,7 +1313,7 @@
     <!-- Applications settings screen, setting check box title. If checked, the system allows installation of applications that are downloaded from random places, such as web sites.  -->
     <string name="install_applications">Unknown sources</string>
     <!-- Applications settings screen, setting check box summary.  This is the summary for "Unknown sources" checkbox  -->
-    <string name="install_unknown_applications">Allow install of non-Market applications</string>
+    <string name="install_unknown_applications">Allow installation of non-Market applications</string>
     <!-- Applications settings screen, message text of alert that appears if user selects the "Unknown sources" check box -->
     <string name="install_all_warning">Your phone and personal data are more vulnerable to attack by applications
  from unknown sources. You agree that you are solely responsible for any