OSDN Git Service
Maurice Lam [Mon, 3 Apr 2017 21:37:58 +0000 (21:37 +0000)]
Merge "Rebuild suggestions when suggestions are dismissed"
Stephen Chen [Mon, 3 Apr 2017 18:51:58 +0000 (18:51 +0000)]
Merge "Add friction icon for metered networks." into oc-dev am:
9b271041a9
am:
c1288e2630
Change-Id: If0a2c01310b5d899fcda40f88d6c22c6db445c00
Stephen Chen [Mon, 3 Apr 2017 18:40:34 +0000 (18:40 +0000)]
Merge "Add friction icon for metered networks." into oc-dev
am:
9b271041a9
Change-Id: Ic78a948751317a5536a8ee52825c74672b9a7996
Hemant Gupta [Mon, 3 Apr 2017 18:40:19 +0000 (18:40 +0000)]
Merge "Bluetooth: Fix Resource Leak in OPP (1/2)" am:
e270a6aa85 am:
2ffab51c0e am:
b5e14d5f30
am:
ec6815ea7c
Change-Id: I7a49313949a334776b69d12f09c807251005aacd
TreeHugger Robot [Mon, 3 Apr 2017 18:23:56 +0000 (18:23 +0000)]
Merge "Add friction icon for metered networks." into oc-dev
Hemant Gupta [Mon, 3 Apr 2017 17:57:42 +0000 (17:57 +0000)]
Merge "Bluetooth: Fix Resource Leak in OPP (1/2)" am:
e270a6aa85 am:
2ffab51c0e
am:
b5e14d5f30
Change-Id: Ie2246c812f6a34086c19561f62e73f714bdd8eff
Hemant Gupta [Mon, 3 Apr 2017 17:54:06 +0000 (17:54 +0000)]
Merge "Bluetooth: Fix Resource Leak in OPP (1/2)" am:
e270a6aa85
am:
2ffab51c0e
Change-Id: I96e6196c6e1417c3115946d483d6f822367aca11
Hemant Gupta [Mon, 3 Apr 2017 17:50:36 +0000 (17:50 +0000)]
Merge "Bluetooth: Fix Resource Leak in OPP (1/2)"
am:
e270a6aa85
Change-Id: Ia5108737add480f2cce52663f13d496653c37320
Treehugger Robot [Mon, 3 Apr 2017 17:43:40 +0000 (17:43 +0000)]
Merge "Bluetooth: Fix Resource Leak in OPP (1/2)"
Amin Shaikh [Sun, 2 Apr 2017 21:36:50 +0000 (21:36 +0000)]
Fix NPE when forgetting networks. am:
3c0d5ff3d1
am:
f73b263583
Change-Id: Ieb5ee707cb977c1bfe8803fb4678c5b8fda0337c
Amin Shaikh [Sun, 2 Apr 2017 21:33:55 +0000 (21:33 +0000)]
Fix NPE when forgetting networks.
am:
3c0d5ff3d1
Change-Id: I713d50e7ecf31b95990afba7c26e2c0d54177f10
Amin Shaikh [Fri, 31 Mar 2017 20:56:53 +0000 (13:56 -0700)]
Fix NPE when forgetting networks.
- Fixed disablement of ephemeral networks
- Exit out of the fragment when Forget is pressed
Bug:
36723238
Test: m RunSettingsRoboTests and manual testing
Change-Id: I83c09a44dbef0f02a452dc8c3163523a27bd4b63
TreeHugger Robot [Sun, 2 Apr 2017 18:25:25 +0000 (18:25 +0000)]
Merge "Adds the Clear App dialog for Instant Apps"
Jesse Evans [Sun, 2 Apr 2017 16:20:33 +0000 (16:20 +0000)]
Merge "Removes summary text from Instant Apps details" into oc-dev am:
8fc0d1f948
am:
6ecbdadd6a
Change-Id: I35a9a5dc4fff0253390abcd6af62f06f90e2cf4f
Jesse Evans [Sun, 2 Apr 2017 16:17:35 +0000 (16:17 +0000)]
Merge "Removes summary text from Instant Apps details" into oc-dev
am:
8fc0d1f948
Change-Id: I806826bd2b7ee5435f132d9f3db234878b9b429f
Jesse Evans [Sun, 2 Apr 2017 16:13:53 +0000 (16:13 +0000)]
Merge "Removes summary text from Instant Apps details" into oc-dev
Jesse Evans [Sun, 2 Apr 2017 16:09:31 +0000 (16:09 +0000)]
Merge "Removes instant apps from certain screens"
Lei Yu [Sun, 2 Apr 2017 07:03:44 +0000 (07:03 +0000)]
Merge "Fix crash when opening battery page"
Lei Yu [Sun, 2 Apr 2017 07:03:09 +0000 (07:03 +0000)]
Merge "Ui changes in battery main page"
Bill Yi [Sun, 2 Apr 2017 04:03:21 +0000 (04:03 +0000)]
Import translations. DO NOT MERGE am:
66ff06da2f -s ours am:
c7ca1bcf70 -s ours
am:
ff8eb394ad -s ours
Change-Id: Ie0a016511f22afefa66f9b2a0a6687f88b8a310f
Bill Yi [Sun, 2 Apr 2017 04:00:21 +0000 (04:00 +0000)]
Import translations. DO NOT MERGE am:
66ff06da2f -s ours
am:
c7ca1bcf70 -s ours
Change-Id: I7d981104f749677ecdb1560903c9b2720fdf1c73
Bill Yi [Sun, 2 Apr 2017 03:58:11 +0000 (03:58 +0000)]
Import translations. DO NOT MERGE
am:
66ff06da2f -s ours
Change-Id: I82b52721cd65db19cbdcc0c4d062ab4875a9d6f6
Bill Yi [Sat, 1 Apr 2017 23:45:18 +0000 (16:45 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
36832302
Change-Id: I940468be84cb7790fb9c205c3648e526a4b32422
Charles He [Sat, 1 Apr 2017 20:50:57 +0000 (20:50 +0000)]
VPN settings: add missing string resource am:
1b5015cae6
am:
eea0037272
Change-Id: I098bd31a201e89d17f849262ac1c0cc81b43218f
Charles He [Sat, 1 Apr 2017 20:47:57 +0000 (20:47 +0000)]
VPN settings: add missing string resource
am:
1b5015cae6
Change-Id: I02c4ebe3d03cf4cd10c7d7803532433d519ff4e2
Charles He [Sat, 1 Apr 2017 17:52:25 +0000 (18:52 +0100)]
VPN settings: add missing string resource
Previously, a string resource was deleted by mistake in commit
cce4e61260153dc4826e648f733f7451f73dfa01. This bug went uncaught by
local and presubmit build checks. We add the missing string back to
strings.xml to fix the build. The affected string is referenced in
ManageablePreference.java.
Apologies for any inconvenience.
Test: make SettingsRoboTests; manually navigate through VPN settings
Bug:
36815998
Change-Id: Ibc2ef9ad43cad73ef5f078714faf5c52bc7198c6
Bartosz Fabianowski [Sat, 1 Apr 2017 05:21:02 +0000 (05:21 +0000)]
Merge "Keep EnterprisePrivacySettingsActivity always enabled" into oc-dev am:
5569816021
am:
9f7308baad
Change-Id: I34476cd9498b0eaed3fcec7845f9b1f0fdf2f75e
Bartosz Fabianowski [Sat, 1 Apr 2017 05:20:48 +0000 (05:20 +0000)]
Merge "Device management info: Refer to current user, not primary user" into oc-dev am:
57a0771bf5
am:
1e67d8902c
Change-Id: I32c82556b755aa4d5fdbde1492b1316578cf5b21
Bartosz Fabianowski [Sat, 1 Apr 2017 05:20:07 +0000 (05:20 +0000)]
Merge "Keep EnterprisePrivacySettingsActivity always enabled" into oc-dev
am:
5569816021
Change-Id: I5b8286dce56e89ae924166d142785d52af4eb6bd
Bartosz Fabianowski [Sat, 1 Apr 2017 05:18:30 +0000 (05:18 +0000)]
Merge "Device management info: Refer to current user, not primary user" into oc-dev
am:
57a0771bf5
Change-Id: I65756248e8803b140277bb84a17e3c965ced0f11
TreeHugger Robot [Sat, 1 Apr 2017 05:17:09 +0000 (05:17 +0000)]
Merge "Keep EnterprisePrivacySettingsActivity always enabled" into oc-dev
TreeHugger Robot [Sat, 1 Apr 2017 05:12:38 +0000 (05:12 +0000)]
Merge "Device management info: Refer to current user, not primary user" into oc-dev
Jesse Evans [Sat, 1 Apr 2017 05:11:14 +0000 (05:11 +0000)]
Merge "Adds the lightning badge for Instant Apps" into oc-dev am:
ef64404f44
am:
aabcca5187
Change-Id: Ib35dafd0371efc61ba815893f5839873f11aadeb
Suprabh Shukla [Sat, 1 Apr 2017 05:09:30 +0000 (05:09 +0000)]
Merge "Disabling switch preference when unknown sources are blocked" into oc-dev am:
8e7b655dc0
am:
cb044f7045 -s ours
Change-Id: Ie8f07b6536457c24b7606336e114f2c046396e64
Jesse Evans [Sat, 1 Apr 2017 05:05:55 +0000 (05:05 +0000)]
Merge "Adds the lightning badge for Instant Apps" into oc-dev
am:
ef64404f44
Change-Id: Iaae54c4ccf9656b14e7bbaa24a8979eadfbc2e5d
Suprabh Shukla [Sat, 1 Apr 2017 05:04:33 +0000 (05:04 +0000)]
Merge "Disabling switch preference when unknown sources are blocked" into oc-dev
am:
8e7b655dc0
Change-Id: I8533c4328476bfe4501f277cd697526033b3dd0a
TreeHugger Robot [Sat, 1 Apr 2017 04:59:52 +0000 (04:59 +0000)]
Merge "Adds the lightning badge for Instant Apps" into oc-dev
TreeHugger Robot [Sat, 1 Apr 2017 04:59:30 +0000 (04:59 +0000)]
Merge "Disabling switch preference when unknown sources are blocked" into oc-dev
TreeHugger Robot [Sat, 1 Apr 2017 04:49:18 +0000 (04:49 +0000)]
Merge "Change test type from InstrumentationTest to AndroidJUnitTest"
Suprabh Shukla [Mon, 13 Mar 2017 22:11:08 +0000 (15:11 -0700)]
Disabling switch preference when unknown sources are blocked
When the user restriction DISALLOW_INSTALL_UNKNOWN_SOURCES is set,
changing the preferences in settings is meaningless as package installer
will not let the install proceed. Disabling the settings switch and
updated the summaries to reflect when a switch is disabled. Removing
robolectric test as the logic is no longer testable due to missing stubs
for UserManager and UserHandle.
Test: CtsVerifier -> Device Owner Tests -> Policy Transparency Test
Bug:
34688413
Change-Id: I7cf6cc09a5d29721186a0df9405d3c7e486295ee
Merged-In: I7cf6cc09a5d29721186a0df9405d3c7e486295ee
Suprabh Shukla [Sat, 1 Apr 2017 02:40:21 +0000 (02:40 +0000)]
Merge "Disabling switch preference when unknown sources are blocked"
Doris Ling [Sat, 1 Apr 2017 02:10:22 +0000 (02:10 +0000)]
Merge "Update text for USB mode selection dialog." into oc-dev am:
23accd2179
am:
8a6d2ed429
Change-Id: I3c1dcb2d8fc2402f87726b3e9c9a836f823a4241
Doris Ling [Sat, 1 Apr 2017 02:08:25 +0000 (02:08 +0000)]
Merge "Update text for USB mode selection dialog." into oc-dev
am:
23accd2179
Change-Id: Ia48fba32cdbd027ffe052016b0d8d3f3ee250993
TreeHugger Robot [Sat, 1 Apr 2017 02:03:26 +0000 (02:03 +0000)]
Merge "Update text for USB mode selection dialog." into oc-dev
Stephen Chen [Sat, 1 Apr 2017 01:30:51 +0000 (01:30 +0000)]
Improve responsiveness of toggling wifi and refactor user restriction logic. am:
19b74d9213
am:
40adeaf28a
Change-Id: I5cbd3b05d16a64ffd488db739d87b2043347ccca
Stephen Chen [Sat, 1 Apr 2017 01:28:51 +0000 (01:28 +0000)]
Improve responsiveness of toggling wifi and refactor user restriction logic.
am:
19b74d9213
Change-Id: I0d776b5e4325782b9c6ad05beae51ca7e902fd22
Stephen Chen [Sat, 1 Apr 2017 00:13:15 +0000 (17:13 -0700)]
Add friction icon for metered networks.
Also modified colors for dark theme compatibility.
Bug:
36100548
Bug:
36099721
Test: make, screenshot
Change-Id: Ib19ba8d5f34ad6d7461849c9137520308f1e5e34
Maurice Lam [Sat, 1 Apr 2017 00:13:39 +0000 (17:13 -0700)]
Rebuild suggestions when suggestions are dismissed
When suggestions are swiped away, refresh the suggestion categories
so that suggestions previously suppressed because it's lower priority
or because there is an exclusive suggestion now has a chance to be
shown.
Test: cd tests/robotests && mma
Bug:
36811621
Change-Id: I1a1ae1624c2f69153d95d238b2143ac9273e117d
Suprabh Shukla [Mon, 13 Mar 2017 22:11:08 +0000 (15:11 -0700)]
Disabling switch preference when unknown sources are blocked
When the user restriction DISALLOW_INSTALL_UNKNOWN_SOURCES is set,
changing the preferences in settings is meaningless as package installer
will not let the install proceed. Disabling the settings switch and
updated the summaries to reflect when a switch is disabled. Removing
robolectric test as the logic is no longer testable due to missing stubs
for UserManager and UserHandle.
Test: CtsVerifier -> Device Owner Tests -> Policy Transparency Test
Bug:
34688413
Change-Id: I7cf6cc09a5d29721186a0df9405d3c7e486295ee
Stephen Chen [Fri, 31 Mar 2017 21:42:20 +0000 (14:42 -0700)]
Improve responsiveness of toggling wifi and refactor user restriction logic.
Moved logic for handling wifi state changes into correct listener
method. Changed logic for handling isUiRestricted. This should
streamline toggling flow for WiFi both when Wifi Scanning is on and off,
and in guest mode.
Bug:
36724409
Bug:
36711085
Bug:
36398321
Test: make, test cases in tracking bug
Change-Id: I69fe07369db192c94f81dd678087ac4e8c35197b
jackqdyulei [Fri, 31 Mar 2017 21:26:38 +0000 (14:26 -0700)]
Fix crash when opening battery page
The settings crashes when opening battery usage detail page from
installed app page. Main reason is that it trying to open obsolete
page. This cl directs it to open AdvancedPowerUsageDetail instead.
Following cl will make InstalledAppDetail show calibrated percentage,
which is trakced in b/
36816681
Bug:
36792973
Test: RunSettingsRoboTests
Change-Id: Ie63e64e543ed3b28974ffdda8b42c97e7749a0f7
Doris Ling [Fri, 31 Mar 2017 18:09:07 +0000 (11:09 -0700)]
Update text for USB mode selection dialog.
- create separate strings to be used for the USB preference summary.
- reverted the previous changes made to change the verb in the usb
preference title.
- updated the summary text for the usb selection description for charge
only.
Bug:
36234108
Test: builds
Change-Id: I4a57ecd6f9be4b3c10885ac1bbba76ff3df02b84
Peter Qiu [Fri, 31 Mar 2017 18:04:17 +0000 (18:04 +0000)]
Merge "wifi: managed Passpoint configurations in "Saved Networks" page" into oc-dev am:
82e2239c54
am:
1599dde849
Change-Id: I242b555fabaed85a72e4f1d38b177cd90071c371
Peter Qiu [Fri, 31 Mar 2017 17:58:58 +0000 (17:58 +0000)]
Merge "wifi: managed Passpoint configurations in "Saved Networks" page" into oc-dev
am:
82e2239c54
Change-Id: I5746669f3e2f2157548979d9317bbe6a225bb715
TreeHugger Robot [Fri, 31 Mar 2017 17:54:13 +0000 (17:54 +0000)]
Merge "wifi: managed Passpoint configurations in "Saved Networks" page" into oc-dev
jackqdyulei [Tue, 28 Mar 2017 23:22:20 +0000 (16:22 -0700)]
Ui changes in battery main page
1. Refine the battery header view
2. Move stats section to the place above power management
3. Add last full charge battery stat
4. Add the disclaimer as a footer
Also update the method name in test file, and this ui changes
also fix the header flash problem.
Bug:
36576021
Bug:
36494178
Test: RunSettingsRoboTests
Change-Id: I9784dbbbe16e61da7287f300183347dd4eee6a2b
Bartosz Fabianowski [Thu, 30 Mar 2017 08:33:28 +0000 (10:33 +0200)]
Device management info: Refer to current user, not primary user
The device management info page should show information about the
current user's policies, not the primary user's.
Bug:
32692748
Test: m RunSettingsRoboTests
Change-Id: I5d8afa7fae1c0f3a4da78b085365882827e6721b
(cherry picked from commit
b836da263d8559255c528fe68410649d979cf123)
TreeHugger Robot [Fri, 31 Mar 2017 09:25:24 +0000 (09:25 +0000)]
Merge "Device management info: Refer to current user, not primary user"
Jesse Evans [Wed, 29 Mar 2017 02:53:09 +0000 (19:53 -0700)]
Adds the Clear App dialog for Instant Apps
Adds a confirmation dialog for the user when tapping clear app.
From this dialog the user can either cancel, or confirm they
want to clear the app.
Test: make RunSettingsRoboTests
Bug:
36536695
Change-Id: Idffcf5ef318578ae2e075ea2cbb35323d41acade
Jesse Evans [Tue, 28 Mar 2017 17:22:12 +0000 (10:22 -0700)]
Removes summary text from Instant Apps details
Test: Robolectric test to ensure header item is GONE.
Bug:
36512295
Change-Id: I020e90d6521c853e67ae600e5786445a8469a934
(cherry picked from commit
14a258443fa4f512531a99b0c11ac7d2b06ce378)
Jesse Evans [Wed, 29 Mar 2017 00:30:09 +0000 (17:30 -0700)]
Adds the lightning badge for Instant Apps
Adds the lightning bolt badge for Instant Apps to the
InstalledAppDetails page.
Test: Robolectric test to ensure the badge is shown for Instant Apps
and also that it is not shown for installed apps.
Bug:
36512295
Change-Id: I8496d684fa3a9dc316fa5af16399e6d07f68255a
(cherry picked from commit
2400d31651142214159ec571064485a4346cb732)
Bill Yi [Fri, 31 Mar 2017 02:10:12 +0000 (02:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
e52758588a -s ours
am:
e049c3523f -s ours
Change-Id: I7a46c24127ca51b64028771b53dbf9990ca6593f
Bill Yi [Fri, 31 Mar 2017 02:06:22 +0000 (02:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
e52758588a -s ours
Change-Id: I6e9cbf23b8f49ad32a30092021485a54f1e076dc
TreeHugger Robot [Fri, 31 Mar 2017 01:57:06 +0000 (01:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Wei Huang [Fri, 31 Mar 2017 01:23:40 +0000 (01:23 +0000)]
Merge "Fix mvno match data is incorrect for APNs" into oc-dev am:
e1b12751cb
am:
e790338ed6
Change-Id: I0bc5fe6832ffd03e65d89630e0e99d87550ba71a
Wei Huang [Fri, 31 Mar 2017 01:05:17 +0000 (01:05 +0000)]
Merge "Fix mvno match data is incorrect for APNs" into oc-dev
am:
e1b12751cb
Change-Id: I82b8798e64b4b7f9958e3e88a7fe195df57e3549
TreeHugger Robot [Fri, 31 Mar 2017 01:00:16 +0000 (01:00 +0000)]
Merge "Fix mvno match data is incorrect for APNs" into oc-dev
Jesse Evans [Fri, 31 Mar 2017 00:09:12 +0000 (17:09 -0700)]
Removes instant apps from certain screens
Removes instant apps from the Special Access screens, as well as
notifications.
Test: make RunSettingsRoboTests
Bug:
36515324
Change-Id: I5b2f0ee3219acd89e2cbdcefed4d9608450395c0
Amin Shaikh [Fri, 31 Mar 2017 00:05:46 +0000 (00:05 +0000)]
Merge "Fix write wifi config to nfc." into oc-dev am:
6889ac21ab
am:
ad47cd05c7
Change-Id: I17cde24b9367d0fa0fec8347856636f28d839f09
Amin Shaikh [Fri, 31 Mar 2017 00:03:48 +0000 (00:03 +0000)]
Merge "Fix write wifi config to nfc." into oc-dev
am:
6889ac21ab
Change-Id: I2e019122d85b00f700f64cb18c0a6d3f35709ac0
TreeHugger Robot [Thu, 30 Mar 2017 23:59:33 +0000 (23:59 +0000)]
Merge "Fix write wifi config to nfc." into oc-dev
Wei Huang [Mon, 23 Jan 2017 11:26:20 +0000 (20:26 +0900)]
Fix mvno match data is incorrect for APNs
[Cause of Defect]
When user editing an existing apn, ApnPreference won't pass
the subId to ApnEditor.
As a result, if use change the mvno type to 'imsi', ApnEditor
can NOT fetch the correct IMSI due to invalid subId.
[How To Fix]
Pass subId to ApnEditor, which is same as adding new APN.
Bug:
34646368
Test: manual - edited an existing apn
Change-Id: I79fe55ccdeb8dab0ffcc7dfb22ba680beb58b9cd
Amit Mahajan [Thu, 30 Mar 2017 22:12:41 +0000 (22:12 +0000)]
Merge "Fix mvno match data is incorrect for APNs" am:
a604afe5de am:
33e9e31a3d am:
9df297d566
am:
7e09d39dd9
Change-Id: I2125086775f801ec35c49d8e49e1cf87a11bb5a1
Amit Mahajan [Thu, 30 Mar 2017 22:10:42 +0000 (22:10 +0000)]
Merge "Fix mvno match data is incorrect for APNs" am:
a604afe5de am:
33e9e31a3d
am:
9df297d566
Change-Id: I152d6451b5da34880b476e15fe7d6ce95a3fe0b4
Bill Yi [Thu, 30 Mar 2017 22:09:46 +0000 (15:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic117b670e525612d9f243eff4f151d9ee616d198
Auto-generated-cl: translation import
Amit Mahajan [Thu, 30 Mar 2017 22:08:12 +0000 (22:08 +0000)]
Merge "Fix mvno match data is incorrect for APNs" am:
a604afe5de
am:
33e9e31a3d
Change-Id: I5cae77d8f81a07ad6e10901a2f4b51ae700c6189
Amit Mahajan [Thu, 30 Mar 2017 22:05:41 +0000 (22:05 +0000)]
Merge "Fix mvno match data is incorrect for APNs"
am:
a604afe5de
Change-Id: Id63da4e2b0c9ce5b2dfca567663fe8b736126bca
Amit Mahajan [Thu, 30 Mar 2017 21:59:33 +0000 (21:59 +0000)]
Merge "Fix mvno match data is incorrect for APNs"
Amin Shaikh [Thu, 30 Mar 2017 21:44:42 +0000 (14:44 -0700)]
Fix write wifi config to nfc.
aog/340881 converts the NFC token hex string to lowercase instead of
uppercase. This change updates Settings to encode the password as a
lowercase hex string.
Bug:
35725168
Test: m RunSettingsRoboTests and manually testing writing GIN-2G to nfc
Change-Id: I85e991c4b8a3d7634dea7f945a23a2ef3d3fe448
Bartosz Fabianowski [Thu, 30 Mar 2017 20:10:54 +0000 (20:10 +0000)]
Merge "Remove android:visibility attributes from Preferences" into oc-dev am:
b9f570ff44
am:
103a72a9eb
Change-Id: Ifdbaeb05fd497bfa58c2e6f4abe89e420d7de2cf
Bartosz Fabianowski [Thu, 30 Mar 2017 20:06:57 +0000 (20:06 +0000)]
Merge "Remove android:visibility attributes from Preferences" into oc-dev
am:
b9f570ff44
Change-Id: I14c2b9e37201e478e28fba96494bee807134b32c
TreeHugger Robot [Thu, 30 Mar 2017 19:57:00 +0000 (19:57 +0000)]
Merge "Remove android:visibility attributes from Preferences" into oc-dev
Stephen Chen [Thu, 30 Mar 2017 18:25:32 +0000 (18:25 +0000)]
Merge "Add link speed to Wifi details page." into oc-dev am:
0df5281fe6
am:
659c66a3ca
Change-Id: I89b6bdfabf841f8027ae5c6870ec9ec40b8388bc
Stephen Chen [Thu, 30 Mar 2017 18:23:46 +0000 (18:23 +0000)]
Merge "Add link speed to Wifi details page." into oc-dev
am:
0df5281fe6
Change-Id: Ibcd26de73f4b859661ad976066cc7dc40ed45b97
Stephen Chen [Thu, 30 Mar 2017 18:20:50 +0000 (18:20 +0000)]
Merge "Do not show progress bar when disabling wifi." into oc-dev am:
555d12b427
am:
69bc8c5632
Change-Id: I1922192819c9e1e0db12507c4580833529d6286b
TreeHugger Robot [Thu, 30 Mar 2017 18:19:43 +0000 (18:19 +0000)]
Merge "Add link speed to Wifi details page." into oc-dev
Stephen Chen [Thu, 30 Mar 2017 18:15:04 +0000 (18:15 +0000)]
Merge "Do not show progress bar when disabling wifi." into oc-dev
am:
555d12b427
Change-Id: I3f35dda59aaec348998dc86c2f7b7874917c6719
TreeHugger Robot [Thu, 30 Mar 2017 18:08:46 +0000 (18:08 +0000)]
Merge "Do not show progress bar when disabling wifi." into oc-dev
Robin Lee [Thu, 30 Mar 2017 18:06:45 +0000 (18:06 +0000)]
Merge "VPN: uncheck lockdown if always-on is off" into oc-dev am:
73455096d7
am:
a0e34f020a
Change-Id: Ic95e31908525fb12c83e010352260d42cc2738b0
Robin Lee [Thu, 30 Mar 2017 18:03:56 +0000 (18:03 +0000)]
Merge "VPN: uncheck lockdown if always-on is off" into oc-dev
am:
73455096d7
Change-Id: Idb17fffd05797c2c54bd823f2bcd6743b2d640fc
TreeHugger Robot [Thu, 30 Mar 2017 17:57:15 +0000 (17:57 +0000)]
Merge "VPN: uncheck lockdown if always-on is off" into oc-dev
Lei Yu [Thu, 30 Mar 2017 17:47:24 +0000 (17:47 +0000)]
Merge "Update string for battery main page" into oc-dev am:
dd0e0b4506
am:
ab315ddb4b
Change-Id: I3a76075bf98778a697d806cee180c432f8a45e39
Lei Yu [Thu, 30 Mar 2017 17:32:45 +0000 (17:32 +0000)]
Merge "Update string for battery main page" into oc-dev
am:
dd0e0b4506
Change-Id: I1eb0d3cf8859fe9c82d18a799312fe378319ad5a
Lei Yu [Thu, 30 Mar 2017 17:20:40 +0000 (17:20 +0000)]
Merge "Update string for battery main page" into oc-dev
Matthew Fritze [Thu, 30 Mar 2017 16:58:10 +0000 (16:58 +0000)]
Merge "Reserve full indexing for SearchFragment" into oc-dev am:
1261a679bf
am:
64142d2f7a
Change-Id: Ice26ec2570c0aede992078dab213d7f1576a87c3
Julia Reynolds [Thu, 30 Mar 2017 16:57:56 +0000 (16:57 +0000)]
Merge "Redirect zen mode suggestion" into oc-dev am:
42b16f2f08
am:
4be53f45ca
Change-Id: I29e70e705525b5ab22dde025ecbbe64d72389980
Matthew Fritze [Thu, 30 Mar 2017 16:51:04 +0000 (16:51 +0000)]
Merge "Reserve full indexing for SearchFragment" into oc-dev
am:
1261a679bf
Change-Id: Ia08fd77a634efd19a13982f1c4f89501e6a24c4f
Julia Reynolds [Thu, 30 Mar 2017 16:50:50 +0000 (16:50 +0000)]
Merge "Redirect zen mode suggestion" into oc-dev
am:
42b16f2f08
Change-Id: I330f11ba0a09de72ee24adacccb7a18ab2e2d613
TreeHugger Robot [Thu, 30 Mar 2017 16:48:52 +0000 (16:48 +0000)]
Merge "Reserve full indexing for SearchFragment" into oc-dev
Julia Reynolds [Thu, 30 Mar 2017 16:41:50 +0000 (16:41 +0000)]
Merge "Redirect zen mode suggestion" into oc-dev
OSDN Git Service
