diff --git a/samples/browseable/AppRestrictionEnforcer/res/layout/fragment_app_restriction_enforcer.xml b/samples/browseable/AppRestrictionEnforcer/res/layout/fragment_app_restriction_enforcer.xml index b68398974..95d605ce5 100644 --- a/samples/browseable/AppRestrictionEnforcer/res/layout/fragment_app_restriction_enforcer.xml +++ b/samples/browseable/AppRestrictionEnforcer/res/layout/fragment_app_restriction_enforcer.xml @@ -119,34 +119,6 @@ - - - - - - - - - - Number: Rank: Approvals: - Profile: - Name - Age Items: Add Key diff --git a/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/AppRestrictionEnforcerFragment.java b/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/AppRestrictionEnforcerFragment.java index 361c4ac33..908f9046b 100644 --- a/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/AppRestrictionEnforcerFragment.java +++ b/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/AppRestrictionEnforcerFragment.java @@ -89,13 +89,6 @@ public class AppRestrictionEnforcerFragment extends Fragment implements */ private static final String RESTRICTION_KEY_APPROVALS = "approvals"; - /** - * Key for the bundle restriction in AppRestrictionSchema. - */ - private static final String RESTRICTION_KEY_PROFILE = "profile"; - private static final String RESTRICTION_KEY_PROFILE_NAME = "name"; - private static final String RESTRICTION_KEY_PROFILE_AGE = "age"; - /** * Key for the bundle array restriction in AppRestrictionSchema. */ @@ -119,8 +112,6 @@ public class AppRestrictionEnforcerFragment extends Fragment implements private EditText mEditNumber; private Spinner mSpinnerRank; private LinearLayout mLayoutApprovals; - private EditText mEditProfileName; - private EditText mEditProfileAge; private LinearLayout mLayoutItems; @Override @@ -137,17 +128,12 @@ public class AppRestrictionEnforcerFragment extends Fragment implements mEditNumber = (EditText) view.findViewById(R.id.number); mSpinnerRank = (Spinner) view.findViewById(R.id.rank); mLayoutApprovals = (LinearLayout) view.findViewById(R.id.approvals); - mEditProfileName = (EditText) view.findViewById(R.id.profile_name); - mEditProfileAge = (EditText) view.findViewById(R.id.profile_age); mLayoutItems = (LinearLayout) view.findViewById(R.id.items); view.findViewById(R.id.item_add).setOnClickListener(this); - View bundleLayout = view.findViewById(R.id.bundle_layout); View bundleArrayLayout = view.findViewById(R.id.bundle_array_layout); if (BUNDLE_SUPPORTED) { - bundleLayout.setVisibility(View.VISIBLE); bundleArrayLayout.setVisibility(View.VISIBLE); } else { - bundleLayout.setVisibility(View.GONE); bundleArrayLayout.setVisibility(View.GONE); } } @@ -197,21 +183,6 @@ public class AppRestrictionEnforcerFragment extends Fragment implements } }; - private TextWatcher mWatcherProfile = new EasyTextWatcher() { - @Override - public void afterTextChanged(Editable s) { - try { - String name = mEditProfileName.getText().toString(); - String ageString = mEditProfileAge.getText().toString(); - if (!TextUtils.isEmpty(ageString)) { - saveProfile(getActivity(), name, Integer.parseInt(ageString)); - } - } catch (NumberFormatException e) { - Toast.makeText(getActivity(), "Not an integer!", Toast.LENGTH_SHORT).show(); - } - } - }; - @Override public void onItemSelected(AdapterView parent, View view, int position, long id) { switch (parent.getId()) { @@ -292,20 +263,6 @@ public class AppRestrictionEnforcerFragment extends Fragment implements TextUtils.join(DELIMETER, restriction.getAllSelectedStrings())), DELIMETER)); - } else if (BUNDLE_SUPPORTED && RESTRICTION_KEY_PROFILE.equals(key)) { - String name = null; - int age = 0; - for (RestrictionEntry entry : restriction.getRestrictions()) { - String profileKey = entry.getKey(); - if (RESTRICTION_KEY_PROFILE_NAME.equals(profileKey)) { - name = entry.getSelectedString(); - } else if (RESTRICTION_KEY_PROFILE_AGE.equals(profileKey)) { - age = entry.getIntValue(); - } - } - name = prefs.getString(RESTRICTION_KEY_PROFILE_NAME, name); - age = prefs.getInt(RESTRICTION_KEY_PROFILE_AGE, age); - updateProfile(name, age); } else if (BUNDLE_SUPPORTED && RESTRICTION_KEY_ITEMS.equals(key)) { String itemsString = prefs.getString(RESTRICTION_KEY_ITEMS, ""); HashMap items = new HashMap<>(); @@ -362,22 +319,6 @@ public class AppRestrictionEnforcerFragment extends Fragment implements } } - private void updateProfile(String name, int age) { - if (!BUNDLE_SUPPORTED) { - return; - } - Bundle profile = new Bundle(); - profile.putString(RESTRICTION_KEY_PROFILE_NAME, name); - profile.putInt(RESTRICTION_KEY_PROFILE_AGE, age); - mCurrentRestrictions.putBundle(RESTRICTION_KEY_PROFILE, profile); - mEditProfileName.removeTextChangedListener(mWatcherProfile); - mEditProfileName.setText(name); - mEditProfileName.addTextChangedListener(mWatcherProfile); - mEditProfileAge.removeTextChangedListener(mWatcherProfile); - mEditProfileAge.setText(String.valueOf(age)); - mEditProfileAge.addTextChangedListener((mWatcherProfile)); - } - private void updateItems(Context context, Map items) { if (!BUNDLE_SUPPORTED) { return; @@ -510,25 +451,6 @@ public class AppRestrictionEnforcerFragment extends Fragment implements TextUtils.join(DELIMETER, approvals)).apply(); } - /** - * Saves the value for the "profile" restriction of AppRestrictionSchema. - * - * @param activity The activity - * @param name The value to be set for the "name" field. - * @param age The value to be set for the "age" field. - */ - private void saveProfile(Activity activity, String name, int age) { - if (!BUNDLE_SUPPORTED) { - return; - } - Bundle profile = new Bundle(); - profile.putString(RESTRICTION_KEY_PROFILE_NAME, name); - profile.putInt(RESTRICTION_KEY_PROFILE_AGE, age); - mCurrentRestrictions.putBundle(RESTRICTION_KEY_PROFILE, profile); - saveRestrictions(activity); - editPreferences(activity).putString(RESTRICTION_KEY_PROFILE_NAME, name).apply(); - } - /** * Saves the value for the "items" restriction of AppRestrictionSchema. * diff --git a/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/ItemAddFragment.java b/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/ItemAddFragment.java index cda2726bd..091a0a889 100644 --- a/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/ItemAddFragment.java +++ b/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/ItemAddFragment.java @@ -17,6 +17,7 @@ package com.example.android.apprestrictionenforcer; import android.app.Activity; +import android.content.Context; import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v4.app.DialogFragment; @@ -42,10 +43,10 @@ public class ItemAddFragment extends DialogFragment implements View.OnClickListe private EditText mEditValue; @Override - public void onAttach(Activity activity) { - super.onAttach(activity); + public void onAttach(Context context) { + super.onAttach(context); Fragment parentFragment = getParentFragment(); - mListener = (OnItemAddedListener) (parentFragment == null ? activity : parentFragment); + mListener = (OnItemAddedListener) (parentFragment == null ? context : parentFragment); } @Override diff --git a/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/MainActivity.java b/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/MainActivity.java index c6b012be8..85eace96b 100644 --- a/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/MainActivity.java +++ b/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/MainActivity.java @@ -62,7 +62,7 @@ public class MainActivity extends FragmentActivity implements StatusFragment.Sta private void showSetupProfile() { getSupportFragmentManager().beginTransaction() - .replace(R.id.container, new SetupProfileFragment()) + .replace(R.id.container, SetupProfileFragment.newInstance()) .commit(); } diff --git a/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/SetupProfileFragment.java b/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/SetupProfileFragment.java index 4dbd93055..29c36d410 100644 --- a/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/SetupProfileFragment.java +++ b/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/SetupProfileFragment.java @@ -18,6 +18,7 @@ package com.example.android.apprestrictionenforcer; import android.app.Activity; import android.content.Intent; +import android.os.Build; import android.os.Bundle; import android.support.v4.app.Fragment; import android.view.LayoutInflater; @@ -28,6 +29,7 @@ import android.widget.Toast; import static android.app.admin.DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE; import static android.app.admin.DevicePolicyManager.EXTRA_DEVICE_ADMIN; import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME; +import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME; /** * This {@link Fragment} handles initiation of managed profile provisioning. @@ -74,9 +76,14 @@ public class SetupProfileFragment extends Fragment implements View.OnClickListen return; } Intent intent = new Intent(ACTION_PROVISION_MANAGED_PROFILE); - intent.putExtra(EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME, - activity.getApplicationContext().getPackageName()); - intent.putExtra(EXTRA_DEVICE_ADMIN, EnforcerDeviceAdminReceiver.getComponentName(activity)); + if (Build.VERSION.SDK_INT >= 24) { + intent.putExtra(EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME, + EnforcerDeviceAdminReceiver.getComponentName(activity)); + } else { + intent.putExtra(EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME, + activity.getApplicationContext().getPackageName()); + intent.putExtra(EXTRA_DEVICE_ADMIN, EnforcerDeviceAdminReceiver.getComponentName(activity)); + } if (intent.resolveActivity(activity.getPackageManager()) != null) { startActivityForResult(intent, REQUEST_PROVISION_MANAGED_PROFILE); activity.finish(); diff --git a/samples/browseable/AppRestrictionSchema/res/layout/fragment_app_restriction_schema.xml b/samples/browseable/AppRestrictionSchema/res/layout/fragment_app_restriction_schema.xml index 02d83e615..01bda925d 100644 --- a/samples/browseable/AppRestrictionSchema/res/layout/fragment_app_restriction_schema.xml +++ b/samples/browseable/AppRestrictionSchema/res/layout/fragment_app_restriction_schema.xml @@ -68,15 +68,6 @@ limitations under the License. android:textAppearance="?android:attr/textAppearanceMedium" tools:text="@string/approvals_you_have"/> - - - - Rank Rank of the user + Apprentice + Intermediate + Master - Apprentice - Intermediate - Master + @string/entry_rank_apprentice + @string/entry_rank_intermediate + @string/entry_rank_master - apprentice - intermediate - master - @string/entry_value_rank_apprentice - @string/entry_value_rank_intermediate - @string/entry_value_rank_master + apprentice + intermediate + master - @string/entry_value_rank_apprentice + apprentice Approvals Approvals + Read + Write + Execute - Read - Write - Execute + @string/entry_approvals_read + @string/entry_approvals_write + @string/entry_approvals_execute - read - write - execute - @string/entry_value_approvals_read - @string/entry_value_approvals_write - @string/entry_value_approvals_execute + read + write + execute diff --git a/samples/browseable/AppRestrictionSchema/res/values/strings.xml b/samples/browseable/AppRestrictionSchema/res/values/strings.xml index 1ec68d54c..2fe686970 100644 --- a/samples/browseable/AppRestrictionSchema/res/values/strings.xml +++ b/samples/browseable/AppRestrictionSchema/res/values/strings.xml @@ -25,7 +25,6 @@ limitations under the License. Your rank: %s Approvals you have: %s none - Your profile: %1$s (%2$d) Your items: %s diff --git a/samples/browseable/AppRestrictionSchema/res/xml/app_restrictions.xml b/samples/browseable/AppRestrictionSchema/res/xml/app_restrictions.xml index 1e2ea457a..32ec8deaf 100644 --- a/samples/browseable/AppRestrictionSchema/res/xml/app_restrictions.xml +++ b/samples/browseable/AppRestrictionSchema/res/xml/app_restrictions.xml @@ -72,26 +72,6 @@ limitations under the License. android:restrictionType="hidden" android:title="@string/title_secret_code"/> - - - - - - - - - - - - - - diff --git a/samples/browseable/BasicSyncAdapter/res/values/attrs.xml b/samples/browseable/BasicSyncAdapter/res/values/attrs.xml deleted file mode 100644 index 6c1550469..000000000 --- a/samples/browseable/BasicSyncAdapter/res/values/attrs.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/AndroidManifest.xml b/samples/browseable/DragAndDropAcrossApps/DragSource/AndroidManifest.xml new file mode 100644 index 000000000..453cd6c5f --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DragSource/AndroidManifest.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/drawable-hdpi/tile.9.png b/samples/browseable/DragAndDropAcrossApps/DragSource/res/drawable-hdpi/tile.9.png new file mode 100644 index 000000000..135862883 Binary files /dev/null and b/samples/browseable/DragAndDropAcrossApps/DragSource/res/drawable-hdpi/tile.9.png differ diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/drawable/image1.png b/samples/browseable/DragAndDropAcrossApps/DragSource/res/drawable/image1.png new file mode 100644 index 000000000..c460737c0 Binary files /dev/null and b/samples/browseable/DragAndDropAcrossApps/DragSource/res/drawable/image1.png differ diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/drawable/image2.png b/samples/browseable/DragAndDropAcrossApps/DragSource/res/drawable/image2.png new file mode 100644 index 000000000..9d07a1b75 Binary files /dev/null and b/samples/browseable/DragAndDropAcrossApps/DragSource/res/drawable/image2.png differ diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/layout-w720dp/activity_main.xml b/samples/browseable/DragAndDropAcrossApps/DragSource/res/layout-w720dp/activity_main.xml new file mode 100755 index 000000000..efc54b70b --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/layout-w720dp/activity_main.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/layout/activity_main.xml b/samples/browseable/DragAndDropAcrossApps/DragSource/res/layout/activity_main.xml new file mode 100755 index 000000000..17bc911a8 --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/layout/activity_main.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/layout/fragment_dragsource.xml b/samples/browseable/DragAndDropAcrossApps/DragSource/res/layout/fragment_dragsource.xml new file mode 100644 index 000000000..a46ba0abb --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/layout/fragment_dragsource.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/menu/main.xml b/samples/browseable/DragAndDropAcrossApps/DragSource/res/menu/main.xml new file mode 100644 index 000000000..480cafef6 --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/menu/main.xml @@ -0,0 +1,22 @@ + + + + + diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/mipmap-hdpi/ic_launcher.png b/samples/browseable/DragAndDropAcrossApps/DragSource/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..125edc6c0 Binary files /dev/null and b/samples/browseable/DragAndDropAcrossApps/DragSource/res/mipmap-hdpi/ic_launcher.png differ diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/mipmap-mdpi/ic_launcher.png b/samples/browseable/DragAndDropAcrossApps/DragSource/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..00e2d797b Binary files /dev/null and b/samples/browseable/DragAndDropAcrossApps/DragSource/res/mipmap-mdpi/ic_launcher.png differ diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/mipmap-xhdpi/ic_launcher.png b/samples/browseable/DragAndDropAcrossApps/DragSource/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..0d0d8ee6a Binary files /dev/null and b/samples/browseable/DragAndDropAcrossApps/DragSource/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/mipmap-xxhdpi/ic_launcher.png b/samples/browseable/DragAndDropAcrossApps/DragSource/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..a387e3c02 Binary files /dev/null and b/samples/browseable/DragAndDropAcrossApps/DragSource/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/mipmap-xxxhdpi/ic_launcher.png b/samples/browseable/DragAndDropAcrossApps/DragSource/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..f33d5bb0c Binary files /dev/null and b/samples/browseable/DragAndDropAcrossApps/DragSource/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/values-sw600dp/template-dimens.xml b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values-sw600dp/template-dimens.xml new file mode 100644 index 000000000..22074a2bd --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values-sw600dp/template-dimens.xml @@ -0,0 +1,24 @@ + + + + + + + @dimen/margin_huge + @dimen/margin_medium + + diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/values-sw600dp/template-styles.xml b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values-sw600dp/template-styles.xml new file mode 100644 index 000000000..03d197418 --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values-sw600dp/template-styles.xml @@ -0,0 +1,25 @@ + + + + + + + diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/values-v11/template-styles.xml b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values-v11/template-styles.xml new file mode 100644 index 000000000..8c1ea66f2 --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values-v11/template-styles.xml @@ -0,0 +1,22 @@ + + + + + + + + diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/colors.xml b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/colors.xml new file mode 100644 index 000000000..801e292dd --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/colors.xml @@ -0,0 +1,21 @@ + + + + + + #ff888888 + diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/dimen.xml b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/dimen.xml new file mode 100644 index 000000000..220d1b82b --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/dimen.xml @@ -0,0 +1,31 @@ + + + + + + 16dp + 0dp + 16dp + 16dp + + 80dp + 16dp + + 0dp + 10dp + 6dp + diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/fragmentview_strings.xml b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/fragmentview_strings.xml new file mode 100755 index 000000000..7b9d9ec4f --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/fragmentview_strings.xml @@ -0,0 +1,19 @@ + + + Show Log + Hide Log + diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/strings.xml b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/strings.xml new file mode 100644 index 000000000..f2ab0925b --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/strings.xml @@ -0,0 +1,22 @@ + + + + + + These images can be dragged to any app.\nTry dragging it to the area below. + This sample demonstrates drag and drop functionality and is the \'source\' app for this sample. It shows how data can be moved between views within an app or between different apps.\nTry dragging one of the images to the highlighted target in this app.\nOpen the \'DropTarget\' sample app next to this app and try dragging an image between the two apps.\nImages are served through a content provider. The target app must request permission to access the dropped content. + diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/template-dimens.xml b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/template-dimens.xml new file mode 100644 index 000000000..39e710b5c --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/template-dimens.xml @@ -0,0 +1,32 @@ + + + + + + + 4dp + 8dp + 16dp + 32dp + 64dp + + + + @dimen/margin_medium + @dimen/margin_medium + + diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/template-styles.xml b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/template-styles.xml new file mode 100644 index 000000000..6e7d593dd --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/template-styles.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/xml/file_paths.xml b/samples/browseable/DragAndDropAcrossApps/DragSource/res/xml/file_paths.xml new file mode 100644 index 000000000..53c088759 --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/xml/file_paths.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/activities/SampleActivityBase.java b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/activities/SampleActivityBase.java new file mode 100644 index 000000000..db8962ef2 --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/activities/SampleActivityBase.java @@ -0,0 +1,52 @@ +/* +* Copyright 2013 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.example.android.common.activities; + +import com.example.android.common.logger.Log; +import com.example.android.common.logger.LogWrapper; + +import android.os.Bundle; +import android.support.v4.app.FragmentActivity; + +/** + * Base launcher activity, to handle most of the common plumbing for samples. + */ +public class SampleActivityBase extends FragmentActivity { + + public static final String TAG = "SampleActivityBase"; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + } + + @Override + protected void onStart() { + super.onStart(); + initializeLogging(); + } + + /** Set up targets to receive log data */ + public void initializeLogging() { + // Using Log, front-end to the logging chain, emulates android.util.log method signatures. + // Wraps Android's native log framework + LogWrapper logWrapper = new LogWrapper(); + Log.setLogNode(logWrapper); + + Log.i(TAG, "Ready"); + } +} diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/Log.java b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/Log.java new file mode 100644 index 000000000..56dc2a956 --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/Log.java @@ -0,0 +1,244 @@ +/* + * Copyright (C) 2013 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.example.android.common.logger; + +/** + * Helper class for a list (or tree) of LoggerNodes. + * + *

When this is set as the head of the list, + * an instance of it can function as a drop-in replacement for {@link android.util.Log}. + * Most of the methods in this class server only to map a method call in Log to its equivalent + * in LogNode.

+ */ +public class Log { + + // Grabbing the native values from Android's native logging facilities, + // to make for easy migration and interop. + public static final int NONE = -1; + + public static final int VERBOSE = android.util.Log.VERBOSE; + + public static final int DEBUG = android.util.Log.DEBUG; + + public static final int INFO = android.util.Log.INFO; + + public static final int WARN = android.util.Log.WARN; + + public static final int ERROR = android.util.Log.ERROR; + + public static final int ASSERT = android.util.Log.ASSERT; + + // Stores the beginning of the LogNode topology. + private static LogNode mLogNode; + + /** + * Returns the next LogNode in the linked list. + */ + public static LogNode getLogNode() { + return mLogNode; + } + + /** + * Sets the LogNode data will be sent to. + */ + public static void setLogNode(LogNode node) { + mLogNode = node; + } + + /** + * Instructs the LogNode to print the log data provided. Other LogNodes can + * be chained to the end of the LogNode as desired. + * + * @param priority Log level of the data being logged. Verbose, Error, etc. + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + * @param tr If an exception was thrown, this can be sent along for the logging + * facilities + * to extract and print useful information. + */ + public static void println(int priority, String tag, String msg, Throwable tr) { + if (mLogNode != null) { + mLogNode.println(priority, tag, msg, tr); + } + } + + /** + * Instructs the LogNode to print the log data provided. Other LogNodes can + * be chained to the end of the LogNode as desired. + * + * @param priority Log level of the data being logged. Verbose, Error, etc. + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. The actual message to be logged. + */ + public static void println(int priority, String tag, String msg) { + println(priority, tag, msg, null); + } + + /** + * Prints a message at VERBOSE priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + * @param tr If an exception was thrown, this can be sent along for the logging facilities + * to extract and print useful information. + */ + public static void v(String tag, String msg, Throwable tr) { + println(VERBOSE, tag, msg, tr); + } + + /** + * Prints a message at VERBOSE priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + */ + public static void v(String tag, String msg) { + v(tag, msg, null); + } + + + /** + * Prints a message at DEBUG priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + * @param tr If an exception was thrown, this can be sent along for the logging facilities + * to extract and print useful information. + */ + public static void d(String tag, String msg, Throwable tr) { + println(DEBUG, tag, msg, tr); + } + + /** + * Prints a message at DEBUG priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + */ + public static void d(String tag, String msg) { + d(tag, msg, null); + } + + /** + * Prints a message at INFO priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + * @param tr If an exception was thrown, this can be sent along for the logging facilities + * to extract and print useful information. + */ + public static void i(String tag, String msg, Throwable tr) { + println(INFO, tag, msg, tr); + } + + /** + * Prints a message at INFO priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + */ + public static void i(String tag, String msg) { + i(tag, msg, null); + } + + /** + * Prints a message at WARN priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + * @param tr If an exception was thrown, this can be sent along for the logging facilities + * to extract and print useful information. + */ + public static void w(String tag, String msg, Throwable tr) { + println(WARN, tag, msg, tr); + } + + /** + * Prints a message at WARN priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + */ + public static void w(String tag, String msg) { + w(tag, msg, null); + } + + /** + * Prints a message at WARN priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param tr If an exception was thrown, this can be sent along for the logging facilities + * to extract and print useful information. + */ + public static void w(String tag, Throwable tr) { + w(tag, null, tr); + } + + /** + * Prints a message at ERROR priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + * @param tr If an exception was thrown, this can be sent along for the logging facilities + * to extract and print useful information. + */ + public static void e(String tag, String msg, Throwable tr) { + println(ERROR, tag, msg, tr); + } + + /** + * Prints a message at ERROR priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + */ + public static void e(String tag, String msg) { + e(tag, msg, null); + } + + /** + * Prints a message at ASSERT priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + * @param tr If an exception was thrown, this can be sent along for the logging facilities + * to extract and print useful information. + */ + public static void wtf(String tag, String msg, Throwable tr) { + println(ASSERT, tag, msg, tr); + } + + /** + * Prints a message at ASSERT priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + */ + public static void wtf(String tag, String msg) { + wtf(tag, msg, null); + } + + /** + * Prints a message at ASSERT priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param tr If an exception was thrown, this can be sent along for the logging facilities + * to extract and print useful information. + */ + public static void wtf(String tag, Throwable tr) { + wtf(tag, null, tr); + } +} diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/LogFragment.java b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/LogFragment.java new file mode 100644 index 000000000..2b9250694 --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/LogFragment.java @@ -0,0 +1,98 @@ +/* +* Copyright 2013 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.example.android.common.logger; + +import android.graphics.Typeface; +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.text.Editable; +import android.text.TextWatcher; +import android.view.Gravity; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ScrollView; + +/** + * Simple fragment which contains a LogView and uses is to output log data it receives + * through the LogNode interface. + */ +public class LogFragment extends Fragment { + + private LogView mLogView; + + private ScrollView mScrollView; + + public LogFragment() { + } + + public View inflateViews() { + mScrollView = new ScrollView(getActivity()); + ViewGroup.LayoutParams scrollParams = new ViewGroup.LayoutParams( + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT); + mScrollView.setLayoutParams(scrollParams); + + mLogView = new LogView(getActivity()); + ViewGroup.LayoutParams logParams = new ViewGroup.LayoutParams(scrollParams); + logParams.height = ViewGroup.LayoutParams.WRAP_CONTENT; + mLogView.setLayoutParams(logParams); + mLogView.setClickable(true); + mLogView.setFocusable(true); + mLogView.setTypeface(Typeface.MONOSPACE); + + // Want to set padding as 16 dips, setPadding takes pixels. Hooray math! + int paddingDips = 16; + double scale = getResources().getDisplayMetrics().density; + int paddingPixels = (int) ((paddingDips * (scale)) + .5); + mLogView.setPadding(paddingPixels, paddingPixels, paddingPixels, paddingPixels); + mLogView.setCompoundDrawablePadding(paddingPixels); + + mLogView.setGravity(Gravity.BOTTOM); + mLogView.setTextAppearance(getActivity(), android.R.style.TextAppearance_Holo_Medium); + + mScrollView.addView(mLogView); + return mScrollView; + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + + View result = inflateViews(); + + mLogView.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + } + + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + } + + @Override + public void afterTextChanged(Editable s) { + mScrollView.fullScroll(ScrollView.FOCUS_DOWN); + } + }); + return result; + } + + public LogView getLogView() { + return mLogView; + } +} \ No newline at end of file diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/LogNode.java b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/LogNode.java new file mode 100644 index 000000000..0c922e0a1 --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/LogNode.java @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2012 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.example.android.common.logger; + +/** + * Basic interface for a logging system that can output to one or more targets. + * Note that in addition to classes that will output these logs in some format, + * one can also implement this interface over a filter and insert that in the chain, + * such that no targets further down see certain data, or see manipulated forms of the data. + * You could, for instance, write a "ToHtmlLoggerNode" that just converted all the log data + * it received to HTML and sent it along to the next node in the chain, without printing it + * anywhere. + */ +public interface LogNode { + + /** + * Instructs first LogNode in the list to print the log data provided. + * + * @param priority Log level of the data being logged. Verbose, Error, etc. + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. The actual message to be logged. + * @param tr If an exception was thrown, this can be sent along for the logging + * facilities + * to extract and print useful information. + */ + public void println(int priority, String tag, String msg, Throwable tr); + +} diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/LogView.java b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/LogView.java new file mode 100644 index 000000000..f752f339d --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/LogView.java @@ -0,0 +1,149 @@ +/* + * Copyright (C) 2013 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.example.android.common.logger; + +import android.app.Activity; +import android.content.Context; +import android.util.AttributeSet; +import android.widget.TextView; + +/** + * Simple TextView which is used to output log data received through the LogNode interface. + */ +public class LogView extends TextView implements LogNode { + + public LogView(Context context) { + super(context); + } + + public LogView(Context context, AttributeSet attrs) { + super(context, attrs); + } + + public LogView(Context context, AttributeSet attrs, int defStyle) { + super(context, attrs, defStyle); + } + + /** + * Formats the log data and prints it out to the LogView. + * + * @param priority Log level of the data being logged. Verbose, Error, etc. + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. The actual message to be logged. + * @param tr If an exception was thrown, this can be sent along for the logging + * facilities + * to extract and print useful information. + */ + @Override + public void println(int priority, String tag, String msg, Throwable tr) { + + String priorityStr = null; + + // For the purposes of this View, we want to print the priority as readable text. + switch (priority) { + case android.util.Log.VERBOSE: + priorityStr = "VERBOSE"; + break; + case android.util.Log.DEBUG: + priorityStr = "DEBUG"; + break; + case android.util.Log.INFO: + priorityStr = "INFO"; + break; + case android.util.Log.WARN: + priorityStr = "WARN"; + break; + case android.util.Log.ERROR: + priorityStr = "ERROR"; + break; + case android.util.Log.ASSERT: + priorityStr = "ASSERT"; + break; + default: + break; + } + + // Handily, the Log class has a facility for converting a stack trace into a usable string. + String exceptionStr = null; + if (tr != null) { + exceptionStr = android.util.Log.getStackTraceString(tr); + } + + // Take the priority, tag, message, and exception, and concatenate as necessary + // into one usable line of text. + final StringBuilder outputBuilder = new StringBuilder(); + + String delimiter = "\t"; + appendIfNotNull(outputBuilder, priorityStr, delimiter); + appendIfNotNull(outputBuilder, tag, delimiter); + appendIfNotNull(outputBuilder, msg, delimiter); + appendIfNotNull(outputBuilder, exceptionStr, delimiter); + + // In case this was originally called from an AsyncTask or some other off-UI thread, + // make sure the update occurs within the UI thread. + ((Activity) getContext()).runOnUiThread((new Thread(new Runnable() { + @Override + public void run() { + // Display the text we just generated within the LogView. + appendToLog(outputBuilder.toString()); + } + }))); + + if (mNext != null) { + mNext.println(priority, tag, msg, tr); + } + } + + public LogNode getNext() { + return mNext; + } + + public void setNext(LogNode node) { + mNext = node; + } + + /** + * Takes a string and adds to it, with a separator, if the bit to be added isn't null. Since + * the logger takes so many arguments that might be null, this method helps cut out some of the + * agonizing tedium of writing the same 3 lines over and over. + * + * @param source StringBuilder containing the text to append to. + * @param addStr The String to append + * @param delimiter The String to separate the source and appended strings. A tab or comma, + * for instance. + * @return The fully concatenated String as a StringBuilder + */ + private StringBuilder appendIfNotNull(StringBuilder source, String addStr, String delimiter) { + if (addStr != null) { + if (addStr.length() == 0) { + delimiter = ""; + } + + return source.append(addStr).append(delimiter); + } + return source; + } + + // The next LogNode in the chain. + LogNode mNext; + + /** Outputs the string as a new line of log data in the LogView. */ + public void appendToLog(String s) { + append("\n" + s); + } + + +} diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/LogWrapper.java b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/LogWrapper.java new file mode 100644 index 000000000..cacf16217 --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/LogWrapper.java @@ -0,0 +1,77 @@ +/* + * Copyright (C) 2012 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.example.android.common.logger; + +import android.util.Log; + +/** + * Helper class which wraps Android's native Log utility in the Logger interface. This way + * normal DDMS output can be one of the many targets receiving and outputting logs simultaneously. + */ +public class LogWrapper implements LogNode { + + // For piping: The next node to receive Log data after this one has done its work. + private LogNode mNext; + + /** + * Returns the next LogNode in the linked list. + */ + public LogNode getNext() { + return mNext; + } + + /** + * Sets the LogNode data will be sent to.. + */ + public void setNext(LogNode node) { + mNext = node; + } + + /** + * Prints data out to the console using Android's native log mechanism. + * + * @param priority Log level of the data being logged. Verbose, Error, etc. + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. The actual message to be logged. + * @param tr If an exception was thrown, this can be sent along for the logging + * facilities + * to extract and print useful information. + */ + @Override + public void println(int priority, String tag, String msg, Throwable tr) { + // There actually are log methods that don't take a msg parameter. For now, + // if that's the case, just convert null to the empty string and move on. + String useMsg = msg; + if (useMsg == null) { + useMsg = ""; + } + + // If an exeption was provided, convert that exception to a usable string and attach + // it to the end of the msg method. + if (tr != null) { + msg += "\n" + Log.getStackTraceString(tr); + } + + // This is functionally identical to Log.x(tag, useMsg); + // For instance, if priority were Log.VERBOSE, this would be the same as Log.v(tag, useMsg) + Log.println(priority, tag, useMsg); + + // If this isn't the last node in the chain, move things along. + if (mNext != null) { + mNext.println(priority, tag, msg, tr); + } + } +} diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/MessageOnlyLogFilter.java b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/MessageOnlyLogFilter.java new file mode 100644 index 000000000..bc3817425 --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/MessageOnlyLogFilter.java @@ -0,0 +1,61 @@ +/* + * Copyright (C) 2013 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.example.android.common.logger; + +/** + * Simple {@link LogNode} filter, removes everything except the message. + * Useful for situations like on-screen log output where you don't want a lot of metadata + * displayed, + * just easy-to-read message updates as they're happening. + */ +public class MessageOnlyLogFilter implements LogNode { + + LogNode mNext; + + /** + * Takes the "next" LogNode as a parameter, to simplify chaining. + * + * @param next The next LogNode in the pipeline. + */ + public MessageOnlyLogFilter(LogNode next) { + mNext = next; + } + + public MessageOnlyLogFilter() { + } + + @Override + public void println(int priority, String tag, String msg, Throwable tr) { + if (mNext != null) { + getNext().println(Log.NONE, null, msg, null); + } + } + + /** + * Returns the next LogNode in the chain. + */ + public LogNode getNext() { + return mNext; + } + + /** + * Sets the LogNode data will be sent to.. + */ + public void setNext(LogNode node) { + mNext = node; + } + +} diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/dragsource/DragSourceFragment.java b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/dragsource/DragSourceFragment.java new file mode 100644 index 000000000..5b92fc997 --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/dragsource/DragSourceFragment.java @@ -0,0 +1,237 @@ +/* + * Copyright 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. +*/ + +package com.example.android.dragsource; + +import com.example.android.common.logger.Log; + +import android.content.ClipData; +import android.content.ClipDescription; +import android.content.Context; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.graphics.Point; +import android.net.Uri; +import android.os.Bundle; +import android.os.PersistableBundle; +import android.support.annotation.Nullable; +import android.support.v13.view.DragStartHelper; +import android.support.v4.app.Fragment; +import android.support.v4.content.FileProvider; +import android.view.DragEvent; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.Date; + + +/** + * This sample demonstrates data can be moved between views within the app or between different + * apps via drag and drop. + *

This is the source app for the drag and drop sample. This app contains several + * {@link android.widget.ImageView} widgets which can be a drag source. Images can be dropped + * to a drop target area within the same app or in the DropTarget app (a separate app in this + * sample). + *

+ * There is also one {@link android.widget.EditText} widget that can be a drag source (no extra + * setup is necessary). + *

+ * To enable cross application drag and drop, the {@link android.view.View#DRAG_FLAG_GLOBAL} + * permission needs to be passed to the {@link android.view.View#startDragAndDrop(ClipData, + * View.DragShadowBuilder, Object, int)} method. If a Uri + * requiring permission grants is being sent, then the + * {@link android.view.View#DRAG_FLAG_GLOBAL_URI_READ} and/or the + * {@link android.view.View#DRAG_FLAG_GLOBAL_URI_WRITE} flags must be used also. + */ +public class DragSourceFragment extends Fragment { + + /** + * Name of saved data that stores the dropped image URI on the local ImageView when set. + */ + private static final String IMAGE_URI = "IMAGE_URI"; + + /** + * Name of the parameter for a {@link ClipData} extra that stores a text describing the dragged + * image. + */ + public static final String EXTRA_IMAGE_INFO = "IMAGE_INFO"; + + /** + * Uri of the ImageView source when set. + */ + private Uri mLocalImageUri; + + private static final String TAG = "DragSourceFragment"; + + private static final String CONTENT_AUTHORITY = "com.example.android.dragsource.fileprovider"; + + @Nullable + @Override + public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, + @Nullable Bundle savedInstanceState) { + + View view = inflater.inflate(R.layout.fragment_dragsource, null); + + // Set up two image views for global drag and drop with a permission grant. + Uri imageUri = getFileUri(R.drawable.image1, "image1.png"); + ImageView imageView = (ImageView) view.findViewById(R.id.image_one); + setUpDraggableImage(imageView, imageUri); + imageView.setImageURI(imageUri); + + imageUri = getFileUri(R.drawable.image2, "image2.png"); + imageView = (ImageView) view.findViewById(R.id.image_two); + setUpDraggableImage(imageView, imageUri); + imageView.setImageURI(imageUri); + + // Set up the local drop target area. + final ImageView localImageTarget = (ImageView) view.findViewById(R.id.local_target); + localImageTarget.setOnDragListener(new ImageDragListener() { + @Override + protected boolean setImageUri(View view, DragEvent event, Uri uri) { + mLocalImageUri = uri; + Log.d(TAG, "Setting local image to: " + uri); + return super.setImageUri(view, event, uri); + } + }); + + if (savedInstanceState != null) { + final String uriString = savedInstanceState.getString(IMAGE_URI); + if (uriString != null) { + mLocalImageUri = Uri.parse(uriString); + Log.d(TAG, "Restoring local image to: " + mLocalImageUri); + localImageTarget.setImageURI(mLocalImageUri); + } + } + return view; + } + + @Override + public void onSaveInstanceState(Bundle savedInstanceState) { + if (mLocalImageUri != null) { + savedInstanceState.putString(IMAGE_URI, mLocalImageUri.toString()); + } + super.onSaveInstanceState(savedInstanceState); + } + + private void setUpDraggableImage(ImageView imageView, final Uri imageUri) { + + // Set up a listener that starts the drag and drop event with flags and extra data. + DragStartHelper.OnDragStartListener listener = new DragStartHelper.OnDragStartListener() { + @Override + public boolean onDragStart(View view, final DragStartHelper helper) { + Log.d(TAG, "Drag start event received from helper."); + + // Use a DragShadowBuilder + View.DragShadowBuilder shadowBuilder = new View.DragShadowBuilder(view) { + @Override + public void onProvideShadowMetrics(Point shadowSize, Point shadowTouchPoint) { + super.onProvideShadowMetrics(shadowSize, shadowTouchPoint); + // Notify the DragStartHelper of point where the view was touched. + helper.getTouchPosition(shadowTouchPoint); + Log.d(TAG, "View was touched at: " + shadowTouchPoint); + } + }; + + // Set up the flags for the drag event. + // Enable drag and drop across apps (global) + // and require read permissions for this URI. + int flags = View.DRAG_FLAG_GLOBAL | View.DRAG_FLAG_GLOBAL_URI_READ; + + // Add an optional clip description that that contains an extra String that is + // read out by the target app. + final ClipDescription clipDescription = new ClipDescription("", new String[]{ + getContext().getContentResolver().getType(imageUri)}); + // Extras are stored within a PersistableBundle. + PersistableBundle extras = new PersistableBundle(1); + // Add a String that the target app will display. + extras.putString(EXTRA_IMAGE_INFO, + "Drag Started at " + new Date()); + clipDescription.setExtras(extras); + + // The ClipData object describes the object that is being dragged and dropped. + final ClipData clipData = + new ClipData(clipDescription, new ClipData.Item(imageUri)); + + Log.d(TAG, "Created ClipDescription. Starting drag and drop."); + // Start the drag and drop event. + return view.startDragAndDrop(clipData, shadowBuilder, null, flags); + + } + + }; + + // Use the DragStartHelper to detect drag and drop events and use the OnDragStartListener + // defined above to start the event when it has been detected. + DragStartHelper helper = new DragStartHelper(imageView, listener); + helper.attach(); + Log.d(TAG, "DragStartHelper attached to view."); + } + + /** + * Copy a drawable resource into local storage and makes it available via the + * {@link FileProvider}. + * + * @see Context#getFilesDir() + * @see FileProvider + * @see FileProvider#getUriForFile(Context, String, File) + */ + private Uri getFileUri(int sourceResourceId, String targetName) { + // Create the images/ sub directory if it does not exist yet. + File filePath = new File(getContext().getFilesDir(), "images"); + if (!filePath.exists() && !filePath.mkdir()) { + return null; + } + + // Copy a drawable from resources to the internal directory. + File newFile = new File(filePath, targetName); + if (!newFile.exists()) { + copyImageResourceToFile(sourceResourceId, newFile); + } + + // Make the file accessible via the FileProvider and retrieve its URI. + return FileProvider.getUriForFile(getContext(), CONTENT_AUTHORITY, newFile); + } + + + /** + * Copy a PNG resource drawable to a {@File}. + */ + private void copyImageResourceToFile(int resourceId, File filePath) { + Bitmap image = BitmapFactory.decodeResource(getResources(), resourceId); + + FileOutputStream out = null; + try { + out = new FileOutputStream(filePath); + image.compress(Bitmap.CompressFormat.PNG, 100, out); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + if (out != null) { + out.close(); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + } + +} diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/dragsource/ImageDragListener.java b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/dragsource/ImageDragListener.java new file mode 100644 index 000000000..8ad2864fe --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/dragsource/ImageDragListener.java @@ -0,0 +1,104 @@ +/* + * Copyright 2016, 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.example.android.dragsource; + +import android.content.ClipData; +import android.net.Uri; +import android.view.DragEvent; +import android.view.View; +import android.widget.ImageView; + +/** + * OnDragListener for ImageViews. + * Sets colors of the target when DragEvents fire. When a drop is received, the {@link Uri} backing + * the first {@link android.content.ClipData.Item} in the {@link DragEvent} is set as the image + * resource of the ImageView. + */ +public class ImageDragListener implements View.OnDragListener { + + private static final int COLOR_INACTIVE = 0xFF888888; + + private static final int COLOR_ACTIVE = 0xFFCCCCCC; + + private static final int COLOR_HOVER = 0xFFEEEEEE; + + @Override + public boolean onDrag(View view, DragEvent event) { + // Change the color of the target for all events. + // For the drop action, set the view to the dropped image. + switch (event.getAction()) { + case DragEvent.ACTION_DRAG_STARTED: + setTargetColor(view, COLOR_ACTIVE); + return true; + + case DragEvent.ACTION_DRAG_ENTERED: + setTargetColor(view, COLOR_HOVER); + return true; + + case DragEvent.ACTION_DRAG_LOCATION: + processLocation(event.getX(), event.getY()); + return true; + + case DragEvent.ACTION_DRAG_EXITED: + setTargetColor(view, COLOR_ACTIVE); + return true; + + case DragEvent.ACTION_DROP: + return processDrop(view, event); + + case DragEvent.ACTION_DRAG_ENDED: + setTargetColor(view, COLOR_INACTIVE); + return true; + + default: + break; + } + + return false; + } + + private void setTargetColor(View view, int color) { + view.setBackgroundColor(color); + } + + private boolean processDrop(View view, DragEvent event) { + ClipData clipData = event.getClipData(); + if (clipData == null || clipData.getItemCount() == 0) { + return false; + } + ClipData.Item item = clipData.getItemAt(0); + if (item == null) { + return false; + } + Uri uri = item.getUri(); + if (uri == null) { + return false; + } + return setImageUri(view, event, uri); + } + + protected void processLocation(float x, float y) { + } + + protected boolean setImageUri(View view, DragEvent event, Uri uri) { + if (!(view instanceof ImageView)) { + return false; + } + ((ImageView) view).setImageURI(uri); + return true; + } +} diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/dragsource/MainActivity.java b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/dragsource/MainActivity.java new file mode 100644 index 000000000..67bbb6c9b --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/dragsource/MainActivity.java @@ -0,0 +1,110 @@ +/* +* Copyright 2013 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.example.android.dragsource; + +import com.example.android.common.activities.SampleActivityBase; +import com.example.android.common.logger.Log; +import com.example.android.common.logger.LogFragment; +import com.example.android.common.logger.LogWrapper; +import com.example.android.common.logger.MessageOnlyLogFilter; + +import android.os.Bundle; +import android.support.v4.app.FragmentTransaction; +import android.view.Menu; +import android.view.MenuItem; +import android.widget.ViewAnimator; + +/** + * A simple launcher activity containing a summary sample description, sample log and a custom + * {@link android.support.v4.app.Fragment} which can display a view. + *

+ * For devices with displays with a width of 720dp or greater, the sample log is always visible, + * on other devices it's visibility is controlled by an item on the Action Bar. + */ +public class MainActivity extends SampleActivityBase { + + public static final String TAG = "MainActivity"; + + // Whether the Log Fragment is currently shown + private boolean mLogShown; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + + if (savedInstanceState == null) { + FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); + DragSourceFragment fragment = new DragSourceFragment(); + transaction.replace(R.id.sample_content_fragment, fragment); + transaction.commit(); + } + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + getMenuInflater().inflate(R.menu.main, menu); + return true; + } + + @Override + public boolean onPrepareOptionsMenu(Menu menu) { + MenuItem logToggle = menu.findItem(R.id.menu_toggle_log); + logToggle.setVisible(findViewById(R.id.sample_output) instanceof ViewAnimator); + logToggle.setTitle(mLogShown ? R.string.sample_hide_log : R.string.sample_show_log); + + return super.onPrepareOptionsMenu(menu); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case R.id.menu_toggle_log: + mLogShown = !mLogShown; + ViewAnimator output = (ViewAnimator) findViewById(R.id.sample_output); + if (mLogShown) { + output.setDisplayedChild(1); + } else { + output.setDisplayedChild(0); + } + supportInvalidateOptionsMenu(); + return true; + } + return super.onOptionsItemSelected(item); + } + + /** Create a chain of targets that will receive log data */ + @Override + public void initializeLogging() { + // Wraps Android's native log framework. + LogWrapper logWrapper = new LogWrapper(); + // Using Log, front-end to the logging chain, emulates android.util.log method signatures. + Log.setLogNode(logWrapper); + + // Filter strips out everything except the message text. + MessageOnlyLogFilter msgFilter = new MessageOnlyLogFilter(); + logWrapper.setNext(msgFilter); + + // On screen logging via a fragment with a TextView. + LogFragment logFragment = (LogFragment) getSupportFragmentManager() + .findFragmentById(R.id.log_fragment); + msgFilter.setNext(logFragment.getLogView()); + + Log.i(TAG, "Ready"); + } +} diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/AndroidManifest.xml b/samples/browseable/DragAndDropAcrossApps/DropTarget/AndroidManifest.xml new file mode 100644 index 000000000..02f39b2ee --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/AndroidManifest.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/res/drawable-hdpi/tile.9.png b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/drawable-hdpi/tile.9.png new file mode 100644 index 000000000..135862883 Binary files /dev/null and b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/drawable-hdpi/tile.9.png differ diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/res/layout-w720dp/activity_main.xml b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/layout-w720dp/activity_main.xml new file mode 100755 index 000000000..efc54b70b --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/layout-w720dp/activity_main.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/res/layout/activity_main.xml b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/layout/activity_main.xml new file mode 100755 index 000000000..17bc911a8 --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/layout/activity_main.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/res/layout/fragment_droptarget.xml b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/layout/fragment_droptarget.xml new file mode 100644 index 000000000..672117117 --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/layout/fragment_droptarget.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/res/menu/main.xml b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/menu/main.xml new file mode 100644 index 000000000..480cafef6 --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/menu/main.xml @@ -0,0 +1,22 @@ + + +

+ + diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/res/mipmap-hdpi/ic_launcher.png b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..0732a105b Binary files /dev/null and b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/mipmap-hdpi/ic_launcher.png differ diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/res/mipmap-mdpi/ic_launcher.png b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..6f8f369eb Binary files /dev/null and b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/mipmap-mdpi/ic_launcher.png differ diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/res/mipmap-xhdpi/ic_launcher.png b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..01f2b2e33 Binary files /dev/null and b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/res/mipmap-xxhdpi/ic_launcher.png b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..48899e6d2 Binary files /dev/null and b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/res/mipmap-xxxhdpi/ic_launcher.png b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..6d4a7c530 Binary files /dev/null and b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values-sw600dp/template-dimens.xml b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values-sw600dp/template-dimens.xml new file mode 100644 index 000000000..22074a2bd --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values-sw600dp/template-dimens.xml @@ -0,0 +1,24 @@ + + + + + + + @dimen/margin_huge + @dimen/margin_medium + + diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values-sw600dp/template-styles.xml b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values-sw600dp/template-styles.xml new file mode 100644 index 000000000..03d197418 --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values-sw600dp/template-styles.xml @@ -0,0 +1,25 @@ + + + + + + + diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values-v11/template-styles.xml b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values-v11/template-styles.xml new file mode 100644 index 000000000..8c1ea66f2 --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values-v11/template-styles.xml @@ -0,0 +1,22 @@ + + + + + + + + diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/colors.xml b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/colors.xml new file mode 100644 index 000000000..801e292dd --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/colors.xml @@ -0,0 +1,21 @@ + + + + + + #ff888888 + diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/dimen.xml b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/dimen.xml new file mode 100644 index 000000000..1efd96e3d --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/dimen.xml @@ -0,0 +1,27 @@ + + + + + + 16dp + + 150dp + + 0dp + 10dp + 6dp + diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/fragmentview_strings.xml b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/fragmentview_strings.xml new file mode 100755 index 000000000..7b9d9ec4f --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/fragmentview_strings.xml @@ -0,0 +1,19 @@ + + + Show Log + Hide Log + diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/strings.xml b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/strings.xml new file mode 100644 index 000000000..585a7890d --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/strings.xml @@ -0,0 +1,28 @@ + + + + + + + Drop image here.\nThe app will request permission from the source app before displaying the image. + + This sample demonstrates drag and drop functionality and is the \'target\' app for this sample. It shows how data can be received when dragged from another app.\nOpen the \'DragSource\' sample app next to this one and try dragging an image into the space below. + + Release permissions immediately after a drop + + Releasing permissions will prevent the image from being properly restored after the activity has been resized. + diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/template-dimens.xml b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/template-dimens.xml new file mode 100644 index 000000000..39e710b5c --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/template-dimens.xml @@ -0,0 +1,32 @@ + + + + + + + 4dp + 8dp + 16dp + 32dp + 64dp + + + + @dimen/margin_medium + @dimen/margin_medium + + diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/template-styles.xml b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/template-styles.xml new file mode 100644 index 000000000..6e7d593dd --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/template-styles.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/activities/SampleActivityBase.java b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/activities/SampleActivityBase.java new file mode 100644 index 000000000..3228927b7 --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/activities/SampleActivityBase.java @@ -0,0 +1,52 @@ +/* +* Copyright 2013 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.example.android.common.activities; + +import android.os.Bundle; +import android.support.v4.app.FragmentActivity; + +import com.example.android.common.logger.Log; +import com.example.android.common.logger.LogWrapper; + +/** + * Base launcher activity, to handle most of the common plumbing for samples. + */ +public class SampleActivityBase extends FragmentActivity { + + public static final String TAG = "SampleActivityBase"; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + } + + @Override + protected void onStart() { + super.onStart(); + initializeLogging(); + } + + /** Set up targets to receive log data */ + public void initializeLogging() { + // Using Log, front-end to the logging chain, emulates android.util.log method signatures. + // Wraps Android's native log framework + LogWrapper logWrapper = new LogWrapper(); + Log.setLogNode(logWrapper); + + Log.i(TAG, "Ready"); + } +} diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/Log.java b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/Log.java new file mode 100644 index 000000000..17503c568 --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/Log.java @@ -0,0 +1,236 @@ +/* + * Copyright (C) 2013 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.example.android.common.logger; + +/** + * Helper class for a list (or tree) of LoggerNodes. + * + *

When this is set as the head of the list, + * an instance of it can function as a drop-in replacement for {@link android.util.Log}. + * Most of the methods in this class server only to map a method call in Log to its equivalent + * in LogNode.

+ */ +public class Log { + // Grabbing the native values from Android's native logging facilities, + // to make for easy migration and interop. + public static final int NONE = -1; + public static final int VERBOSE = android.util.Log.VERBOSE; + public static final int DEBUG = android.util.Log.DEBUG; + public static final int INFO = android.util.Log.INFO; + public static final int WARN = android.util.Log.WARN; + public static final int ERROR = android.util.Log.ERROR; + public static final int ASSERT = android.util.Log.ASSERT; + + // Stores the beginning of the LogNode topology. + private static LogNode mLogNode; + + /** + * Returns the next LogNode in the linked list. + */ + public static LogNode getLogNode() { + return mLogNode; + } + + /** + * Sets the LogNode data will be sent to. + */ + public static void setLogNode(LogNode node) { + mLogNode = node; + } + + /** + * Instructs the LogNode to print the log data provided. Other LogNodes can + * be chained to the end of the LogNode as desired. + * + * @param priority Log level of the data being logged. Verbose, Error, etc. + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + * @param tr If an exception was thrown, this can be sent along for the logging facilities + * to extract and print useful information. + */ + public static void println(int priority, String tag, String msg, Throwable tr) { + if (mLogNode != null) { + mLogNode.println(priority, tag, msg, tr); + } + } + + /** + * Instructs the LogNode to print the log data provided. Other LogNodes can + * be chained to the end of the LogNode as desired. + * + * @param priority Log level of the data being logged. Verbose, Error, etc. + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. The actual message to be logged. + */ + public static void println(int priority, String tag, String msg) { + println(priority, tag, msg, null); + } + + /** + * Prints a message at VERBOSE priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + * @param tr If an exception was thrown, this can be sent along for the logging facilities + * to extract and print useful information. + */ + public static void v(String tag, String msg, Throwable tr) { + println(VERBOSE, tag, msg, tr); + } + + /** + * Prints a message at VERBOSE priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + */ + public static void v(String tag, String msg) { + v(tag, msg, null); + } + + + /** + * Prints a message at DEBUG priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + * @param tr If an exception was thrown, this can be sent along for the logging facilities + * to extract and print useful information. + */ + public static void d(String tag, String msg, Throwable tr) { + println(DEBUG, tag, msg, tr); + } + + /** + * Prints a message at DEBUG priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + */ + public static void d(String tag, String msg) { + d(tag, msg, null); + } + + /** + * Prints a message at INFO priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + * @param tr If an exception was thrown, this can be sent along for the logging facilities + * to extract and print useful information. + */ + public static void i(String tag, String msg, Throwable tr) { + println(INFO, tag, msg, tr); + } + + /** + * Prints a message at INFO priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + */ + public static void i(String tag, String msg) { + i(tag, msg, null); + } + + /** + * Prints a message at WARN priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + * @param tr If an exception was thrown, this can be sent along for the logging facilities + * to extract and print useful information. + */ + public static void w(String tag, String msg, Throwable tr) { + println(WARN, tag, msg, tr); + } + + /** + * Prints a message at WARN priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + */ + public static void w(String tag, String msg) { + w(tag, msg, null); + } + + /** + * Prints a message at WARN priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param tr If an exception was thrown, this can be sent along for the logging facilities + * to extract and print useful information. + */ + public static void w(String tag, Throwable tr) { + w(tag, null, tr); + } + + /** + * Prints a message at ERROR priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + * @param tr If an exception was thrown, this can be sent along for the logging facilities + * to extract and print useful information. + */ + public static void e(String tag, String msg, Throwable tr) { + println(ERROR, tag, msg, tr); + } + + /** + * Prints a message at ERROR priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + */ + public static void e(String tag, String msg) { + e(tag, msg, null); + } + + /** + * Prints a message at ASSERT priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + * @param tr If an exception was thrown, this can be sent along for the logging facilities + * to extract and print useful information. + */ + public static void wtf(String tag, String msg, Throwable tr) { + println(ASSERT, tag, msg, tr); + } + + /** + * Prints a message at ASSERT priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + */ + public static void wtf(String tag, String msg) { + wtf(tag, msg, null); + } + + /** + * Prints a message at ASSERT priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param tr If an exception was thrown, this can be sent along for the logging facilities + * to extract and print useful information. + */ + public static void wtf(String tag, Throwable tr) { + wtf(tag, null, tr); + } +} diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/LogFragment.java b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/LogFragment.java new file mode 100644 index 000000000..c1f369a28 --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/LogFragment.java @@ -0,0 +1,94 @@ +/* +* Copyright 2013 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.example.android.common.logger; + +import android.graphics.Typeface; +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.text.Editable; +import android.text.TextWatcher; +import android.view.Gravity; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ScrollView; + +/** + * Simple fragment which contains a LogView and uses is to output log data it receives + * through the LogNode interface. + */ +public class LogFragment extends Fragment { + + private LogView mLogView; + private ScrollView mScrollView; + + public LogFragment() {} + + public View inflateViews() { + mScrollView = new ScrollView(getActivity()); + ViewGroup.LayoutParams scrollParams = new ViewGroup.LayoutParams( + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT); + mScrollView.setLayoutParams(scrollParams); + + mLogView = new LogView(getActivity()); + ViewGroup.LayoutParams logParams = new ViewGroup.LayoutParams(scrollParams); + logParams.height = ViewGroup.LayoutParams.WRAP_CONTENT; + mLogView.setLayoutParams(logParams); + mLogView.setClickable(true); + mLogView.setFocusable(true); + mLogView.setTypeface(Typeface.MONOSPACE); + + // Want to set padding as 16 dips, setPadding takes pixels. Hooray math! + int paddingDips = 16; + double scale = getResources().getDisplayMetrics().density; + int paddingPixels = (int) ((paddingDips * (scale)) + .5); + mLogView.setPadding(paddingPixels, paddingPixels, paddingPixels, paddingPixels); + mLogView.setCompoundDrawablePadding(paddingPixels); + + mLogView.setGravity(Gravity.BOTTOM); + mLogView.setTextAppearance(getActivity(), android.R.style.TextAppearance_Holo_Medium); + + mScrollView.addView(mLogView); + return mScrollView; + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + + View result = inflateViews(); + + mLogView.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) {} + + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) {} + + @Override + public void afterTextChanged(Editable s) { + mScrollView.fullScroll(ScrollView.FOCUS_DOWN); + } + }); + return result; + } + + public LogView getLogView() { + return mLogView; + } +} \ No newline at end of file diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/LogNode.java b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/LogNode.java new file mode 100644 index 000000000..bc37cabc0 --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/LogNode.java @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2012 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.example.android.common.logger; + +/** + * Basic interface for a logging system that can output to one or more targets. + * Note that in addition to classes that will output these logs in some format, + * one can also implement this interface over a filter and insert that in the chain, + * such that no targets further down see certain data, or see manipulated forms of the data. + * You could, for instance, write a "ToHtmlLoggerNode" that just converted all the log data + * it received to HTML and sent it along to the next node in the chain, without printing it + * anywhere. + */ +public interface LogNode { + + /** + * Instructs first LogNode in the list to print the log data provided. + * @param priority Log level of the data being logged. Verbose, Error, etc. + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. The actual message to be logged. + * @param tr If an exception was thrown, this can be sent along for the logging facilities + * to extract and print useful information. + */ + public void println(int priority, String tag, String msg, Throwable tr); + +} diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/LogView.java b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/LogView.java new file mode 100644 index 000000000..c01542b91 --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/LogView.java @@ -0,0 +1,145 @@ +/* + * Copyright (C) 2013 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.example.android.common.logger; + +import android.app.Activity; +import android.content.Context; +import android.util.*; +import android.widget.TextView; + +/** Simple TextView which is used to output log data received through the LogNode interface. +*/ +public class LogView extends TextView implements LogNode { + + public LogView(Context context) { + super(context); + } + + public LogView(Context context, AttributeSet attrs) { + super(context, attrs); + } + + public LogView(Context context, AttributeSet attrs, int defStyle) { + super(context, attrs, defStyle); + } + + /** + * Formats the log data and prints it out to the LogView. + * @param priority Log level of the data being logged. Verbose, Error, etc. + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. The actual message to be logged. + * @param tr If an exception was thrown, this can be sent along for the logging facilities + * to extract and print useful information. + */ + @Override + public void println(int priority, String tag, String msg, Throwable tr) { + + + String priorityStr = null; + + // For the purposes of this View, we want to print the priority as readable text. + switch(priority) { + case android.util.Log.VERBOSE: + priorityStr = "VERBOSE"; + break; + case android.util.Log.DEBUG: + priorityStr = "DEBUG"; + break; + case android.util.Log.INFO: + priorityStr = "INFO"; + break; + case android.util.Log.WARN: + priorityStr = "WARN"; + break; + case android.util.Log.ERROR: + priorityStr = "ERROR"; + break; + case android.util.Log.ASSERT: + priorityStr = "ASSERT"; + break; + default: + break; + } + + // Handily, the Log class has a facility for converting a stack trace into a usable string. + String exceptionStr = null; + if (tr != null) { + exceptionStr = android.util.Log.getStackTraceString(tr); + } + + // Take the priority, tag, message, and exception, and concatenate as necessary + // into one usable line of text. + final StringBuilder outputBuilder = new StringBuilder(); + + String delimiter = "\t"; + appendIfNotNull(outputBuilder, priorityStr, delimiter); + appendIfNotNull(outputBuilder, tag, delimiter); + appendIfNotNull(outputBuilder, msg, delimiter); + appendIfNotNull(outputBuilder, exceptionStr, delimiter); + + // In case this was originally called from an AsyncTask or some other off-UI thread, + // make sure the update occurs within the UI thread. + ((Activity) getContext()).runOnUiThread( (new Thread(new Runnable() { + @Override + public void run() { + // Display the text we just generated within the LogView. + appendToLog(outputBuilder.toString()); + } + }))); + + if (mNext != null) { + mNext.println(priority, tag, msg, tr); + } + } + + public LogNode getNext() { + return mNext; + } + + public void setNext(LogNode node) { + mNext = node; + } + + /** Takes a string and adds to it, with a separator, if the bit to be added isn't null. Since + * the logger takes so many arguments that might be null, this method helps cut out some of the + * agonizing tedium of writing the same 3 lines over and over. + * @param source StringBuilder containing the text to append to. + * @param addStr The String to append + * @param delimiter The String to separate the source and appended strings. A tab or comma, + * for instance. + * @return The fully concatenated String as a StringBuilder + */ + private StringBuilder appendIfNotNull(StringBuilder source, String addStr, String delimiter) { + if (addStr != null) { + if (addStr.length() == 0) { + delimiter = ""; + } + + return source.append(addStr).append(delimiter); + } + return source; + } + + // The next LogNode in the chain. + LogNode mNext; + + /** Outputs the string as a new line of log data in the LogView. */ + public void appendToLog(String s) { + append("\n" + s); + } + + +} diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/LogWrapper.java b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/LogWrapper.java new file mode 100644 index 000000000..16a9e7ba2 --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/LogWrapper.java @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2012 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.example.android.common.logger; + +import android.util.Log; + +/** + * Helper class which wraps Android's native Log utility in the Logger interface. This way + * normal DDMS output can be one of the many targets receiving and outputting logs simultaneously. + */ +public class LogWrapper implements LogNode { + + // For piping: The next node to receive Log data after this one has done its work. + private LogNode mNext; + + /** + * Returns the next LogNode in the linked list. + */ + public LogNode getNext() { + return mNext; + } + + /** + * Sets the LogNode data will be sent to.. + */ + public void setNext(LogNode node) { + mNext = node; + } + + /** + * Prints data out to the console using Android's native log mechanism. + * @param priority Log level of the data being logged. Verbose, Error, etc. + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. The actual message to be logged. + * @param tr If an exception was thrown, this can be sent along for the logging facilities + * to extract and print useful information. + */ + @Override + public void println(int priority, String tag, String msg, Throwable tr) { + // There actually are log methods that don't take a msg parameter. For now, + // if that's the case, just convert null to the empty string and move on. + String useMsg = msg; + if (useMsg == null) { + useMsg = ""; + } + + // If an exeption was provided, convert that exception to a usable string and attach + // it to the end of the msg method. + if (tr != null) { + msg += "\n" + Log.getStackTraceString(tr); + } + + // This is functionally identical to Log.x(tag, useMsg); + // For instance, if priority were Log.VERBOSE, this would be the same as Log.v(tag, useMsg) + Log.println(priority, tag, useMsg); + + // If this isn't the last node in the chain, move things along. + if (mNext != null) { + mNext.println(priority, tag, msg, tr); + } + } +} diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/MessageOnlyLogFilter.java b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/MessageOnlyLogFilter.java new file mode 100644 index 000000000..19967dcd4 --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/MessageOnlyLogFilter.java @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2013 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.example.android.common.logger; + +/** + * Simple {@link LogNode} filter, removes everything except the message. + * Useful for situations like on-screen log output where you don't want a lot of metadata displayed, + * just easy-to-read message updates as they're happening. + */ +public class MessageOnlyLogFilter implements LogNode { + + LogNode mNext; + + /** + * Takes the "next" LogNode as a parameter, to simplify chaining. + * + * @param next The next LogNode in the pipeline. + */ + public MessageOnlyLogFilter(LogNode next) { + mNext = next; + } + + public MessageOnlyLogFilter() { + } + + @Override + public void println(int priority, String tag, String msg, Throwable tr) { + if (mNext != null) { + getNext().println(Log.NONE, null, msg, null); + } + } + + /** + * Returns the next LogNode in the chain. + */ + public LogNode getNext() { + return mNext; + } + + /** + * Sets the LogNode data will be sent to.. + */ + public void setNext(LogNode node) { + mNext = node; + } + +} diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/droptarget/DropTargetFragment.java b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/droptarget/DropTargetFragment.java new file mode 100644 index 000000000..9705e2b1e --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/droptarget/DropTargetFragment.java @@ -0,0 +1,178 @@ +/* + * Copyright (C) 2016 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.example.android.droptarget; + +import com.example.android.common.logger.Log; + +import android.app.Activity; +import android.content.ClipDescription; +import android.content.ContentResolver; +import android.net.Uri; +import android.os.Bundle; +import android.os.PersistableBundle; +import android.support.annotation.Nullable; +import android.support.v13.app.ActivityCompat; +import android.support.v13.view.DragAndDropPermissionsCompat; +import android.support.v4.app.Fragment; +import android.view.DragEvent; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.CheckBox; +import android.widget.ImageView; + +/** + * This sample demonstrates data can be moved between views in different applications via + * drag and drop. + *

This is the Target app for the drag and drop process. This app uses a + * {@link android.widget.ImageView} as the drop target. Images onto this + * view from the DragSource app that is also part of this sample. + *

+ * There is also a {@link android.widget.EditText} widget that can accept dropped text (no + * extra setup is necessary). + * To access content URIs requiring permissions, the target app needs to request the + * {@link android.view.DragAndDropPermissions} from the Activity via + * {@link ActivityCompat#requestDragAndDropPermissions(Activity, DragEvent)}. This permission will + * stay either as long as the activity is alive, or until the release() method is called on the + * {@link android.view.DragAndDropPermissions} object. + */ +public class DropTargetFragment extends Fragment { + + private static final String IMAGE_URI = "IMAGE_URI"; + + public static final String EXTRA_IMAGE_INFO = "IMAGE_INFO"; + + private static final String TAG = "DropTargetFragment"; + + private Uri mImageUri; + + private CheckBox mReleasePermissionCheckBox; + + @Nullable + @Override + public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, + @Nullable Bundle savedInstanceState) { + + View rootView = inflater.inflate(R.layout.fragment_droptarget, container, false); + final ImageView imageView = (ImageView) rootView.findViewById(R.id.image_target); + + ImageDragListener imageDragListener = new PermissionAwareImageDragListener(); + + imageView.setOnDragListener(imageDragListener); + + // Restore the application state if an image was being displayed. + if (savedInstanceState != null) { + final String uriString = savedInstanceState.getString(IMAGE_URI); + if (uriString != null) { + mImageUri = Uri.parse(uriString); + imageView.setImageURI(mImageUri); + } + } + + mReleasePermissionCheckBox = (CheckBox) rootView.findViewById(R.id.release_checkbox); + + return rootView; + } + + @Override + public void onSaveInstanceState(Bundle savedInstanceState) { + if (mImageUri != null) { + savedInstanceState.putString(IMAGE_URI, mImageUri.toString()); + } + super.onSaveInstanceState(savedInstanceState); + } + + private class PermissionAwareImageDragListener extends ImageDragListener { + + @Override + protected void processLocation(float x, float y) { + // Callback is received when the dragged image enters the drop area. + } + + @Override + protected boolean setImageUri(View view, DragEvent event, Uri uri) { + // Read the string from the clip description extras. + Log.d(TAG, "ClipDescription extra: " + getExtra(event)); + + Log.d(TAG, "Setting image source to: " + uri.toString()); + mImageUri = uri; + + if (ContentResolver.SCHEME_CONTENT.equals(uri.getScheme())) { + // Accessing a "content" scheme Uri requires a permission grant. + DragAndDropPermissionsCompat dropPermissions = ActivityCompat + .requestDragAndDropPermissions(getActivity(), event); + Log.d(TAG, "Requesting permissions."); + + if (dropPermissions == null) { + // Permission could not be obtained. + Log.d(TAG, "Drop permission request failed."); + return false; + } + + final boolean result = super.setImageUri(view, event, uri); + + if (mReleasePermissionCheckBox.isChecked()) { + /* Release the permissions if you are done with the URI. + Note that you may need to hold onto the permission until later if other + operations are performed on the content. For instance, releasing the + permissions here will prevent onCreateView from properly restoring the + ImageView state. + If permissions are not explicitly released, the permission grant will be + revoked when the activity is destroyed. + */ + dropPermissions.release(); + Log.d(TAG, "Permissions released."); + } + + return result; + } else { + // Other schemes (such as "android.resource") do not require a permission grant. + return super.setImageUri(view, event, uri); + } + } + + @Override + public boolean onDrag(View view, DragEvent event) { + // DragTarget is peeking into the MIME types of the dragged event in order to ignore + // non-image drags completely. + // DragSource does not do that but rejects non-image content once a drop has happened. + ClipDescription clipDescription = event.getClipDescription(); + if (clipDescription != null && !clipDescription.hasMimeType("image/*")) { + return false; + } + // Callback received when image is being dragged. + return super.onDrag(view, event); + } + } + + /** + * DragEvents can contain additional data packaged in a {@link PersistableBundle}. + * Extract the extras from the event and return the String stored for the + * {@link #EXTRA_IMAGE_INFO} entry. + */ + private String getExtra(DragEvent event) { + // The extras are contained in the ClipDescription in the DragEvent. + ClipDescription clipDescription = event.getClipDescription(); + if (clipDescription != null) { + PersistableBundle extras = clipDescription.getExtras(); + if (extras != null) { + return extras.getString(EXTRA_IMAGE_INFO); + } + } + return null; + } +} diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/droptarget/ImageDragListener.java b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/droptarget/ImageDragListener.java new file mode 100644 index 000000000..84a8b254d --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/droptarget/ImageDragListener.java @@ -0,0 +1,96 @@ +/* +* Copyright 2016, 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.example.android.droptarget; + +import android.content.ClipData; +import android.net.Uri; +import android.view.DragEvent; +import android.view.View; +import android.widget.ImageView; + +public class ImageDragListener implements View.OnDragListener { + + private static final int COLOR_INACTIVE = 0xFF888888; + + private static final int COLOR_ACTIVE = 0xFFCCCCCC; + + private static final int COLOR_HOVER = 0xFFEEEEEE; + + @Override + public boolean onDrag(View view, DragEvent event) { + switch (event.getAction()) { + case DragEvent.ACTION_DRAG_STARTED: + setTargetColor(view, COLOR_ACTIVE); + return true; + + case DragEvent.ACTION_DRAG_ENTERED: + setTargetColor(view, COLOR_HOVER); + return true; + + case DragEvent.ACTION_DRAG_LOCATION: + processLocation(event.getX(), event.getY()); + return true; + + case DragEvent.ACTION_DRAG_EXITED: + setTargetColor(view, COLOR_ACTIVE); + return true; + + case DragEvent.ACTION_DROP: + return processDrop(view, event); + + case DragEvent.ACTION_DRAG_ENDED: + setTargetColor(view, COLOR_INACTIVE); + return true; + + default: + break; + } + + return false; + } + + private void setTargetColor(View view, int color) { + view.setBackgroundColor(color); + } + + private boolean processDrop(View view, DragEvent event) { + ClipData clipData = event.getClipData(); + if (clipData == null || clipData.getItemCount() == 0) { + return false; + } + ClipData.Item item = clipData.getItemAt(0); + if (item == null) { + return false; + } + Uri uri = item.getUri(); + if (uri == null) { + return false; + } + return setImageUri(view, event, uri); + } + + protected void processLocation(float x, float y) { + } + + protected boolean setImageUri(View view, DragEvent event, Uri uri) { + if (!(view instanceof ImageView)) { + return false; + } + ((ImageView) view).setImageURI(uri); + return true; + } +} diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/droptarget/MainActivity.java b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/droptarget/MainActivity.java new file mode 100644 index 000000000..462f49b87 --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/droptarget/MainActivity.java @@ -0,0 +1,110 @@ +/* +* Copyright 2013 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.example.android.droptarget; + +import android.os.Bundle; +import android.support.v4.app.FragmentTransaction; +import android.view.Menu; +import android.view.MenuItem; +import android.widget.ViewAnimator; + +import com.example.android.common.activities.SampleActivityBase; +import com.example.android.common.logger.Log; +import com.example.android.common.logger.LogFragment; +import com.example.android.common.logger.LogWrapper; +import com.example.android.common.logger.MessageOnlyLogFilter; + +/** + * A simple launcher activity containing a summary sample description, sample log and a custom + * {@link android.support.v4.app.Fragment} which can display a view. + *

+ * For devices with displays with a width of 720dp or greater, the sample log is always visible, + * on other devices it's visibility is controlled by an item on the Action Bar. + */ +public class MainActivity extends SampleActivityBase { + + public static final String TAG = "MainActivity"; + + // Whether the Log Fragment is currently shown + private boolean mLogShown; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + + if (savedInstanceState == null) { + FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); + DropTargetFragment fragment = new DropTargetFragment(); + transaction.replace(R.id.sample_content_fragment, fragment); + transaction.commit(); + } + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + getMenuInflater().inflate(R.menu.main, menu); + return true; + } + + @Override + public boolean onPrepareOptionsMenu(Menu menu) { + MenuItem logToggle = menu.findItem(R.id.menu_toggle_log); + logToggle.setVisible(findViewById(R.id.sample_output) instanceof ViewAnimator); + logToggle.setTitle(mLogShown ? R.string.sample_hide_log : R.string.sample_show_log); + + return super.onPrepareOptionsMenu(menu); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch(item.getItemId()) { + case R.id.menu_toggle_log: + mLogShown = !mLogShown; + ViewAnimator output = (ViewAnimator) findViewById(R.id.sample_output); + if (mLogShown) { + output.setDisplayedChild(1); + } else { + output.setDisplayedChild(0); + } + supportInvalidateOptionsMenu(); + return true; + } + return super.onOptionsItemSelected(item); + } + + /** Create a chain of targets that will receive log data */ + @Override + public void initializeLogging() { + // Wraps Android's native log framework. + LogWrapper logWrapper = new LogWrapper(); + // Using Log, front-end to the logging chain, emulates android.util.log method signatures. + Log.setLogNode(logWrapper); + + // Filter strips out everything except the message text. + MessageOnlyLogFilter msgFilter = new MessageOnlyLogFilter(); + logWrapper.setNext(msgFilter); + + // On screen logging via a fragment with a TextView. + LogFragment logFragment = (LogFragment) getSupportFragmentManager() + .findFragmentById(R.id.log_fragment); + msgFilter.setNext(logFragment.getLogView()); + + Log.i(TAG, "Ready"); + } +} diff --git a/samples/browseable/DragAndDropAcrossApps/_index.jd b/samples/browseable/DragAndDropAcrossApps/_index.jd new file mode 100644 index 000000000..d780944c0 --- /dev/null +++ b/samples/browseable/DragAndDropAcrossApps/_index.jd @@ -0,0 +1,18 @@ + +page.tags="DragAndDropAcrossApps-new" +sample.group=ui +@jd:body + +

+ +This sample demonstrates how data can be moved between views within an +app or between different apps via drag and drop. +This sample contains two separate Android applications: DragSource and +DropTarget. DragSource contains images and text that can be dropped into the DropTarget +app. Images are shared between the two apps through a URI for which the receiving app +must request permission first, before it can be used. + +It also demonstrates the use of the DragStartHelper from the v13 support library to easily +handle drag and drop events. + +

diff --git a/samples/browseable/RenderScriptIntrinsic/res/values/attrs.xml b/samples/browseable/RenderScriptIntrinsic/res/values/attrs.xml deleted file mode 100644 index e67df0a37..000000000 --- a/samples/browseable/RenderScriptIntrinsic/res/values/attrs.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - diff --git a/samples/browseable/StorageProvider/_index.jd b/samples/browseable/StorageProvider/_index.jd index ef6f64621..9af4ec5ce 100644 --- a/samples/browseable/StorageProvider/_index.jd +++ b/samples/browseable/StorageProvider/_index.jd @@ -5,7 +5,7 @@ sample.group=Content

- \nA simple implementation of a documents provider using the storage access framework in - Android 4.4. +A simple implementation of a documents provider using the storage access framework in +Android 4.4.

diff --git a/samples/browseable/StorageProvider/res/values/base-strings.xml b/samples/browseable/StorageProvider/res/values/base-strings.xml index 5fd804c44..d80a40a6d 100644 --- a/samples/browseable/StorageProvider/res/values/base-strings.xml +++ b/samples/browseable/StorageProvider/res/values/base-strings.xml @@ -21,8 +21,8 @@ diff --git a/samples/browseable/WatchFace/Wearable/AndroidManifest.xml b/samples/browseable/WatchFace/Wearable/AndroidManifest.xml index a92229711..7dd5b69a9 100644 --- a/samples/browseable/WatchFace/Wearable/AndroidManifest.xml +++ b/samples/browseable/WatchFace/Wearable/AndroidManifest.xml @@ -14,125 +14,132 @@ See the License for the specific language governing permissions and limitations under the License. --> - + + android:targetSdkVersion="23"/> - + - + + + + - + - + + + + + - + android:label="@string/app_name"> + android:value="@integer/google_play_services_version"/> - + + android:permission="android.permission.BIND_WALLPAPER"> + android:resource="@xml/watch_face"/> + android:resource="@drawable/preview_analog"/> + android:resource="@drawable/preview_analog_circular"/> + android:value="com.example.android.wearable.watchface.CONFIG_ANALOG"/> - + - + + android:permission="android.permission.BIND_WALLPAPER"> + android:resource="@xml/watch_face"/> + android:resource="@drawable/preview_analog"/> + android:resource="@drawable/preview_analog_circular"/> - + - + + android:permission="android.permission.BIND_WALLPAPER"> + android:resource="@xml/watch_face"/> + android:resource="@drawable/preview_opengl"/> + android:resource="@drawable/preview_opengl_circular"/> + android:value="com.example.android.wearable.watchface.CONFIG_OPENGL"/> - + - + + android:permission="android.permission.BIND_WALLPAPER"> + android:resource="@xml/watch_face"/> + android:resource="@drawable/preview_card_bounds"/> + android:resource="@drawable/preview_card_bounds_circular"/> + android:value="com.example.android.wearable.watchface.CONFIG_CARD_BOUNDS"/> - + - + - + + @@ -171,47 +180,47 @@ + android:permission="android.permission.BIND_WALLPAPER"> + android:resource="@xml/watch_face"/> + android:resource="@drawable/preview_interactive"/> + android:resource="@drawable/preview_interactive_circular"/> - + - + + android:permission="android.permission.BIND_WALLPAPER"> + android:resource="@xml/watch_face"/> + android:resource="@drawable/preview_digital"/> + android:resource="@drawable/preview_digital_circular"/> + android:value="com.example.android.wearable.watchface.CONFIG_DIGITAL"/> + android:value="com.example.android.wearable.watchface.CONFIG_DIGITAL"/> - + - + @@ -223,95 +232,99 @@ + android:label="@string/digital_config_name"> - + - - + + + android:permission="android.permission.BIND_WALLPAPER"> + android:resource="@xml/watch_face"/> + android:resource="@drawable/preview_calendar"/> + android:resource="@drawable/preview_calendar_circular"/> - + - + - + - - + + + + android:permission="android.permission.BIND_WALLPAPER"> + android:resource="@xml/watch_face"/> + android:resource="@drawable/preview_distance"/> + android:resource="@drawable/preview_distance_circular"/> + android:value="com.example.android.wearable.watchface.CONFIG_FIT_DISTANCE"/> - + - + + android:permission="android.permission.BIND_WALLPAPER"> + android:resource="@xml/watch_face"/> + android:resource="@drawable/preview_fit"/> + android:resource="@drawable/preview_fit_circular"/> - + - + + android:label="@string/title_activity_calendar_watch_face_permission"> - + android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER"> @@ -322,19 +335,24 @@ + android:value="600"/> + + - + \ No newline at end of file diff --git a/samples/browseable/WatchFace/Wearable/src/com.example.android.wearable.watchface/ComplicationSimpleConfigActivity.java b/samples/browseable/WatchFace/Wearable/src/com.example.android.wearable.watchface/ComplicationSimpleConfigActivity.java index 66e208c2e..6d4e521a1 100644 --- a/samples/browseable/WatchFace/Wearable/src/com.example.android.wearable.watchface/ComplicationSimpleConfigActivity.java +++ b/samples/browseable/WatchFace/Wearable/src/com.example.android.wearable.watchface/ComplicationSimpleConfigActivity.java @@ -22,6 +22,8 @@ import android.content.Intent; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; import android.os.Bundle; +import android.support.wearable.complications.ComplicationHelperActivity; +import android.support.wearable.complications.ComplicationProviderInfo; import android.support.wearable.complications.ProviderChooserIntent; import android.support.wearable.view.WearableListView; import android.util.Log; @@ -64,6 +66,13 @@ public class ComplicationSimpleConfigActivity extends Activity implements protected void onActivityResult(int requestCode, int resultCode, Intent data) { if (requestCode == PROVIDER_CHOOSER_REQUEST_CODE && resultCode == RESULT_OK) { + + // Retrieves information for selected Complication provider. + ComplicationProviderInfo complicationProviderInfo = + data.getParcelableExtra(ProviderChooserIntent.EXTRA_PROVIDER_INFO); + + Log.d(TAG, "Selected Provider: " + complicationProviderInfo); + finish(); } } @@ -77,10 +86,16 @@ public class ComplicationSimpleConfigActivity extends Activity implements Integer tag = (Integer) viewHolder.itemView.getTag(); ComplicationItem complicationItem = mAdapter.getItem(tag); - startActivityForResult(ProviderChooserIntent.createProviderChooserIntent( - complicationItem.watchFace, - complicationItem.complicationId, - complicationItem.supportedTypes), PROVIDER_CHOOSER_REQUEST_CODE); + // Note: If you were previously using ProviderChooserIntent.createProviderChooserIntent() + // (now deprecated), you will want to switch to + // ComplicationHelperActivity.createProviderChooserHelperIntent() + startActivityForResult( + ComplicationHelperActivity.createProviderChooserHelperIntent( + getApplicationContext(), + complicationItem.watchFace, + complicationItem.complicationId, + complicationItem.supportedTypes), + PROVIDER_CHOOSER_REQUEST_CODE); } private List getComplicationItems() { @@ -187,5 +202,4 @@ public class ComplicationSimpleConfigActivity extends Activity implements return mItems.get(position); } } - } \ No newline at end of file diff --git a/samples/browseable/WatchFace/Wearable/src/com.example.android.wearable.watchface/ComplicationSimpleWatchFaceService.java b/samples/browseable/WatchFace/Wearable/src/com.example.android.wearable.watchface/ComplicationSimpleWatchFaceService.java index 9eca2c33b..4905293dd 100644 --- a/samples/browseable/WatchFace/Wearable/src/com.example.android.wearable.watchface/ComplicationSimpleWatchFaceService.java +++ b/samples/browseable/WatchFace/Wearable/src/com.example.android.wearable.watchface/ComplicationSimpleWatchFaceService.java @@ -18,6 +18,7 @@ package com.example.android.wearable.watchface; import android.app.PendingIntent; import android.content.BroadcastReceiver; +import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; @@ -35,6 +36,7 @@ import android.os.Handler; import android.os.Message; import android.support.v7.graphics.Palette; import android.support.wearable.complications.ComplicationData; +import android.support.wearable.complications.ComplicationHelperActivity; import android.support.wearable.complications.ComplicationText; import android.support.wearable.watchface.CanvasWatchFaceService; import android.support.wearable.watchface.WatchFaceService; @@ -362,16 +364,34 @@ public class ComplicationSimpleWatchFaceService extends CanvasWatchFaceService { if (Log.isLoggable(TAG, Log.DEBUG)) { Log.d(TAG, "onComplicationTap()"); } + ComplicationData complicationData = mActiveComplicationDataSparseArray.get(complicationId); - if ((complicationData != null) && (complicationData.getTapAction() != null)) { - try { - complicationData.getTapAction().send(); - } catch (PendingIntent.CanceledException e) { - Log.e(TAG, "On complication tap action error " + e); + if (complicationData != null) { + + if (complicationData.getTapAction() != null) { + try { + complicationData.getTapAction().send(); + } catch (PendingIntent.CanceledException e) { + Log.e(TAG, "On complication tap action error " + e); + } + + } else if (complicationData.getType() == ComplicationData.TYPE_NO_PERMISSION) { + + // Watch face does not have permission to receive complication data, so launch + // permission request. + ComponentName componentName = new ComponentName( + getApplicationContext(), + ComplicationSimpleWatchFaceService.class); + + Intent permissionRequestIntent = + ComplicationHelperActivity.createPermissionRequestHelperIntent( + getApplicationContext(), componentName); + + startActivity(permissionRequestIntent); } - invalidate(); + } else { if (Log.isLoggable(TAG, Log.DEBUG)) { Log.d(TAG, "No PendingIntent for complication " + complicationId + "."); @@ -551,50 +571,57 @@ public class ComplicationSimpleWatchFaceService extends CanvasWatchFaceService { complicationData = mActiveComplicationDataSparseArray.get(COMPLICATION_IDS[i]); if ((complicationData != null) - && (complicationData.isActive(currentTimeMillis)) - && (complicationData.getType() == ComplicationData.TYPE_SHORT_TEXT)) { + && (complicationData.isActive(currentTimeMillis))) { - ComplicationText mainText = complicationData.getShortText(); - ComplicationText subText = complicationData.getShortTitle(); + // Both Short Text and No Permission Types can be rendered with the same code. + // No Permission will display "--" with an Intent to launch a permission prompt. + // If you want to support more types, just add a "else if" below with your + // rendering code inside. + if (complicationData.getType() == ComplicationData.TYPE_SHORT_TEXT + || complicationData.getType() == ComplicationData.TYPE_NO_PERMISSION) { - CharSequence complicationMessage = - mainText.getText(getApplicationContext(), currentTimeMillis); + ComplicationText mainText = complicationData.getShortText(); + ComplicationText subText = complicationData.getShortTitle(); - /* In most cases you would want the subText (Title) under the mainText (Text), - * but to keep it simple for the code lab, we are concatenating them all on one - * line. - */ - if (subText != null) { - complicationMessage = TextUtils.concat( - complicationMessage, - " ", - subText.getText(getApplicationContext(), currentTimeMillis)); - } + CharSequence complicationMessage = + mainText.getText(getApplicationContext(), currentTimeMillis); - //Log.d(TAG, "Comp id: " + COMPLICATION_IDS[i] + "\t" + complicationMessage); - double textWidth = - mComplicationPaint.measureText( + /* In most cases you would want the subText (Title) under the + * mainText (Text), but to keep it simple for the code lab, we are + * concatenating them all on one line. + */ + if (subText != null) { + complicationMessage = TextUtils.concat( complicationMessage, - 0, - complicationMessage.length()); + " ", + subText.getText(getApplicationContext(), currentTimeMillis)); + } - int complicationsX; + //Log.d(TAG, "Com id: " + COMPLICATION_IDS[i] + "\t" + complicationMessage); + double textWidth = + mComplicationPaint.measureText( + complicationMessage, + 0, + complicationMessage.length()); - if (COMPLICATION_IDS[i] == LEFT_DIAL_COMPLICATION) { - complicationsX = (int) ((mWidth / 2) - textWidth) / 2; - } else { - // RIGHT_DIAL_COMPLICATION calculations - int offset = (int) ((mWidth / 2) - textWidth) / 2; - complicationsX = (mWidth / 2) + offset; + int complicationsX; + + if (COMPLICATION_IDS[i] == LEFT_DIAL_COMPLICATION) { + complicationsX = (int) ((mWidth / 2) - textWidth) / 2; + } else { + // RIGHT_DIAL_COMPLICATION calculations + int offset = (int) ((mWidth / 2) - textWidth) / 2; + complicationsX = (mWidth / 2) + offset; + } + + canvas.drawText( + complicationMessage, + 0, + complicationMessage.length(), + complicationsX, + mComplicationsY, + mComplicationPaint); } - - canvas.drawText( - complicationMessage, - 0, - complicationMessage.length(), - complicationsX, - mComplicationsY, - mComplicationPaint); } } } diff --git a/samples/browseable/WatchFace/Wearable/src/com.example.android.wearable.watchface/provider/RandomNumberProviderService.java b/samples/browseable/WatchFace/Wearable/src/com.example.android.wearable.watchface/provider/RandomNumberProviderService.java index 916f90fd9..17d03c272 100644 --- a/samples/browseable/WatchFace/Wearable/src/com.example.android.wearable.watchface/provider/RandomNumberProviderService.java +++ b/samples/browseable/WatchFace/Wearable/src/com.example.android.wearable.watchface/provider/RandomNumberProviderService.java @@ -1,5 +1,7 @@ package com.example.android.wearable.watchface.provider; +import android.app.PendingIntent; +import android.content.Intent; import android.support.wearable.complications.ComplicationData; import android.support.wearable.complications.ComplicationManager; import android.support.wearable.complications.ComplicationProviderService; @@ -42,7 +44,7 @@ public class RandomNumberProviderService extends ComplicationProviderService { @Override public void onComplicationUpdate( int complicationId, int dataType, ComplicationManager complicationManager) { - Log.d(TAG, "onComplicationUpdate()"); + Log.d(TAG, "onComplicationUpdate() id: " + complicationId); // Retrieve your data, in this case, we simply create a random number to display. @@ -51,6 +53,24 @@ public class RandomNumberProviderService extends ComplicationProviderService { String randomNumberText = String.format(Locale.getDefault(), "%d!", randomNumber); + // Create Tap Action so that the user can trigger an update by tapping the complication. + Intent updateIntent = + new Intent(getApplicationContext(), UpdateComplicationDataService.class); + updateIntent.setAction(UpdateComplicationDataService.ACTION_UPDATE_COMPLICATION); + // We pass the complication id, so we can only update the specific complication tapped. + updateIntent.putExtra(UpdateComplicationDataService.EXTRA_COMPLICATION_ID, complicationId); + + PendingIntent pendingIntent = PendingIntent.getService( + getApplicationContext(), + // Set the requestCode to the complication id. This ensures the system doesn't + // combine other PendingIntents with the same context with this one (basically it + // would then reuse the Extra you set in the initial PendingIntent). If you don't + // do this and multiple complications with your data are active, every PendingIntent + // assigned for tap, would use the same complication id (first one created). + complicationId, + updateIntent, + 0); + ComplicationData complicationData = null; switch (dataType) { @@ -60,17 +80,20 @@ public class RandomNumberProviderService extends ComplicationProviderService { .setMinValue(0) .setMaxValue(10) .setShortText(ComplicationText.plainText(randomNumberText)) + .setTapAction(pendingIntent) .build(); break; case ComplicationData.TYPE_SHORT_TEXT: complicationData = new ComplicationData.Builder(ComplicationData.TYPE_SHORT_TEXT) .setShortText(ComplicationText.plainText(randomNumberText)) + .setTapAction(pendingIntent) .build(); break; case ComplicationData.TYPE_LONG_TEXT: complicationData = new ComplicationData.Builder(ComplicationData.TYPE_LONG_TEXT) .setLongText( ComplicationText.plainText("Random Number: " + randomNumberText)) + .setTapAction(pendingIntent) .build(); break; default: diff --git a/samples/browseable/WatchFace/Wearable/src/com.example.android.wearable.watchface/provider/UpdateComplicationDataService.java b/samples/browseable/WatchFace/Wearable/src/com.example.android.wearable.watchface/provider/UpdateComplicationDataService.java new file mode 100644 index 000000000..203e491c2 --- /dev/null +++ b/samples/browseable/WatchFace/Wearable/src/com.example.android.wearable.watchface/provider/UpdateComplicationDataService.java @@ -0,0 +1,63 @@ +package com.example.android.wearable.watchface.provider; + +import android.app.IntentService; +import android.content.ComponentName; +import android.content.Intent; +import android.support.wearable.complications.ProviderUpdateRequester; +import android.util.Log; + +/** + * Simple {@link IntentService} subclass for asynchronously requesting an update for the random + * number complication (triggered via TapAction on complication). + */ +public class UpdateComplicationDataService extends IntentService { + + private static final String TAG = "UpdateCompService"; + + public static final String ACTION_UPDATE_COMPLICATION = + "com.example.android.wearable.watchface.provider.action.UPDATE_COMPLICATION"; + + public static final String EXTRA_COMPLICATION_ID = + "com.example.android.wearable.watchface.provider.action.COMPLICATION_ID"; + + public UpdateComplicationDataService() { + super("UpdateComplicationDataService"); + } + + @Override + protected void onHandleIntent(Intent intent) { + + if (intent != null) { + + final String action = intent.getAction(); + + if (ACTION_UPDATE_COMPLICATION.equals(action)) { + + int complicationId = intent.getIntExtra(EXTRA_COMPLICATION_ID, -1); + handleActionUpdateComplicationData(complicationId); + } + } + } + + /** + * Handle action UpdateComplicationData in the provided background thread with the provided + * parameters. + */ + private void handleActionUpdateComplicationData(int complicationId) { + + Log.d(TAG, "Complication id to update via service: " + complicationId); + + ComponentName componentName = + new ComponentName(getApplicationContext(), RandomNumberProviderService.class); + + ProviderUpdateRequester providerUpdateRequester = + new ProviderUpdateRequester(getApplicationContext(), componentName); + + if (complicationId > 0) { + // This method only updates the specific complication tapped on the watch, if you + // wanted to update all active complications associated with your data, you would + // call providerUpdateRequester.requestUpdateAll(). + providerUpdateRequester.requestUpdate(complicationId); + } + } +} \ No newline at end of file diff --git a/samples/browseable/WearDrawers/AndroidManifest.xml b/samples/browseable/WearDrawers/AndroidManifest.xml index 3044d1906..eaf9dbdbf 100644 --- a/samples/browseable/WearDrawers/AndroidManifest.xml +++ b/samples/browseable/WearDrawers/AndroidManifest.xml @@ -21,7 +21,6 @@ android:label="@string/app_name"> - diff --git a/samples/browseable/WearNotifications/Application/AndroidManifest.xml b/samples/browseable/WearNotifications/Application/AndroidManifest.xml new file mode 100644 index 000000000..20c44cc12 --- /dev/null +++ b/samples/browseable/WearNotifications/Application/AndroidManifest.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/browseable/WearNotifications/Application/res/drawable-hdpi/earth.png b/samples/browseable/WearNotifications/Application/res/drawable-hdpi/earth.png new file mode 100644 index 000000000..13abd77a5 Binary files /dev/null and b/samples/browseable/WearNotifications/Application/res/drawable-hdpi/earth.png differ diff --git a/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_alarm_white_48dp.png b/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_alarm_white_48dp.png new file mode 100644 index 000000000..75e5a46ee Binary files /dev/null and b/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_alarm_white_48dp.png differ diff --git a/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_cancel_white_48dp.png b/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_cancel_white_48dp.png new file mode 100644 index 000000000..dc32a14f9 Binary files /dev/null and b/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_cancel_white_48dp.png differ diff --git a/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_launcher.png b/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_launcher.png new file mode 100644 index 000000000..0ed1b5fbf Binary files /dev/null and b/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_launcher.png differ diff --git a/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_message_black_18dp.png b/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_message_black_18dp.png new file mode 100644 index 000000000..d921ba2da Binary files /dev/null and b/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_message_black_18dp.png differ diff --git a/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_person_black_48dp.png b/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_person_black_48dp.png new file mode 100644 index 000000000..f1e148490 Binary files /dev/null and b/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_person_black_48dp.png differ diff --git a/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_reply_white_18dp.png b/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_reply_white_18dp.png new file mode 100644 index 000000000..cc732baab Binary files /dev/null and b/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_reply_white_18dp.png differ diff --git a/samples/browseable/WearNotifications/Application/res/drawable-hdpi/tile.9.png b/samples/browseable/WearNotifications/Application/res/drawable-hdpi/tile.9.png new file mode 100644 index 000000000..135862883 Binary files /dev/null and b/samples/browseable/WearNotifications/Application/res/drawable-hdpi/tile.9.png differ diff --git a/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_alarm_white_48dp.png b/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_alarm_white_48dp.png new file mode 100644 index 000000000..280e09df3 Binary files /dev/null and b/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_alarm_white_48dp.png differ diff --git a/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_cancel_white_48dp.png b/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_cancel_white_48dp.png new file mode 100644 index 000000000..6ebbc8316 Binary files /dev/null and b/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_cancel_white_48dp.png differ diff --git a/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_launcher.png b/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_launcher.png new file mode 100644 index 000000000..2b6948acb Binary files /dev/null and b/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_launcher.png differ diff --git a/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_message_black_18dp.png b/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_message_black_18dp.png new file mode 100644 index 000000000..2156f1673 Binary files /dev/null and b/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_message_black_18dp.png differ diff --git a/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_person_black_48dp.png b/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_person_black_48dp.png new file mode 100644 index 000000000..360a32f27 Binary files /dev/null and b/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_person_black_48dp.png differ diff --git a/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_reply_white_18dp.png b/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_reply_white_18dp.png new file mode 100644 index 000000000..b336e2f4d Binary files /dev/null and b/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_reply_white_18dp.png differ diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_alarm_white_48dp.png b/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_alarm_white_48dp.png new file mode 100644 index 000000000..aa8102fd2 Binary files /dev/null and b/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_alarm_white_48dp.png differ diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_cancel_white_48dp.png b/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_cancel_white_48dp.png new file mode 100644 index 000000000..dc775b243 Binary files /dev/null and b/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_cancel_white_48dp.png differ diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_launcher.png b/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_launcher.png new file mode 100644 index 000000000..d9b134890 Binary files /dev/null and b/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_launcher.png differ diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_message_black_18dp.png b/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_message_black_18dp.png new file mode 100644 index 000000000..185d6136e Binary files /dev/null and b/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_message_black_18dp.png differ diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_person_black_48dp.png b/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_person_black_48dp.png new file mode 100644 index 000000000..1ebc37be1 Binary files /dev/null and b/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_person_black_48dp.png differ diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_reply_white_18dp.png b/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_reply_white_18dp.png new file mode 100644 index 000000000..0424c2bd6 Binary files /dev/null and b/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_reply_white_18dp.png differ diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_alarm_white_48dp.png b/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_alarm_white_48dp.png new file mode 100644 index 000000000..f665286f8 Binary files /dev/null and b/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_alarm_white_48dp.png differ diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_cancel_white_48dp.png b/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_cancel_white_48dp.png new file mode 100644 index 000000000..cf2822a07 Binary files /dev/null and b/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_cancel_white_48dp.png differ diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_launcher.png b/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..cb4f56f26 Binary files /dev/null and b/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_launcher.png differ diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_message_black_18dp.png b/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_message_black_18dp.png new file mode 100644 index 000000000..e710deeb5 Binary files /dev/null and b/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_message_black_18dp.png differ diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_person_black_48dp.png b/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_person_black_48dp.png new file mode 100644 index 000000000..77e3a1816 Binary files /dev/null and b/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_person_black_48dp.png differ diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_reply_white_18dp.png b/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_reply_white_18dp.png new file mode 100644 index 000000000..eeb5d4977 Binary files /dev/null and b/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_reply_white_18dp.png differ diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_alarm_white_48dp.png b/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_alarm_white_48dp.png new file mode 100644 index 000000000..419f4bb4f Binary files /dev/null and b/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_alarm_white_48dp.png differ diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_cancel_white_48dp.png b/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_cancel_white_48dp.png new file mode 100644 index 000000000..8bea844cd Binary files /dev/null and b/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_cancel_white_48dp.png differ diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_launcher.png b/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..77c9929cb Binary files /dev/null and b/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_launcher.png differ diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_message_black_18dp.png b/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_message_black_18dp.png new file mode 100644 index 000000000..5456c42f4 Binary files /dev/null and b/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_message_black_18dp.png differ diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_person_black_48dp.png b/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_person_black_48dp.png new file mode 100644 index 000000000..6be3e3063 Binary files /dev/null and b/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_person_black_48dp.png differ diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_reply_white_18dp.png b/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_reply_white_18dp.png new file mode 100644 index 000000000..de0dad204 Binary files /dev/null and b/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_reply_white_18dp.png differ diff --git a/samples/browseable/WearNotifications/Application/res/layout/activity_big_picture_main.xml b/samples/browseable/WearNotifications/Application/res/layout/activity_big_picture_main.xml new file mode 100644 index 000000000..e86c462f5 --- /dev/null +++ b/samples/browseable/WearNotifications/Application/res/layout/activity_big_picture_main.xml @@ -0,0 +1,37 @@ + + + + + + diff --git a/samples/browseable/WearNotifications/Application/res/layout/activity_big_text_main.xml b/samples/browseable/WearNotifications/Application/res/layout/activity_big_text_main.xml new file mode 100644 index 000000000..5b37603bd --- /dev/null +++ b/samples/browseable/WearNotifications/Application/res/layout/activity_big_text_main.xml @@ -0,0 +1,38 @@ + + + + + + + diff --git a/samples/browseable/WearNotifications/Application/res/layout/activity_inbox_main.xml b/samples/browseable/WearNotifications/Application/res/layout/activity_inbox_main.xml new file mode 100644 index 000000000..0377b4ae8 --- /dev/null +++ b/samples/browseable/WearNotifications/Application/res/layout/activity_inbox_main.xml @@ -0,0 +1,38 @@ + + + + + + + diff --git a/samples/browseable/WearNotifications/Application/res/layout/activity_main.xml b/samples/browseable/WearNotifications/Application/res/layout/activity_main.xml new file mode 100644 index 000000000..c18e102b2 --- /dev/null +++ b/samples/browseable/WearNotifications/Application/res/layout/activity_main.xml @@ -0,0 +1,62 @@ + + + + + + + + + + +