Introduce SelectDebugAppPreferenceController
- Create new SelectDebugAppPreferenceController - Update onActivityResult to loop through all controllers - Add new activity request code - Create controller inside the DashboardFragment - Port logic from DevelopmentSettings into the controller Bug: 34203528 Test: make RunSettingsRoboTests -j40 Change-Id: I90b1da2d536389e45d717adffb3b190ec13b9a2a
This commit is contained in:
@@ -122,15 +122,19 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
|
||||
|
||||
@Override
|
||||
public void onActivityResult(int requestCode, int resultCode, Intent data) {
|
||||
boolean handledResult = false;
|
||||
for (AbstractPreferenceController controller : mPreferenceControllers) {
|
||||
if (controller instanceof DeveloperOptionsPreferenceController) {
|
||||
if (((DeveloperOptionsPreferenceController) controller).onActivityResult(
|
||||
requestCode, resultCode, data)) {
|
||||
return;
|
||||
}
|
||||
// We do not break early because it is possible for multiple controllers to
|
||||
// handle the same result code.
|
||||
handledResult |=
|
||||
((DeveloperOptionsPreferenceController) controller).onActivityResult(
|
||||
requestCode, resultCode, data);
|
||||
}
|
||||
}
|
||||
super.onActivityResult(requestCode, resultCode, data);
|
||||
if (!handledResult) {
|
||||
super.onActivityResult(requestCode, resultCode, data);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -193,8 +197,8 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
|
||||
// bug report shortcut
|
||||
// select mock location app
|
||||
controllers.add(new DebugViewAttributesPreferenceController(context));
|
||||
// select debug app
|
||||
// wait for debugger
|
||||
controllers.add(new SelectDebugAppPreferenceController(context, fragment));
|
||||
//controllers.add(new WaitForDebuggerPreferenceController(context));
|
||||
// verify apps over usb
|
||||
// logger buffer sizes
|
||||
// store logger data persistently on device
|
||||
|
Reference in New Issue
Block a user