Sanket Padawe 1aa65f3b92 Fix build failure. ...

+ Merge commit 'a049c988e75a0bb496b587ade60930c4d40e4aaf' into
manual_merge_a049c98

Test: Fixing merge conflict
Change-Id: I4eebc1352ec7274811118a71f8cf97c864771145

2016-10-17 11:39:03 -07:00

..

AppDataUsage.java

Log visibility change for all fragments.

2016-08-18 14:04:13 -07:00

AppDataUsageActivity.java

Added title for stand-alone App Data Usage activitiy.

2016-05-09 10:34:39 -07:00

AppDataUsagePreference.java

…

AppStateDataUsageBridge.java

Handle blacklisted apps on Data Saver whitelist.

2016-04-18 13:14:01 -07:00

BillingCyclePreference.java

Fix data usage multi-sim stuff

2016-02-22 15:13:05 -05:00

BillingCycleSettings.java

Fix cancel button behavior when setting data limit.

2016-09-27 13:11:46 -07:00

CellDataPreference.java

Fix build failure.

2016-10-17 11:39:03 -07:00

ChartDataUsagePreference.java

Fix data usage

2016-03-15 11:36:06 -04:00

CycleAdapter.java

Add data saver to settings

2016-01-25 15:24:29 -05:00

DataSaverBackend.java

Use MetricsFeatureProvider for logging in Settings.

2016-09-23 08:37:37 -07:00

DataSaverPreference.java

Listen to INetworkPolicyManager events and update UI accordingly.

2016-04-20 09:17:14 -07:00

DataSaverSummary.java

Log visibility change for all fragments.

2016-08-18 14:04:13 -07:00

DataUsageBase.java

…

DataUsageEditController.java

Data Usage summary creates a dialog to change data warning level

2016-09-13 12:56:45 -07:00

DataUsageInfoController.java

Prevent Data Usage Settings crash on phones without cellular history

2016-09-13 22:59:53 +00:00

DataUsageList.java

Log visibility change for all fragments.

2016-08-18 14:04:13 -07:00

DataUsageMeteredSettings.java

Log visibility change for all fragments.

2016-08-18 14:04:13 -07:00

DataUsagePreference.java

…

DataUsageSummary.java

resolve merge conflicts of 0ee60c0 to master

2016-09-14 14:14:14 -07:00

NetworkRestrictionsPreference.java

…

SpinnerPreference.java

Add data saver to settings

2016-01-25 15:24:29 -05:00

TemplatePreference.java

…

TemplatePreferenceCategory.java

Add moar dividers

2016-04-04 13:20:59 -04:00

UnrestrictedDataAccess.java

Fix crash when changing data restriction for non-app UID.

2016-09-23 15:14:18 -07:00