Jason Monk 9824c5da1e resolved conflicts for merge of 1adca55f to mnc-dr-dev ...

Change-Id: Iac88fbc39bbfb7aaa730652794b4aa73618c1d9c

2015-08-04 16:23:32 -04:00

..

ImeiInformation.java

Correct the way settings deals with subscriptions.

2015-04-08 11:11:34 -07:00

MigrateEstimateTask.java

Handle missing migration source volume.

2015-07-05 14:25:44 -07:00

PercentageBarChart.java

Iteration on multi-user storage UI.

2012-09-07 13:23:55 -07:00

PrivateVolumeForget.java

Make sure Fragments are public for FragMan to instantiate

2015-06-25 17:01:54 -07:00

PrivateVolumeFormat.java

Returning to wizard, enable migration.

2015-04-29 17:24:12 -07:00

PrivateVolumeSettings.java

Refresh after clearing, tweak warn threshold.

2015-07-30 11:51:47 -07:00

PrivateVolumeUnmount.java

Format as public/private; follow refactoring.

2015-04-28 21:54:54 -07:00

PublicVolumeSettings.java

Prevent monkey from changing adoptable storage settings

2015-07-23 10:57:59 -07:00

SimStatus.java

Merge "Use common xml file for multi-tab settings." into mnc-dev

2015-07-16 05:01:27 +00:00

Status.java

Use CONNECTIVITY_ACTION instead _IMMEDIATE

2015-04-20 13:33:31 +09:00

StorageItemPreference.java

Making Settings > Storage multiprofile aware

2015-07-07 20:33:30 +01:00

StorageSettings.java

Make sure Fragments are public for FragMan to instantiate

2015-06-25 17:01:54 -07:00

StorageSummaryPreference.java

Fix some ordering, colors, and accessibility bugs.

2015-07-05 22:10:13 -07:00

StorageUnmountReceiver.java

Follow storage refactoring in system.

2015-04-14 16:46:28 -07:00

StorageVolumePreference.java

Fix some ordering, colors, and accessibility bugs.

2015-07-05 22:10:13 -07:00

StorageWizardBase.java

Refresh after clearing, tweak warn threshold.

2015-07-30 11:51:47 -07:00

StorageWizardFormatConfirm.java

Finish storage wizard theming.

2015-06-16 15:28:49 -07:00

StorageWizardFormatProgress.java

Refresh after clearing, tweak warn threshold.

2015-07-30 11:51:47 -07:00

StorageWizardInit.java

Prevent monkey from changing adoptable storage settings

2015-07-23 10:57:59 -07:00

StorageWizardMigrate.java

Finish storage wizard theming.

2015-06-16 15:28:49 -07:00

StorageWizardMigrateConfirm.java

Handle missing migration source volume.

2015-07-05 14:25:44 -07:00

StorageWizardMigrateProgress.java

Finish storage wizard theming.

2015-06-16 15:28:49 -07:00

StorageWizardMoveConfirm.java

Don't crash on NameNotFoundException

2015-06-17 10:22:28 -07:00

StorageWizardMoveProgress.java

Finish storage wizard theming.

2015-06-16 15:28:49 -07:00

StorageWizardReady.java

Finish storage wizard theming.

2015-06-16 15:28:49 -07:00

UsbBackend.java

resolved conflicts for merge of 1adca55f to mnc-dr-dev

2015-08-04 16:23:32 -04:00

UsbModeChooserActivity.java

resolved conflicts for merge of 1adca55f to mnc-dr-dev

2015-08-04 16:23:32 -04:00