diff options
author | Adrian Roos <roosa@google.com> | 2017-05-05 20:16:08 +0000 |
---|---|---|
committer | Adrian Roos <roosa@google.com> | 2017-05-05 20:16:08 +0000 |
commit | 721bd0da688cd552737fbb753a00597f95103b95 (patch) | |
tree | 36da88c2d4365be7ee0a4dd0c732b9399d1c55ad /src/com/android/tv/ui/sidepanel/DeveloperOptionFragment.java | |
parent | 3dfa929b24f38ac7836450176d88ceab41dc6ac5 (diff) | |
download | TV-721bd0da688cd552737fbb753a00597f95103b95.tar.gz |
Revert "Sync to ub-tv-dev at f0024d79653da8c8999a91f995431a645a6ff4a2"
This reverts commit 3dfa929b24f38ac7836450176d88ceab41dc6ac5.
Change-Id: I1c76f626d966b8d4793a19677a8840ed0424d3a7
Diffstat (limited to 'src/com/android/tv/ui/sidepanel/DeveloperOptionFragment.java')
-rw-r--r-- | src/com/android/tv/ui/sidepanel/DeveloperOptionFragment.java | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/src/com/android/tv/ui/sidepanel/DeveloperOptionFragment.java b/src/com/android/tv/ui/sidepanel/DeveloperOptionFragment.java index fac24696..0d189cca 100644 --- a/src/com/android/tv/ui/sidepanel/DeveloperOptionFragment.java +++ b/src/com/android/tv/ui/sidepanel/DeveloperOptionFragment.java @@ -18,6 +18,8 @@ package com.android.tv.ui.sidepanel; import android.accounts.Account; import android.app.Activity; +import android.app.ApplicationErrorReport; +import android.content.Intent; import android.support.annotation.NonNull; import android.util.Log; import android.widget.Toast; @@ -25,7 +27,6 @@ import android.widget.Toast; import com.android.tv.R; import com.android.tv.TvApplication; import com.android.tv.common.BuildConfig; -import com.android.tv.common.feature.CommonFeatures; import com.android.tv.data.epg.EpgFetcher; import com.android.tv.experiments.Experiments; import com.android.tv.tuner.TunerPreferences; @@ -53,14 +54,6 @@ public class DeveloperOptionFragment extends SideFragment { @Override protected List<Item> getItemList() { List<Item> items = new ArrayList<>(); - if (CommonFeatures.DVR.isEnabled(getContext())) { - items.add(new ActionItem(getString(R.string.dev_item_dvr_history)) { - @Override - protected void onSelected() { - getMainActivity().getOverlayManager().showDvrHistoryDialog(); - } - }); - } if (BuildConfig.ENG) { items.add(new ActionItem(getString(R.string.dev_item_watch_history)) { @Override @@ -69,6 +62,18 @@ public class DeveloperOptionFragment extends SideFragment { } }); } + items.add(new ActionItem(getString(R.string.dev_item_send_feedback)) { + @Override + protected void onSelected() { + Intent intent = new Intent(Intent.ACTION_APP_ERROR); + ApplicationErrorReport report = new ApplicationErrorReport(); + report.packageName = report.processName = getContext().getPackageName(); + report.time = System.currentTimeMillis(); + report.type = ApplicationErrorReport.TYPE_NONE; + intent.putExtra(Intent.EXTRA_BUG_REPORT, report); + startActivityForResult(intent, 0); + } + }); items.add(new SwitchItem(getString(R.string.dev_item_store_ts_on), getString(R.string.dev_item_store_ts_off), getString(R.string.dev_item_store_ts_description)) { |