OSDN Git Service
Dmitry Dementyev [Thu, 9 Mar 2017 18:35:27 +0000 (18:35 +0000)]
resolve merge conflicts of
3964c51bf2 to nyc-dev am:
0f04a5a93f am:
8c5c5b5cec am:
3b5b2d6d20 am:
c28fb3e071 am:
5330df501f
am:
7a3593cbc6 -s ours
Change-Id: Iab4a431d43dade3cbe26b5be7e4166f090a26d2e
Dmitry Dementyev [Thu, 9 Mar 2017 18:32:13 +0000 (18:32 +0000)]
resolve merge conflicts of
3964c51bf2 to nyc-dev am:
0f04a5a93f am:
8c5c5b5cec am:
3b5b2d6d20 am:
c28fb3e071
am:
5330df501f
Change-Id: I32c0ac9a2a38b01417ccf9135b4bfc002af68cc7
Dmitry Dementyev [Thu, 9 Mar 2017 18:29:12 +0000 (18:29 +0000)]
resolve merge conflicts of
3964c51bf2 to nyc-dev am:
0f04a5a93f am:
8c5c5b5cec am:
3b5b2d6d20
am:
c28fb3e071
Change-Id: I1944207165459d9bbd946eb6f30b18809a561c3c
Dmitry Dementyev [Thu, 9 Mar 2017 18:25:11 +0000 (18:25 +0000)]
resolve merge conflicts of
3964c51bf2 to nyc-dev am:
0f04a5a93f am:
8c5c5b5cec
am:
3b5b2d6d20
Change-Id: I52945a6de0678ae91a1eba0201dc252402146260
Dmitry Dementyev [Thu, 9 Mar 2017 18:22:11 +0000 (18:22 +0000)]
resolve merge conflicts of
3964c51bf2 to nyc-dev am:
0f04a5a93f
am:
8c5c5b5cec
Change-Id: I56f7364b5b70fe41a5d09fbaf334c0e15f073750
Dmitry Dementyev [Thu, 9 Mar 2017 18:19:10 +0000 (18:19 +0000)]
resolve merge conflicts of
3964c51bf2 to nyc-dev
am:
0f04a5a93f
Change-Id: I5bb82c0b56e43903d10304007bc17165be3c23f9
William Luh [Thu, 9 Mar 2017 17:08:11 +0000 (17:08 +0000)]
Merge "Initialize injected Security preferences."
TreeHugger Robot [Thu, 9 Mar 2017 12:33:05 +0000 (12:33 +0000)]
Merge "Update layout and strings for DO Disclosures"
TreeHugger Robot [Thu, 9 Mar 2017 10:51:14 +0000 (10:51 +0000)]
Merge "Add CA certs Privacy Settings page"
TreeHugger Robot [Thu, 9 Mar 2017 06:09:57 +0000 (06:09 +0000)]
Merge "Misc fixes"
TreeHugger Robot [Thu, 9 Mar 2017 04:07:01 +0000 (04:07 +0000)]
Merge "Change advaned button text color"
TreeHugger Robot [Thu, 9 Mar 2017 03:57:22 +0000 (03:57 +0000)]
Merge "Fix layout for time zone picker"
TreeHugger Robot [Thu, 9 Mar 2017 03:14:52 +0000 (03:14 +0000)]
Merge "Update theme setting to not require reboot"
Fan Zhang [Thu, 9 Mar 2017 02:14:40 +0000 (18:14 -0800)]
Change advaned button text color
Test: visual
Change-Id: I5a7155ac9dfa8dc4b48ba17a937c9c4b03eb2868
TreeHugger Robot [Thu, 9 Mar 2017 01:21:55 +0000 (01:21 +0000)]
Merge "Adding app specific screen for "External Sources""
Jason Monk [Tue, 7 Mar 2017 20:59:36 +0000 (15:59 -0500)]
Update theme setting to not require reboot
Add calls into the OverlayManagerService to update the overlays
directly and remove reboot dialog.
Test: make RunSettingsRobotTests
Change-Id: I92841e643eab70b4b194f60cce95ce3cedb75972
Fixes:
34701451
Dmitry Dementyev [Thu, 9 Mar 2017 00:32:00 +0000 (16:32 -0800)]
resolve merge conflicts of
3964c51bf2 to nyc-dev
Bug:
33123882
Test: manual tests
Merged-In: If68343d155364654fa7db55ace3fb3c4db508c7e
Change-Id: I17ceca883819a161c4eab2a414abf0b64c320378
TreeHugger Robot [Thu, 9 Mar 2017 01:03:10 +0000 (01:03 +0000)]
Merge "Add dividers on a few preferences"
William Luh [Wed, 8 Mar 2017 19:44:54 +0000 (11:44 -0800)]
Initialize injected Security preferences.
Previously a default "G" icon was loaded before the injected ones and
this would be visually jarring. Also the text summary would cause the
titles to shift up, so now load an empty icon and empty summary so no
more jarring visual effects.
Bug:
35994047
Test: make RunSettingsRoboTests
Change-Id: Ia06535215432fe350a3bb06f541e817a566772e0
Fan Zhang [Wed, 8 Mar 2017 23:59:45 +0000 (15:59 -0800)]
Fix layout for time zone picker
Change-Id: I2f1dedac7d747901978ef5d4a1a58bae2fa02921
Fix:
35856915
Test: make RunSettingsRoboTests
Fan Zhang [Wed, 8 Mar 2017 17:24:45 +0000 (09:24 -0800)]
Misc fixes
- Deprecate CopyablePreference
- Update search icon for connected device page
Fix:
36006104
Fix:
35948464
Test: make RunSettingsRoboTests
Change-Id: I0f48028b50d347484b4dd2c7844e782d374715d4
Fan Zhang [Wed, 8 Mar 2017 21:29:45 +0000 (13:29 -0800)]
Add dividers on a few preferences
Fix:
36023418
Fix:
36058273
Test: visual
- On top of emergency preference
- On top of footer preference
Change-Id: Iefbbf0ad410d46c466f919ecb60b572dd6f1ea28
jackqdyulei [Mon, 6 Mar 2017 23:49:04 +0000 (15:49 -0800)]
Add background activity toggle in Battery settings
We will show this preference only if the app is target prior to O
(targetSdk < O)
Bug:
33454801
Test: RunSettingsRoboTests
Change-Id: Ibd6a2147b8e7b49d2b7e3176296dd9b91ee4cc6f
TreeHugger Robot [Wed, 8 Mar 2017 22:32:45 +0000 (22:32 +0000)]
Merge "Misc fix for secondary user"
Stephen Chen [Wed, 8 Mar 2017 22:24:51 +0000 (22:24 +0000)]
Merge "Show Search button in menu of Wifi Preferences page."
Stephen Chen [Wed, 8 Mar 2017 21:46:58 +0000 (21:46 +0000)]
Merge "Remove refresh button from WifiSettings."
Fan Zhang [Wed, 8 Mar 2017 17:24:45 +0000 (09:24 -0800)]
Misc fix for secondary user
- Theme fix: action bar and status bar color now have enough contrast
for SUW theme.
- Fix a ConcurrentModificationError when switching between users
quickly.
Change-Id: If31f88e36f1d4c5d7f90bc9d128041f0e0a81ff9
Fix:
35948464
Test: make RunSettingsRoboTests
Stephen Chen [Wed, 8 Mar 2017 21:04:43 +0000 (21:04 +0000)]
Merge "Create NetworkScorerPicker preference controller to set preference summary."
Stephen Chen [Wed, 8 Mar 2017 20:38:06 +0000 (12:38 -0800)]
Show Search button in menu of Wifi Preferences page.
Bug:
36066060
Change-Id: Ia40ca8750cfc5233926b6156bb9262b071bb3b85
Test: verify on device.
Stephen Chen [Wed, 8 Mar 2017 19:55:28 +0000 (11:55 -0800)]
Remove refresh button from WifiSettings.
Bug:
34891524
Test: b/
34673204 for instrumentation tests. Verified button is removed.
Change-Id: I0b30d36bd6b3f0b1361ef4f7dc775ed3545a7bdc
TreeHugger Robot [Wed, 8 Mar 2017 19:54:10 +0000 (19:54 +0000)]
Merge "SecuritySubSettings: Show trust agent label on lock timeout setting"
TreeHugger Robot [Wed, 8 Mar 2017 19:08:04 +0000 (19:08 +0000)]
Merge "Set Tron log event on NetworkScorerPicker."
TreeHugger Robot [Wed, 8 Mar 2017 18:39:02 +0000 (18:39 +0000)]
Merge "Fix disabled WebView packages being shown as enabled in Dev Setting."
Daniel Nishi [Wed, 8 Mar 2017 18:19:25 +0000 (18:19 +0000)]
Merge "Fix a crash when transferring an app."
Bartosz Fabianowski [Wed, 8 Mar 2017 13:01:26 +0000 (14:01 +0100)]
Update layout and strings for DO Disclosures
This CL updates the DO Disclosures page (aka "Enterprise Privacy")
to incorporate UI layout and string changes proposed since
implementation began. There are no logic changes.
Test: make RunSettingsRoboTests
Bug:
32692748
Change-Id: I6ae972e77bd90eb9c61d6a516046a6eb09981ad3
Bartosz Fabianowski [Mon, 6 Mar 2017 17:42:25 +0000 (18:42 +0100)]
Add CA certs Privacy Settings page
This CL adds information about CA certs installed by Device Owner and/or
Profile Owners to the Enterprise Privacy Setting page.
Test: make RunSettingsRoboTests
Bug:
32692748
Change-Id: I67bbe5af2b5b6326e4cd7224d0c6f17ab256dace
Suprabh Shukla [Tue, 7 Mar 2017 01:51:05 +0000 (17:51 -0800)]
Adding app specific screen for "External Sources"
Adding app specific screen so that third party apps and package
installer can directly intent there to direct users to change the
setting. Also added automater tests.
Test: adb shell am instrument -w -e class \
'com.android.settings.applications.ExternalSourcesSettingsTest' \
'com.android.settings.tests/android.support.test.runner.AndroidJUnitRunner'
Bug:
33792674
Bug:
35487166
Change-Id: I5a481ee7032979df94a9e267ea74aa90da6a0906
TreeHugger Robot [Wed, 8 Mar 2017 03:52:29 +0000 (03:52 +0000)]
Merge "Display a hardware info dialog when click model number."
Stephen Chen [Tue, 7 Mar 2017 23:22:11 +0000 (15:22 -0800)]
Create NetworkScorerPicker preference controller to set preference summary.
Bug:
35854552
Test: make ROBOTEST_FILTER=NetworkScorerPickerPreferenceControllerTest
RunSettingsRoboTests -j40
Change-Id: I6dbd18abd67613ed0f85a52f1a3e13fdab0dca6c
TreeHugger Robot [Wed, 8 Mar 2017 02:09:47 +0000 (02:09 +0000)]
Merge "Hide video preference when video is not avaiable."
TreeHugger Robot [Wed, 8 Mar 2017 01:53:22 +0000 (01:53 +0000)]
Merge "VPN screen clean up"
Daniel Nishi [Thu, 2 Mar 2017 20:52:40 +0000 (12:52 -0800)]
Fix a crash when transferring an app.
This crash occurs because the background loader is loading
the storage for an app which is currently being moved off of
the device. In the native code which is calculating the storage,
it throws an InstallerException which is caught and rethrown as an
IllegalStateException.
We handle this in the view by reporting that we could not calculate
the size of the app.
Change-Id: I109b1be60ae60f8ef31b08cb4392b576261fa806
Fixes:
35922033
Test: Robotest
TreeHugger Robot [Wed, 8 Mar 2017 00:30:13 +0000 (00:30 +0000)]
Merge "Move the action buttons in installed app detail page in the preference xml."
Fan Zhang [Wed, 8 Mar 2017 00:19:00 +0000 (16:19 -0800)]
VPN screen clean up
Fix:
35960168
Fix:
35856128
Test: visual
- Increase new vpn dialog padding
- Update VPN icon
Change-Id: Ibc7f4fc5b9eff24693a25542e7d3481fbe3c393d
TreeHugger Robot [Wed, 8 Mar 2017 00:08:53 +0000 (00:08 +0000)]
Merge "Use light status bar theme in confirm credential activity"
Fan Zhang [Tue, 7 Mar 2017 23:58:35 +0000 (15:58 -0800)]
Hide video preference when video is not avaiable.
Change-Id: Ic4efc21d41b328591f2146534b7edecd86cb83ac
Fix:
35855399
Test: manual
TreeHugger Robot [Tue, 7 Mar 2017 23:55:20 +0000 (23:55 +0000)]
Merge "Fix test when running with ROBOTEST_FILTER option"
Fan Zhang [Tue, 7 Mar 2017 22:52:51 +0000 (14:52 -0800)]
Display a hardware info dialog when click model number.
Change-Id: I28eeb3e5c3ed290d4e03e0f3989adde0b966bede
Fix:
35851000
Test: make RunSettingsRoboTests
Stephen Chen [Tue, 7 Mar 2017 23:32:47 +0000 (15:32 -0800)]
Set Tron log event on NetworkScorerPicker.
Bug:
35854268
Test: make
Change-Id: I5430fa6f76dc689a7358a23e7fad5fa8ab0469e6
TreeHugger Robot [Tue, 7 Mar 2017 23:13:19 +0000 (23:13 +0000)]
Merge "Fix a crash when opening uninstalled app detail page"
TreeHugger Robot [Tue, 7 Mar 2017 23:06:01 +0000 (23:06 +0000)]
Merge "Update "make password visible" preference string"
Daniel Nishi [Tue, 7 Mar 2017 22:55:05 +0000 (22:55 +0000)]
Merge "Use the screen context when adding preferences."
Doris Ling [Tue, 7 Mar 2017 22:52:02 +0000 (14:52 -0800)]
Move the action buttons in installed app detail page in the preference xml.
- instead of dynamically creating the preferences for the action
buttons, add the actions items to the installed app details xml.
- rename the reference as it is no longer a footer.
Change-Id: I41b99f50bcc4916384555b5d9470ac937ff1d2ac
Fix:
36001501
Test: make RunSettingsRoboTests
Fan Zhang [Tue, 7 Mar 2017 18:16:20 +0000 (10:16 -0800)]
Fix test when running with ROBOTEST_FILTER option
Change-Id: I864af10cecb6ad520c999a41be4f6ba6f6c378bf
Bug:
36024626
Test: make RunSettingsRoboTests
Steven Ng [Tue, 7 Mar 2017 21:49:31 +0000 (21:49 +0000)]
Merge "Fix phishing attack in ChooseLockGeneric"
Fan Zhang [Tue, 7 Mar 2017 21:44:18 +0000 (13:44 -0800)]
Use light status bar theme in confirm credential activity
Change-Id: I21443fd4eedf3ec9760e751a39d624e0c75530d5
Fix:
35996219
Test: visual
Fan Zhang [Tue, 7 Mar 2017 21:35:29 +0000 (13:35 -0800)]
Update "make password visible" preference string
Change-Id: Iaeaf5382476e22bf934ea2b0a200ec5ed146a48d
Fix:
35139378
Test: visual
Fan Zhang [Tue, 7 Mar 2017 20:12:38 +0000 (12:12 -0800)]
Fix a crash when opening uninstalled app detail page
Change-Id: I417e7eb6f9c857ace4e8047b226abe03a7c8248d
Fix:
36027848
Fix:
34392538
Test: make RunSettingsRoboTests
TreeHugger Robot [Tue, 7 Mar 2017 20:57:28 +0000 (20:57 +0000)]
Merge "Remove code that check for dashboard feature."
Steven Ng [Thu, 23 Feb 2017 10:34:28 +0000 (10:34 +0000)]
Fix phishing attack in ChooseLockGeneric
Test: 1) make and run SettingsTests. It passes.
2) Manual test 1
a) On a device supports fingerprint, set a password but not fingerprint.
b) adb shell am start -a android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD
c) Confirm Lock password screen is shown
d) Select "Skip fingerprint". There isn't a second lock password confirmation screen.
e) A new password can be set successfully.
3) Manual test 2
a) Repeat step 2)a) - 2)c)
b) Select "Fingerprint + PIN". There isn't a second lock password confirmation screen.
c) A new password and fingerprint can be enrolled successfully.
Bug:
33059280
Change-Id: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
Gustav Sennton [Thu, 23 Feb 2017 18:32:20 +0000 (18:32 +0000)]
Fix disabled WebView packages being shown as enabled in Dev Setting.
WebView packages that cannot be chosen as WebView implementation should
be shown as disabled in the 'WebView Implementation' Dev Setting.
Simplify the logic in DefaultAppInfo a little bit to avoid
special-casing for the WebView Dev setting.
Also add tests to ensure we are correctly disabling WebView packages in
the Dev setting and showing their disabled-reasons.
Bug:
35707106
Test: 'make RunSettingsRoboTests'
Test: Ensure disabled WebView packages show up as being disabled in the
'WebView Implementation' Dev Setting.
Change-Id: Ic2f5265c3451b6396e55b7bc29689c3d889ddb5e
Doris Ling [Sat, 4 Mar 2017 01:12:47 +0000 (17:12 -0800)]
Remove code that check for dashboard feature.
- remove DashboardFeatureProvider.isEnabled() and all relating code
and tests.
Bug:
35764802
Test: make RunSettingsRoboTests
Change-Id: If7796677abc8904b7436525836d50cdef38e37a4
TreeHugger Robot [Tue, 7 Mar 2017 18:36:54 +0000 (18:36 +0000)]
Merge "Add default IME to Privacy Settings page"
Daniel Nishi [Tue, 7 Mar 2017 17:49:28 +0000 (17:49 +0000)]
Merge "Align the profile calculation with other screens."
Daniel Nishi [Tue, 7 Mar 2017 17:48:53 +0000 (17:48 +0000)]
Merge "Fast track the installed app details storage."
Tony Mak [Tue, 7 Mar 2017 13:37:38 +0000 (13:37 +0000)]
Fix failed to remove account in managed profile
Fix:
35996483
Test: m -j RunSettingsRoboTests
Test: manual test
1. Remove account in work profile
2. Remove account in user 0
Change-Id: I3ed9364afbf8ef5cddd0edc0d4e0e5e48d2dd62a
Bartosz Fabianowski [Fri, 17 Feb 2017 12:30:32 +0000 (13:30 +0100)]
Add default IME to Privacy Settings page
This CL adds information about default IMEs set by Device Owner and/or
Profile Owners to the Enterprise Privacy Setting page.
Test: make RunSettingsRoboTests
Bug:
32692748
Change-Id: I9f78ab4792a5a1d444808048ff33e3e20a0483dc
TreeHugger Robot [Tue, 7 Mar 2017 06:19:54 +0000 (06:19 +0000)]
Merge "Remove some dashboard alias"
Doris Ling [Fri, 3 Mar 2017 22:21:37 +0000 (14:21 -0800)]
Remove some dashboard alias
- remove UsersDashboardAlias, PaymentSettingsDashboardAlias,
ManageApplicationsDashboardAlias, and AppNotificationDashboardAlias,
and merge the metadata into the target activity
- remove StorageActivity
- remove the old top level settings categories
Bug:
35764802
Test: RunSettingsRoboTests
Change-Id: I0faf006c92a1822228bea20ad884cd9a21696fd3
Jaewoong Jung [Tue, 7 Mar 2017 02:31:47 +0000 (02:31 +0000)]
Merge "Changes event handling phases for DeviceListPreferenceFragment." am:
084c20409b am:
015fe72cd3
am:
42786ef2f2
Change-Id: I5f5be1929616a550dd26acf5059c932bdd321fd6
Jaewoong Jung [Tue, 7 Mar 2017 02:29:45 +0000 (02:29 +0000)]
Merge "Changes event handling phases for DeviceListPreferenceFragment." am:
084c20409b
am:
015fe72cd3
Change-Id: Ice1275e292262a86caafe64d01676eaccad0f702
Jaewoong Jung [Tue, 7 Mar 2017 02:27:15 +0000 (02:27 +0000)]
Merge "Changes event handling phases for DeviceListPreferenceFragment."
am:
084c20409b
Change-Id: Ic0abdcd7a7de944b3348590cdfa922fcf1dcbed1
TreeHugger Robot [Tue, 7 Mar 2017 02:06:08 +0000 (02:06 +0000)]
Merge "Create settings page for choosing default Network Scorer."
TreeHugger Robot [Tue, 7 Mar 2017 02:00:27 +0000 (02:00 +0000)]
Merge "Update preference logger to log pref change as ACTION"
Lei Yu [Tue, 7 Mar 2017 01:54:21 +0000 (01:54 +0000)]
Merge "Add type UNACCOUNTED("miscellaneous") in advanced battery page"
Saige McVea [Tue, 7 Mar 2017 01:16:47 +0000 (01:16 +0000)]
Merge "Accessibility settings refresh."
TreeHugger Robot [Tue, 7 Mar 2017 00:42:14 +0000 (00:42 +0000)]
Merge "Revert color-coded icons."
TreeHugger Robot [Mon, 6 Mar 2017 23:56:32 +0000 (23:56 +0000)]
Merge "Create whitelist for the most popular settings"
Fan Zhang [Mon, 6 Mar 2017 23:32:30 +0000 (15:32 -0800)]
Update preference logger to log pref change as ACTION
Change-Id: I600cf6ec79cbc876347c3fdb20ea70fffbc04524
Fix:
34775467
Test: make RunSettingsRoboTests
Saige McVea [Sat, 21 Jan 2017 04:23:09 +0000 (20:23 -0800)]
Accessibility settings refresh.
Added logic for proper handling of new accessibility service categories. Preferences and
services are no longer distinctly separated - services are added after system preferences
in their appropriate category, or are grouped under "Downloaded services".
Bug:
30374533
Test: CTS tests updated to accommodate addition of summary.
Change-Id: I38255ede8880922e60487607f8d1bd520b1adf75
Treehugger Robot [Mon, 6 Mar 2017 23:02:12 +0000 (23:02 +0000)]
Merge "Changes event handling phases for DeviceListPreferenceFragment."
Stephen Chen [Thu, 2 Mar 2017 01:10:08 +0000 (17:10 -0800)]
Create settings page for choosing default Network Scorer.
Bug:
35203304
Bug:
35852687
Test: make RunSettingsRoboTests -j40
Change-Id: Iaef671e0a9e8beb560e1d2c9864f44ef46993a6b
Daniel Nishi [Thu, 2 Mar 2017 19:52:09 +0000 (11:52 -0800)]
Align the profile calculation with other screens.
The profile fragment was accidentally adding all of the app's
code data to the profile, even if it was already attributed to the
primary user.
Change-Id: I47000bbe1fcf98d5e9f252eb74b22fee05b7034d
Fixes:
35919232
Test: Settings Robotest
Daniel Nishi [Thu, 2 Mar 2017 19:03:35 +0000 (11:03 -0800)]
Fast track the installed app details storage.
Change-Id: Ic96a7b4bea6d92a32669887dacbc1f4e54e25ea9
Fixes:
35805032
Test: Settings robotest
Jaewoong Jung [Thu, 13 Oct 2016 18:08:22 +0000 (11:08 -0700)]
Changes event handling phases for DeviceListPreferenceFragment.
Bug:
31273140
Test: Manual inspection.
Change-Id: If4622b8d367813eb86a54a45f2e8fa4a55ca38b1
(cherry picked from commit
e8d5c8fda16c75e4bcca3a218bc5cf7b254baa99)
TreeHugger Robot [Mon, 6 Mar 2017 20:51:33 +0000 (20:51 +0000)]
Merge "Add code coverage support for robolectric tests"
Fan Zhang [Mon, 6 Mar 2017 20:34:23 +0000 (12:34 -0800)]
Revert color-coded icons.
Change-Id: I64190a2603d6c3de687a126013f64c90362a7df7
Fix:
34978809
Test: Visual
Matthew Fritze [Tue, 14 Feb 2017 21:57:08 +0000 (13:57 -0800)]
Create whitelist for the most popular settings
As a temporary solution to getting the most popular
settings to be the top rank, we have created a white list.
If a prioritized setting shows up somewhere in the results
then it will be given an elevated rank to be at the top.
Bug:
35048659
Test: make RunSettingsRoboTests
Change-Id: I92b563a17b42d8f91d980dd1d8e5f8f29ca5aa9c
TreeHugger Robot [Mon, 6 Mar 2017 18:52:35 +0000 (18:52 +0000)]
Merge "Add tests for NonIndexableKeys in NFC payments"
Anton Philippov [Mon, 6 Mar 2017 10:24:17 +0000 (10:24 +0000)]
Merge "Fix search results for backup settings."
TreeHugger Robot [Mon, 6 Mar 2017 06:20:17 +0000 (06:20 +0000)]
Merge "Import translations. DO NOT MERGE"
Lorenzo Colitti [Mon, 6 Mar 2017 04:12:58 +0000 (04:12 +0000)]
Merge "Display the correct default for mobile data always on." am:
737d42a0db am:
58e9855b53
am:
db77518a65
Change-Id: I006172e9f119b5586e71d174dd6f1ecf63a2464d
Lorenzo Colitti [Mon, 6 Mar 2017 04:08:55 +0000 (04:08 +0000)]
Merge "Display the correct default for mobile data always on." am:
737d42a0db
am:
58e9855b53
Change-Id: I7f27267da9773d4ffe8f7c476efb4839b1ba496c
Lorenzo Colitti [Mon, 6 Mar 2017 04:04:55 +0000 (04:04 +0000)]
Merge "Display the correct default for mobile data always on."
am:
737d42a0db
Change-Id: I5302cc5cc7d0847e127fcbf8af42fb6eef54c303
Bill Yi [Mon, 6 Mar 2017 04:00:49 +0000 (20:00 -0800)]
Import translations. DO NOT MERGE
Change-Id: I34bcf00ed9bc82e0485dc00156cfc69af6973243
Auto-generated-cl: translation import
Treehugger Robot [Mon, 6 Mar 2017 03:57:50 +0000 (03:57 +0000)]
Merge "Display the correct default for mobile data always on."
minoru.x.sakuma [Mon, 6 Mar 2017 01:29:19 +0000 (01:29 +0000)]
Merge "Unify the design of add icon in setting" am:
bc9731a575 am:
398eca1067
am:
36b2de22cf
Change-Id: I5d139de04c1cfd02f339ab947e0708b8d6c4a31f
minoru.x.sakuma [Mon, 6 Mar 2017 01:25:46 +0000 (01:25 +0000)]
Merge "Unify the design of add icon in setting" am:
bc9731a575
am:
398eca1067
Change-Id: I5bf02f104479aba4e1dc199c07077cff5afdffc2
minoru.x.sakuma [Mon, 6 Mar 2017 01:22:16 +0000 (01:22 +0000)]
Merge "Unify the design of add icon in setting"
am:
bc9731a575
Change-Id: Ieae295ad277877e52399032908677c15180159d3
Treehugger Robot [Mon, 6 Mar 2017 01:17:55 +0000 (01:17 +0000)]
Merge "Unify the design of add icon in setting"