diff options
author | sergeyv <sergeyv@google.com> | 2017-10-17 23:20:26 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-10-17 23:20:26 +0000 |
commit | 7c7d8e914780e2dd7eb40a22d90e8432b4bb5740 (patch) | |
tree | dd3e67b690fbfa2866281214332a4efdc8061a70 | |
parent | 31e64acd1e65045471124267a06241eff1f55d26 (diff) | |
parent | ae9934f69312efed4f49cf6433be2a2511cb57de (diff) | |
download | glide-7c7d8e914780e2dd7eb40a22d90e8432b4bb5740.tar.gz |
Rename getLifecycle into getGlideLifecycle.
am: ae9934f693
Change-Id: If123605a03be4bcac9bd240554256b83339361ff
3 files changed, 4 insertions, 4 deletions
diff --git a/library/src/main/java/com/bumptech/glide/manager/RequestManagerFragment.java b/library/src/main/java/com/bumptech/glide/manager/RequestManagerFragment.java index 47d93afd..41dee4b7 100644 --- a/library/src/main/java/com/bumptech/glide/manager/RequestManagerFragment.java +++ b/library/src/main/java/com/bumptech/glide/manager/RequestManagerFragment.java @@ -40,7 +40,7 @@ public class RequestManagerFragment extends Fragment { this.requestManager = requestManager; } - ActivityFragmentLifecycle getLifecycle() { + ActivityFragmentLifecycle getGlideLifecycle() { return lifecycle; } diff --git a/library/src/main/java/com/bumptech/glide/manager/RequestManagerRetriever.java b/library/src/main/java/com/bumptech/glide/manager/RequestManagerRetriever.java index b0b80fa5..4e98c5f8 100644 --- a/library/src/main/java/com/bumptech/glide/manager/RequestManagerRetriever.java +++ b/library/src/main/java/com/bumptech/glide/manager/RequestManagerRetriever.java @@ -172,7 +172,7 @@ public class RequestManagerRetriever implements Handler.Callback { } RequestManager requestManager = current.getRequestManager(); if (requestManager == null) { - requestManager = new RequestManager(context, current.getLifecycle()); + requestManager = new RequestManager(context, current.getGlideLifecycle()); current.setRequestManager(requestManager); } return requestManager; @@ -192,7 +192,7 @@ public class RequestManagerRetriever implements Handler.Callback { } RequestManager requestManager = current.getRequestManager(); if (requestManager == null) { - requestManager = new RequestManager(context, current.getLifecycle()); + requestManager = new RequestManager(context, current.getGlideLifecycle()); current.setRequestManager(requestManager); } return requestManager; diff --git a/library/src/main/java/com/bumptech/glide/manager/SupportRequestManagerFragment.java b/library/src/main/java/com/bumptech/glide/manager/SupportRequestManagerFragment.java index b5e73b6d..64846c0a 100644 --- a/library/src/main/java/com/bumptech/glide/manager/SupportRequestManagerFragment.java +++ b/library/src/main/java/com/bumptech/glide/manager/SupportRequestManagerFragment.java @@ -37,7 +37,7 @@ public class SupportRequestManagerFragment extends Fragment { this.requestManager = requestManager; } - ActivityFragmentLifecycle getLifecycle() { + ActivityFragmentLifecycle getGlideLifecycle() { return lifecycle; } |