Robin Lee 27ae2bb1fe resolve merge conflicts of 86c72f7ea5 to oc-dev-plus-aosp ...

Test: make RunSettingsRoboTests -j
Change-Id: If6b87d1caa358335ce56201eab0ed8add8b339e9

2017-03-29 13:54:02 +01:00

..

AppDataUsage.java

resolve merge conflicts of 86c72f7ea5 to oc-dev-plus-aosp

2017-03-29 13:54:02 +01: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

Listen to mobile data enabled flag change.

2017-03-16 15:08:49 -07:00

BillingCycleSettings.java

Use consistent formatter to convert byte->MB->GB.

2017-01-24 11:50:27 -08:00

CellDataPreference.java

DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"

2017-01-18 19:28:11 +00:00

ChartDataUsagePreference.java

Switch references to colorError

2017-02-24 14:57:31 -05:00

CycleAdapter.java

…

DataSaverBackend.java

DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"

2017-01-18 19:28:11 +00:00

DataSaverPreference.java

Listen to INetworkPolicyManager events and update UI accordingly.

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

DataSaverSummary.java

DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"

2017-01-18 19:28:11 +00: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

Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'.

2017-03-21 22:31:58 +00:00

DataUsageMeteredSettings.java

Merge commit '11324dcedfd9d4cccba0b1e493c44fe80bb05da4' into manual_merge_11324dcedf

2017-03-12 17:22:21 -06:00

DataUsagePreference.java

Log source with visibility change

2017-02-15 17:17:19 -08:00

DataUsageSummary.java

Update preference text for Network & internet screen.

2017-03-21 18:00:59 -07:00

NetworkRestrictionsPreference.java

…

SpinnerPreference.java

…

TemplatePreference.java

…

TemplatePreferenceCategory.java

Listen to mobile data enabled flag change.

2017-03-16 15:08:49 -07:00

UnrestrictedDataAccess.java

DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"

2017-01-18 19:28:11 +00:00