PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Settings into eclair-mr2-plus-aosp

Browse Source
This commit is contained in:
Dan Vacura
2009-10-06 03:05:02 -07:00
committed by Android Git Automerger
parent 059c3f5d1e 3a0fc70b69
commit a89d3d3591
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@@ -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>

2
res/values/strings.xml
View File

@@ -1366,7 +1366,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