Jason Monk 84f544a2ae resolve merge conflicts of 167f6cc to nyc-mr1-dev-plus-aosp ...

Change-Id: Ida721b92e461811fdca7bc556de0f56cb348fcbc

2016-06-08 15:28:48 -04:00

..

ImeiInformation.java

Remove PreferenceActivity

2016-06-08 09:48:58 -04:00

MigrateEstimateTask.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

PercentageBarChart.java

Iteration on multi-user storage UI.

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

PrivateVolumeForget.java

port settings over to new metrics enum

2016-01-27 10:58:58 -05:00

PrivateVolumeFormat.java

port settings over to new metrics enum

2016-01-27 10:58:58 -05:00

PrivateVolumeSettings.java

Display total storage for Internal shared storage.

2016-06-08 14:49:32 +00:00

PrivateVolumeUnmount.java

Fix unmount up button

2016-05-11 13:53:13 -04:00

PublicVolumeSettings.java

port settings over to new metrics enum

2016-01-27 10:58:58 -05:00

SimStatus.java

Merge \"Remove PreferenceActivity\" into nyc-dev

2016-06-08 19:15:42 +00:00

Status.java

Remove PreferenceActivity

2016-06-08 09:48:58 -04:00

StorageItemPreference.java

Avoid division by zero in storage.

2016-02-18 15:43:54 -07:00

StorageSettings.java

Display total storage for Internal shared storage.

2016-06-08 14:49:32 +00:00

StorageSummaryPreference.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

StorageUnmountReceiver.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

StorageVolumePreference.java

Display total storage for Internal shared storage.

2016-06-08 14:49:32 +00:00

StorageWizardBase.java

Remove top padding only if illustration is present

2016-04-29 15:07:40 -07:00

StorageWizardFormatConfirm.java

Use 'setup' header illust before selecting storage type.

2015-07-02 15:38:39 +09:00

StorageWizardFormatProgress.java

am bfee8b48: am 31e2ce0e: am d36edb9f: am de005547: Merge "Bail if activity was destroyed." into mnc-dr-dev

2015-10-16 16:33:53 +00:00

StorageWizardInit.java

am 29936b07: am 5ea94a9c: am b91da24d: am 402c866c: am c1bef743: Prevent monkey from changing adoptable storage settings

2015-07-24 04:50:00 +00:00

StorageWizardMigrate.java

Use 'setup' header illust before selecting storage type.

2015-07-02 15:38:39 +09:00

StorageWizardMigrateConfirm.java

Read disk ID from intent

2016-04-29 16:35:28 -07:00

StorageWizardMigrateProgress.java

Handling of issues while migrating primary storage

2016-04-28 14:44:53 -07:00

StorageWizardMoveConfirm.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

StorageWizardMoveProgress.java

[Settings] Don't allow apps on external storage to be active admin

2016-02-17 14:18:02 -08:00

StorageWizardReady.java

Use 'setup' header illust before selecting storage type.

2015-07-02 15:38:39 +09:00

UsbBackend.java

Part3 - Don't add padlock if the restriction is not set by admin.

2016-02-16 11:04:11 +00:00

UsbModeChooserActivity.java

Don't close USB type notification when USB is connected to USB devices.

2016-03-22 11:04:29 +09:00