Merge "Move Help & feedback to Nav drawer." into ub-mail-master
This commit is contained in:
commit
2c74c0efae
|
@ -340,6 +340,16 @@
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
|
<activity
|
||||||
|
android:name="com.android.mail.ui.HelpActivity"
|
||||||
|
android:label="@string/help_and_info">
|
||||||
|
</activity>
|
||||||
|
|
||||||
|
<activity
|
||||||
|
android:name="com.android.mail.ui.LicensesActivity"
|
||||||
|
android:label="@string/open_source_licenses">
|
||||||
|
</activity>
|
||||||
|
|
||||||
<!-- additional activities -->
|
<!-- additional activities -->
|
||||||
|
|
||||||
<provider
|
<provider
|
||||||
|
|
|
@ -49,7 +49,6 @@ import com.android.emailcommon.utility.IntentUtilities;
|
||||||
import com.android.emailcommon.utility.Utility;
|
import com.android.emailcommon.utility.Utility;
|
||||||
import com.android.mail.providers.Folder;
|
import com.android.mail.providers.Folder;
|
||||||
import com.android.mail.providers.UIProvider.EditSettingsExtras;
|
import com.android.mail.providers.UIProvider.EditSettingsExtras;
|
||||||
import com.android.mail.ui.FeedbackEnabledActivity;
|
|
||||||
import com.android.mail.utils.LogUtils;
|
import com.android.mail.utils.LogUtils;
|
||||||
import com.android.mail.utils.Utils;
|
import com.android.mail.utils.Utils;
|
||||||
|
|
||||||
|
@ -70,7 +69,7 @@ import java.util.List;
|
||||||
* sense to use a loader for the accounts list, because it would provide better support for
|
* sense to use a loader for the accounts list, because it would provide better support for
|
||||||
* dealing with accounts being added/deleted and triggering the header reload.
|
* dealing with accounts being added/deleted and triggering the header reload.
|
||||||
*/
|
*/
|
||||||
public class AccountSettings extends PreferenceActivity implements FeedbackEnabledActivity,
|
public class AccountSettings extends PreferenceActivity implements
|
||||||
SetupDataFragment.SetupDataContainer, SecurityRequiredDialogFragment.Callback,
|
SetupDataFragment.SetupDataContainer, SecurityRequiredDialogFragment.Callback,
|
||||||
CheckSettingsErrorDialogFragment.Callback, AccountCheckSettingsFragment.Callback,
|
CheckSettingsErrorDialogFragment.Callback, AccountCheckSettingsFragment.Callback,
|
||||||
AccountServerBaseFragment.Callback {
|
AccountServerBaseFragment.Callback {
|
||||||
|
@ -988,11 +987,6 @@ public class AccountSettings extends PreferenceActivity implements FeedbackEnabl
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public Context getActivityContext() {
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public SetupDataFragment getSetupData() {
|
public SetupDataFragment getSetupData() {
|
||||||
return mSetupData;
|
return mSetupData;
|
||||||
|
|
|
@ -2515,6 +2515,14 @@ public class EmailProvider extends ContentProvider {
|
||||||
"'" + feedbackUri + "'");
|
"'" + feedbackUri + "'");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
final String helpUri = context.getString(R.string.help_uri);
|
||||||
|
if (!TextUtils.isEmpty(helpUri)) {
|
||||||
|
// This string needs to be in single quotes, as it will be used as a constant
|
||||||
|
// in a sql expression
|
||||||
|
builder.add(UIProvider.AccountColumns.HELP_INTENT_URI,
|
||||||
|
"'" + helpUri + "'");
|
||||||
|
}
|
||||||
|
|
||||||
sAccountListMap = builder.build();
|
sAccountListMap = builder.build();
|
||||||
}
|
}
|
||||||
return sAccountListMap;
|
return sAccountListMap;
|
||||||
|
@ -3102,6 +3110,12 @@ public class EmailProvider extends ContentProvider {
|
||||||
if (res.getBoolean(R.bool.feedback_supported)) {
|
if (res.getBoolean(R.bool.feedback_supported)) {
|
||||||
capabilities |= UIProvider.AccountCapabilities.SEND_FEEDBACK;
|
capabilities |= UIProvider.AccountCapabilities.SEND_FEEDBACK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// If we can find a help URL then add the Help capability
|
||||||
|
if (!TextUtils.isEmpty(context.getResources().getString(R.string.help_uri))) {
|
||||||
|
capabilities |= UIProvider.AccountCapabilities.HELP_CONTENT;
|
||||||
|
}
|
||||||
|
|
||||||
// TODO: Should this be stored per-account, or some other mechanism?
|
// TODO: Should this be stored per-account, or some other mechanism?
|
||||||
capabilities |= UIProvider.AccountCapabilities.NESTED_FOLDERS;
|
capabilities |= UIProvider.AccountCapabilities.NESTED_FOLDERS;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue