diff options
author | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-20 15:37:27 -0700 |
---|---|---|
committer | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-20 15:37:27 -0700 |
commit | 13ef17a37e683b8ad5800e9f542b411180fbec2f (patch) | |
tree | 96beaf07307486f6491f022da63ebe381765d1a8 /res/xml | |
parent | e5ec4ac409eb3d3169bb9350dfda51ae7e08291e (diff) | |
parent | e3fe3f89ee956e8d7995c569948cb70765ec19b8 (diff) | |
download | android_packages_apps_Trebuchet-13ef17a37e683b8ad5800e9f542b411180fbec2f.tar.gz android_packages_apps_Trebuchet-13ef17a37e683b8ad5800e9f542b411180fbec2f.tar.bz2 android_packages_apps_Trebuchet-13ef17a37e683b8ad5800e9f542b411180fbec2f.zip |
merged ub-launcher3-burnaby, and resolved conflicts
Note1: Verified that following succeeds. $ make -j 32 dist checkbuild
Note2: Verified that the git history of burnaby is (998 commit) is pulled
into mnc-dev packages/apps/Launcher3 git project using gitk.
b/22609402
Change-Id: If20ed77328a71d05a590a7ee2e84d5472d0248ae
Diffstat (limited to 'res/xml')
-rw-r--r-- | res/xml/app_target_browser.xml | 23 | ||||
-rw-r--r-- | res/xml/app_target_camera.xml | 23 | ||||
-rw-r--r-- | res/xml/app_target_email.xml | 23 | ||||
-rw-r--r-- | res/xml/app_target_gallery.xml | 23 | ||||
-rw-r--r-- | res/xml/app_target_messenger.xml | 26 | ||||
-rw-r--r-- | res/xml/app_target_phone.xml | 24 | ||||
-rw-r--r-- | res/xml/launcher_preferences.xml | 26 | ||||
-rw-r--r-- | res/xml/update_workspace.xml | 49 |
8 files changed, 168 insertions, 49 deletions
diff --git a/res/xml/app_target_browser.xml b/res/xml/app_target_browser.xml new file mode 100644 index 000000000..d7c3ed5fd --- /dev/null +++ b/res/xml/app_target_browser.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 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. +--> + +<resolve xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" > + + <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_BROWSER;end" /> + <favorite launcher:uri="http://www.example.com/" /> + +</resolve>
\ No newline at end of file diff --git a/res/xml/app_target_camera.xml b/res/xml/app_target_camera.xml new file mode 100644 index 000000000..f65a2b168 --- /dev/null +++ b/res/xml/app_target_camera.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 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. +--> + +<resolve xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" > + + <favorite launcher:uri="#Intent;action=android.media.action.STILL_IMAGE_CAMERA;end" /> + <favorite launcher:uri="#Intent;action=android.intent.action.CAMERA_BUTTON;end" /> + +</resolve>
\ No newline at end of file diff --git a/res/xml/app_target_email.xml b/res/xml/app_target_email.xml new file mode 100644 index 000000000..44f0a407d --- /dev/null +++ b/res/xml/app_target_email.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 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. +--> + +<resolve xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" > + + <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_EMAIL;end" /> + <favorite launcher:uri="mailto:" /> + +</resolve>
\ No newline at end of file diff --git a/res/xml/app_target_gallery.xml b/res/xml/app_target_gallery.xml new file mode 100644 index 000000000..c9d34924a --- /dev/null +++ b/res/xml/app_target_gallery.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 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. +--> + +<resolve xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" > + + <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_GALLERY;end" /> + <favorite launcher:uri="#Intent;type=images/*;end" /> + +</resolve>
\ No newline at end of file diff --git a/res/xml/app_target_messenger.xml b/res/xml/app_target_messenger.xml new file mode 100644 index 000000000..278eb5ca8 --- /dev/null +++ b/res/xml/app_target_messenger.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 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. +--> + +<resolve xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" > + + <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MESSAGING;end" /> + <favorite launcher:uri="sms:" /> + <favorite launcher:uri="smsto:" /> + <favorite launcher:uri="mms:" /> + <favorite launcher:uri="mmsto:" /> + +</resolve>
\ No newline at end of file diff --git a/res/xml/app_target_phone.xml b/res/xml/app_target_phone.xml new file mode 100644 index 000000000..5d6ca316e --- /dev/null +++ b/res/xml/app_target_phone.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 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. +--> + +<resolve xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" > + + <favorite launcher:uri="#Intent;action=android.intent.action.DIAL;end" /> + <favorite launcher:uri="tel:123" /> + <favorite launcher:uri="#Intent;action=android.intent.action.CALL_BUTTON;end" /> + +</resolve>
\ No newline at end of file diff --git a/res/xml/launcher_preferences.xml b/res/xml/launcher_preferences.xml new file mode 100644 index 000000000..624d9eb2c --- /dev/null +++ b/res/xml/launcher_preferences.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2015 Google Inc. + + 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. +--> + +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> + + <SwitchPreference + android:key="pref_allowRotation" + android:title="@string/allow_rotation_title" + android:defaultValue="@bool/allow_rotation" + android:persistent="true" + /> + +</PreferenceScreen> diff --git a/res/xml/update_workspace.xml b/res/xml/update_workspace.xml deleted file mode 100644 index 38442b91c..000000000 --- a/res/xml/update_workspace.xml +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> - -<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"> - <!-- Update the db with new hotseat items. Note that we reference the browser's original - package name. --> - <!-- Hotseat (We use the screen as the position of the item in the hotseat) --> - <favorite - launcher:packageName="com.android.dialer" - launcher:className="com.android.dialer.DialtactsActivity" - launcher:container="-101" - launcher:screen="0" - launcher:x="0" - launcher:y="0" /> - <favorite - launcher:packageName="com.android.contacts" - launcher:className="com.android.contacts.activities.PeopleActivity" - launcher:container="-101" - launcher:screen="1" - launcher:x="1" - launcher:y="0" /> - <favorite - launcher:packageName="com.android.mms" - launcher:className="com.android.mms.ui.ConversationList" - launcher:container="-101" - launcher:screen="3" - launcher:x="3" - launcher:y="0" /> - <favorite - launcher:packageName="com.android.browser" - launcher:className="com.android.browser.BrowserActivity" - launcher:container="-101" - launcher:screen="4" - launcher:x="4" - launcher:y="0" /> -</favorites> |