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

Merge "Updated visual look for Shortcuts selection."

Browse Source
This commit is contained in:
Amith Yamasani
2010-11-05 16:25:47 +00:00
committed by Android (Google) Code Review
parent 6ea661863d de64df5fb9
commit 219491afb2
5 changed files with 71 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AndroidManifest.xml
View File

@@ -62,7 +62,8 @@
</intent-filter>
</activity>
<activity android:name="CreateShortcut" android:label="@string/settings_shortcut">
<activity android:name="CreateShortcut" android:label="@string/settings_shortcut"
android:theme="@style/Theme.CreateShortCut">
<intent-filter>
<action android:name="android.intent.action.CREATE_SHORTCUT" />
<category android:name="android.intent.category.DEFAULT" />

23
res/values-xlarge/styles.xml Normal file
View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2010 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<style name="Theme.CreateShortCut" parent="android:Theme.Holo.Dialog">
<item name="android:windowNoTitle">true</item>
</style>
</resources>

2
res/values/strings.xml
View File

@@ -486,7 +486,7 @@
<!-- Title of the Settings activity shown in the Launcher. [CHAR LIMIT=20] -->
<string name="settings_label_launcher">Settings</string>
<!-- Label for option to select a settings panel as a shortcut -->
<string name="settings_shortcut">Settings</string>
<string name="settings_shortcut">Select settings shortcut</string>
<!-- Wireless controls settings screen, setting check box label -->
<string name="airplane_mode">Airplane mode</string>
<!-- Wireless controls settings screen, setting option summary text -->

34
res/values/styles.xml
View File

@@ -1,22 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/* //device/apps/Preferences/assets/res/any/styles.xml
**
** Copyright 2006, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
<!-- Copyright (C) 2006 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<style name="info_label">
@@ -82,4 +79,7 @@
<item name="android:windowContentOverlay">@null</item>
</style>
<style name="Theme.CreateShortCut" parent="android:Theme.Holo">
</style>
</resources>

31
src/com/android/settings/CreateShortcut.java
View File

@@ -1,19 +1,39 @@
/*
* Copyright (C) 2010 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings;
import android.app.LauncherActivity;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.widget.ListView;
public class CreateShortcut extends LauncherActivity {
@Override protected Intent getTargetIntent() {
@Override
protected Intent getTargetIntent() {
Intent targetIntent = new Intent(Intent.ACTION_MAIN, null);
targetIntent.addCategory("com.android.settings.SHORTCUT");
targetIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
return targetIntent;
}
@Override protected void onListItemClick(ListView l, View v, int position, long id) {
@Override
protected void onListItemClick(ListView l, View v, int position, long id) {
Intent shortcutIntent = intentForPosition(position);
shortcutIntent.setFlags(Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
Intent intent = new Intent();
@@ -24,4 +44,9 @@ public class CreateShortcut extends LauncherActivity {
setResult(RESULT_OK, intent);
finish();
}
@Override
protected boolean onEvaluateShowIcons() {
return false;
}
}