OSDN Git Service
Suprabh Shukla [Sat, 22 Apr 2017 02:31:44 +0000 (02:31 +0000)]
Merge "Updating strings for Install unknown apps" into oc-dev am:
008a9adef9
am:
063bd1d40c
Change-Id: Ic0c4afabdb2bf589f10e0176063e8ab79146cab2
Suprabh Shukla [Sat, 22 Apr 2017 02:29:13 +0000 (02:29 +0000)]
Merge "Updating strings for Install unknown apps" into oc-dev
am:
008a9adef9
Change-Id: Ic33d5e774d18ba15723c581b494e625665b73ecc
TreeHugger Robot [Sat, 22 Apr 2017 02:23:56 +0000 (02:23 +0000)]
Merge "Updating strings for Install unknown apps" into oc-dev
Ajay Panicker [Sat, 22 Apr 2017 01:56:42 +0000 (01:56 +0000)]
Merge "Add Bluetooth Pairing notifications to a channel" into oc-dev am:
8b09195f80
am:
344405d87a
Change-Id: I1b64ea9a1a35776c06ee3ab256031862b062f61a
Ajay Panicker [Sat, 22 Apr 2017 01:53:42 +0000 (01:53 +0000)]
Merge "Add Bluetooth Pairing notifications to a channel" into oc-dev
am:
8b09195f80
Change-Id: Iced885cd7195ed48920667ef96c0cbbdec587466
TreeHugger Robot [Sat, 22 Apr 2017 01:49:50 +0000 (01:49 +0000)]
Merge "Add Bluetooth Pairing notifications to a channel" into oc-dev
Matthew Fritze [Sat, 22 Apr 2017 01:02:39 +0000 (01:02 +0000)]
Merge "Remove duplicates between battery and display settings" into oc-dev am:
1c7e25d3b6
am:
a95fc0f05f -s ours
Change-Id: I52edd436dd1a4dd97e548993de8a786c3ff17f74
Matthew Fritze [Sat, 22 Apr 2017 00:59:40 +0000 (00:59 +0000)]
Merge "Remove duplicates between battery and display settings" into oc-dev
am:
1c7e25d3b6
Change-Id: I1e824de321f7d8eeb9fbcefb22048af0ae5109be
TreeHugger Robot [Sat, 22 Apr 2017 00:56:08 +0000 (00:56 +0000)]
Merge "Remove duplicates between battery and display settings" into oc-dev
Ajay Panicker [Fri, 21 Apr 2017 23:31:50 +0000 (16:31 -0700)]
Add Bluetooth Pairing notifications to a channel
Bug:
37531430
Test: Send a pairing request to DUT from remote phone
Change-Id: I2014b0aa3c4797cbf8e601003471372f4920d21d
TreeHugger Robot [Fri, 21 Apr 2017 22:07:13 +0000 (22:07 +0000)]
Merge "Revert "Listen to brigtness updates to update brightness summary.""
Suprabh Shukla [Fri, 21 Apr 2017 21:45:30 +0000 (21:45 +0000)]
Merge "Renaming intent action manage unknown sources" into oc-dev am:
d796fda4bf
am:
0bf520852d
Change-Id: I12c93a08b0e93b4e7d527a8cf60505ad5b73c6a5
Suprabh Shukla [Fri, 21 Apr 2017 21:32:02 +0000 (21:32 +0000)]
Merge "Renaming intent action manage unknown sources" into oc-dev
am:
d796fda4bf
Change-Id: I5b477a803bbfae04819abc6d9d8169781a134a99
TreeHugger Robot [Fri, 21 Apr 2017 21:22:05 +0000 (21:22 +0000)]
Merge "Renaming intent action manage unknown sources" into oc-dev
Suprabh Shukla [Wed, 19 Apr 2017 01:16:23 +0000 (18:16 -0700)]
Updating strings for Install unknown apps
Updating some strings for clarity based on ux review.
Test: Manual
Bug:
37362450
37362065
Change-Id: I26dd191d19ea8f3bd905c2e61ff77c4a2b796b3c
Suprabh Shukla [Thu, 20 Apr 2017 23:02:54 +0000 (16:02 -0700)]
Renaming intent action manage unknown sources
Test: gts-tradefed run gts -m GtsExternalSourcesTestCases
Bug:
37515311
Change-Id: I3ad4ae24b67c6e8e68024bf5e8f73bc6563c443a
Fan Zhang [Fri, 21 Apr 2017 21:08:00 +0000 (21:08 +0000)]
Merge "Remove icons for setting items in app & notification screen" into oc-dev am:
25b6ef1604
am:
63d9ad3dcc
Change-Id: I1676993390f14f45a0a73d31e0fc910fc5f24019
Fan Zhang [Fri, 21 Apr 2017 21:07:39 +0000 (21:07 +0000)]
Merge "Fix disable/force stop app button incorrect state." into oc-dev am:
6190c159e8
am:
f1267ddbe1
Change-Id: Ia7b4cbf0d318e6e8f792c984d5869f31f9bcb29e
Fan Zhang [Fri, 21 Apr 2017 21:03:40 +0000 (21:03 +0000)]
Merge "Remove icons for setting items in app & notification screen" into oc-dev
am:
25b6ef1604
Change-Id: Idc68e9a24390842ca8232e2215a0173a33b84e2a
Fan Zhang [Fri, 21 Apr 2017 21:03:20 +0000 (21:03 +0000)]
Merge "Fix disable/force stop app button incorrect state." into oc-dev
am:
6190c159e8
Change-Id: I3aff38236f1eeb69779a53a1b971f83f69bc752d
TreeHugger Robot [Fri, 21 Apr 2017 21:01:29 +0000 (21:01 +0000)]
Merge "Remove icons for setting items in app & notification screen" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 21:00:29 +0000 (21:00 +0000)]
Merge "Fix disable/force stop app button incorrect state." into oc-dev
Marie Janssen [Fri, 21 Apr 2017 20:37:52 +0000 (20:37 +0000)]
Bluetooth: Make pairing notification cancellable am:
f8aaed9e1f
am:
a4ad9d41f4
Change-Id: I69692916cf9acd42c3f1cc1314df1ae708d204bd
Marie Janssen [Fri, 21 Apr 2017 20:32:18 +0000 (20:32 +0000)]
Bluetooth: Make pairing notification cancellable
am:
f8aaed9e1f
Change-Id: I79695ea20185854c971057f50e1853069d32b883
jackqdyulei [Fri, 21 Apr 2017 20:29:17 +0000 (20:29 +0000)]
Merge "Fix wrong voice call time in battery page" into oc-dev am:
057bd05420
am:
5e42c8e012
Change-Id: I6dd0bf0fe2b4229e05bdc8cb3031c24ce39f3355
Marie Janssen [Wed, 19 Apr 2017 20:47:07 +0000 (13:47 -0700)]
Bluetooth: Make pairing notification cancellable
Add actions to the pairing service notification so the user can dismiss
the pairing request if they want to.
Add some more information to logs when the user takes an action.
Reformat the file to match android style.
Test: pair from a remote device, dismiss using the new actions
Bug:
36036358
Change-Id: Ie110044bd4caf465f454452737000f01e7430925
(cherry picked from commit
c79470d0896f5ccfaa9a0e872dd396d47ec28daf)
Matthew Fritze [Fri, 21 Apr 2017 20:17:58 +0000 (20:17 +0000)]
Revert "Listen to brigtness updates to update brightness summary."
This reverts commit
83e2741bd7a81fa584b5df46c3d2cf55a5ff029f.
Change-Id: I93e2cf00ac5ffce7bd4e5951dcbe19c4189ffafd
jackqdyulei [Fri, 21 Apr 2017 20:17:47 +0000 (20:17 +0000)]
Merge "Fix wrong voice call time in battery page" into oc-dev
am:
057bd05420
Change-Id: Id1d1c6755333251fa09378815a62211637d939c0
TreeHugger Robot [Fri, 21 Apr 2017 20:04:07 +0000 (20:04 +0000)]
Merge "Fix wrong voice call time in battery page" into oc-dev
Daniel Sheng [Fri, 21 Apr 2017 19:36:40 +0000 (19:36 +0000)]
Merge "Added Trust Agent suggestion category from SUW"
Marie Janssen [Fri, 21 Apr 2017 19:22:25 +0000 (19:22 +0000)]
Merge "Bluetooth: Make pairing notification cancellable" am:
6c142b35b4 am:
28bbd5bacb am:
c7ad828691
am:
f119ab31ad
Change-Id: Ic1c9bcbdd27d7e86f16e87e7f4b548ef86370856
Marie Janssen [Fri, 21 Apr 2017 18:54:11 +0000 (18:54 +0000)]
Merge "Bluetooth: Make pairing notification cancellable" am:
6c142b35b4 am:
28bbd5bacb
am:
c7ad828691
Change-Id: I1b6a63bdca7a104f993b9114f7c0da18c5e8df22
Marie Janssen [Fri, 21 Apr 2017 18:41:41 +0000 (18:41 +0000)]
Merge "Bluetooth: Make pairing notification cancellable" am:
6c142b35b4
am:
28bbd5bacb
Change-Id: I3669fab18c0cf2abffeba566580a04a8135ee7fc
Marie Janssen [Fri, 21 Apr 2017 18:38:40 +0000 (18:38 +0000)]
Merge "Bluetooth: Make pairing notification cancellable"
am:
6c142b35b4
Change-Id: If7266819da387d53d768e29511c184419a2f8fa5
Treehugger Robot [Fri, 21 Apr 2017 18:31:44 +0000 (18:31 +0000)]
Merge "Bluetooth: Make pairing notification cancellable"
jackqdyulei [Thu, 20 Apr 2017 16:48:02 +0000 (09:48 -0700)]
Fix wrong voice call time in battery page
The voice call is belong to DrainType.PHONE, which is not an app.
This cl stop using method in BatteryUtils to calculate the time, since
that method should only be used for DrainType.APP
Bug:
37402819
Test: RunSettingsRoboTests
Change-Id: I3aa7366401e54df87ffe913af0dcb1bcd5abf110
Daniel Nishi [Fri, 21 Apr 2017 17:25:35 +0000 (17:25 +0000)]
Merge "Add EXTRA_FROM_STORAGE to photos gallery intent." into oc-dev am:
bad8171d05
am:
f3c3cd97ba
Change-Id: I41a99ae57dbd5abd1309f643831aa9d20e62836a
Daniel Nishi [Fri, 21 Apr 2017 17:22:07 +0000 (17:22 +0000)]
Merge "Add EXTRA_FROM_STORAGE to photos gallery intent." into oc-dev
am:
bad8171d05
Change-Id: I63dde23276126e7d246b5b36bf201acb24e2f9af
Daniel Nishi [Fri, 21 Apr 2017 17:18:04 +0000 (17:18 +0000)]
Merge "Add EXTRA_FROM_STORAGE to photos gallery intent." into oc-dev
Daniel Sheng [Fri, 21 Apr 2017 17:15:23 +0000 (10:15 -0700)]
Added Trust Agent suggestion category from SUW
Bug:
36513986
Test: make RunSettingsRoboTests
Change-Id: I3238864bfeee1601d735daf811898886baa2b204
Ajay Nadathur [Fri, 21 Apr 2017 02:33:18 +0000 (02:33 +0000)]
Merge "Fingerprint suggestion should not be dismissed until fingerprint added" into oc-dev am:
9e89d528f6
am:
872efe5914
Change-Id: I73553ed862ed9cbd98e8c21bdb69b5d254e6eac4
Ajay Nadathur [Fri, 21 Apr 2017 02:23:13 +0000 (02:23 +0000)]
Merge "Fingerprint suggestion should not be dismissed until fingerprint added" into oc-dev
am:
9e89d528f6
Change-Id: I1ee72cec3e831652d1bae451b8c43d9d8032c74d
jackqdyulei [Fri, 21 Apr 2017 02:00:12 +0000 (02:00 +0000)]
Merge "Include type service as type system" into oc-dev am:
72ca5b0bb2
am:
aaaa4b4b42
Change-Id: I3d9b13c483fd7918f3f7b5858718c28cc77915ab
TreeHugger Robot [Fri, 21 Apr 2017 01:56:57 +0000 (01:56 +0000)]
Merge "Fingerprint suggestion should not be dismissed until fingerprint added" into oc-dev
jackqdyulei [Fri, 21 Apr 2017 01:54:11 +0000 (01:54 +0000)]
Merge "Include type service as type system" into oc-dev
am:
72ca5b0bb2
Change-Id: I74a9883ada03f26ea3e2d22c053958bacae87a2e
TreeHugger Robot [Fri, 21 Apr 2017 01:45:28 +0000 (01:45 +0000)]
Merge "Include type service as type system" into oc-dev
Fan Zhang [Fri, 21 Apr 2017 01:42:34 +0000 (01:42 +0000)]
Merge "Remove deep link to app store from app header." into oc-dev am:
8d01d48672
am:
2c8649f641
Change-Id: If6f87a8b3c7ac989a83dd4518354658e42669ef0
Fan Zhang [Fri, 21 Apr 2017 01:40:34 +0000 (01:40 +0000)]
Merge "Remove deep link to app store from app header." into oc-dev
am:
8d01d48672
Change-Id: I984df5f918fd0f5cafb5fc73c7edc3ca054c4dc9
TreeHugger Robot [Fri, 21 Apr 2017 01:36:19 +0000 (01:36 +0000)]
Merge "Remove deep link to app store from app header." into oc-dev
Fan Zhang [Fri, 21 Apr 2017 01:08:44 +0000 (01:08 +0000)]
Merge "Bidi wrap keyboard names before displaying them." into oc-dev am:
b8d6222e23
am:
6a2fa09ff4
Change-Id: Ic185accac95ae48dd5f1a1e184b438db9920550a
Fan Zhang [Fri, 21 Apr 2017 01:06:16 +0000 (01:06 +0000)]
Merge "Bidi wrap keyboard names before displaying them." into oc-dev
am:
b8d6222e23
Change-Id: I46d9cc46789d193d13cdb64f0cccd65dbb1e727f
TreeHugger Robot [Fri, 21 Apr 2017 01:02:34 +0000 (01:02 +0000)]
Merge "Bidi wrap keyboard names before displaying them." into oc-dev
jackqdyulei [Fri, 21 Apr 2017 00:54:30 +0000 (00:54 +0000)]
Merge "Change "Cell standby" to "Mobile network standby"" into oc-dev am:
746eb9e14c
am:
31eb8cb3d1
Change-Id: Iccf0f71f027d378982fb0f604f9c4d2b2534144e
jackqdyulei [Fri, 21 Apr 2017 00:53:01 +0000 (00:53 +0000)]
Merge "Change "Cell standby" to "Mobile network standby"" into oc-dev
am:
746eb9e14c
Change-Id: I91366082ac7d86e9b74f22a5689682874c718f91
TreeHugger Robot [Fri, 21 Apr 2017 00:45:15 +0000 (00:45 +0000)]
Merge "Change "Cell standby" to "Mobile network standby"" into oc-dev
William Luh [Fri, 21 Apr 2017 00:32:59 +0000 (00:32 +0000)]
Merge "Update security status icons." into oc-dev am:
52064f63f0
am:
9fbc10ada8
Change-Id: I952d7bab8a5f567aac8b8c62ef7aae4ed6066c84
William Luh [Fri, 21 Apr 2017 00:26:18 +0000 (00:26 +0000)]
Merge "Update security status icons." into oc-dev
am:
52064f63f0
Change-Id: I25c89c9f24428be537ec5d754be3710491e01b81
jackqdyulei [Fri, 21 Apr 2017 00:24:04 +0000 (00:24 +0000)]
Merge "Add connect string for bluetooth page" into oc-dev am:
b172a9a1d9
am:
c5196a2066
Change-Id: I04cc53d4578d1905e401a8d5ef4d4982da3c1601
TreeHugger Robot [Fri, 21 Apr 2017 00:16:29 +0000 (00:16 +0000)]
Merge "Update security status icons." into oc-dev
jackqdyulei [Fri, 21 Apr 2017 00:11:49 +0000 (00:11 +0000)]
Merge "Add connect string for bluetooth page" into oc-dev
am:
b172a9a1d9
Change-Id: I132704765b2f85d3c93557111167a0e5dbf6d8e6
Fan Zhang [Fri, 21 Apr 2017 00:05:27 +0000 (17:05 -0700)]
Remove icons for setting items in app & notification screen
Change-Id: Iddc2008fcf434fdec124db376be0247462f9ff4e
Fix:
35917329
Test: visual
Xiangyu/Malcolm Chen [Fri, 21 Apr 2017 00:07:32 +0000 (00:07 +0000)]
Merge "Reset APN when doing network reset."
TreeHugger Robot [Thu, 20 Apr 2017 23:47:00 +0000 (23:47 +0000)]
Merge "Add connect string for bluetooth page" into oc-dev
Anas Karbila [Thu, 20 Apr 2017 23:28:00 +0000 (23:28 +0000)]
Merge "Settings: PreviewPagerAdapter: copy the full theme" am:
b6bbbc91ca am:
aaf9fdc5cf am:
bffc5230f7
am:
cf5053a31f
Change-Id: I4d6ad57c0d469b445b5b1e8311ea5eda73f0cc5d
Anas Karbila [Thu, 20 Apr 2017 23:25:28 +0000 (23:25 +0000)]
Merge "Settings: PreviewPagerAdapter: copy the full theme" am:
b6bbbc91ca am:
aaf9fdc5cf
am:
bffc5230f7
Change-Id: I545673221d7218cbc8d8196ebb8714c6d822d51a
Anas Karbila [Thu, 20 Apr 2017 23:22:27 +0000 (23:22 +0000)]
Merge "Settings: PreviewPagerAdapter: copy the full theme" am:
b6bbbc91ca
am:
aaf9fdc5cf
Change-Id: I5d28e158cd1159ad7074cf596752f8cbe54fab1b
Anas Karbila [Thu, 20 Apr 2017 23:19:55 +0000 (23:19 +0000)]
Merge "Settings: PreviewPagerAdapter: copy the full theme"
am:
b6bbbc91ca
Change-Id: I083114a9c4658e8c02be0445bc0b54ba3b225217
Treehugger Robot [Thu, 20 Apr 2017 23:14:18 +0000 (23:14 +0000)]
Merge "Settings: PreviewPagerAdapter: copy the full theme"
Fan Zhang [Thu, 20 Apr 2017 22:10:46 +0000 (15:10 -0700)]
Fix disable/force stop app button incorrect state.
The LayoutPreference calls super.onBindPreview, which enables all
children views. This is usually fine because a Preference object has
just one click target. But the LayoutPreference can hold multiple click
targets so we should not force enable everything during every single
bind.
To fix this, we don't call super.onBind, and manually wire up
onClickListener and selectable/focusable state. Everything else from
super.onBind is useless to this preference type.
Change-Id: Ibb89f1be399311b9ee053733a050f04be6aa85e8
Fix:
37452204
Fix:
37538936
Fix:
35633637
Test: make RunSettingsRoboTests
Marie Janssen [Wed, 19 Apr 2017 20:47:07 +0000 (13:47 -0700)]
Bluetooth: Make pairing notification cancellable
Add actions to the pairing service notification so the user can dismiss
the pairing request if they want to.
Add some more information to logs when the user takes an action.
Reformat the file to match android style.
Test: pair from a remote device, dismiss using the new actions
Bug:
36036358
Change-Id: Ie110044bd4caf465f454452737000f01e7430925
Daniel Nishi [Thu, 20 Apr 2017 21:46:28 +0000 (14:46 -0700)]
Add EXTRA_FROM_STORAGE to photos gallery intent.
Change-Id: I050149f558df0de83e7139354ac54176d7ced162
Fixes:
36991234
Test: Settings robotest
TreeHugger Robot [Thu, 20 Apr 2017 21:21:53 +0000 (21:21 +0000)]
Merge "Import translations. DO NOT MERGE"
Sundeep Ghuman [Thu, 20 Apr 2017 20:58:13 +0000 (20:58 +0000)]
Merge "Revert "Force update APs when enabling wifi in WifiSettings."" into oc-dev am:
76ed3e5344
am:
e4d80f99a1
Change-Id: Ia6908c4211e3c4c872436bca7fdf0a7522db38a6
Sundeep Ghuman [Thu, 20 Apr 2017 20:52:45 +0000 (20:52 +0000)]
Merge "Revert "Force update APs when enabling wifi in WifiSettings."" into oc-dev
am:
76ed3e5344
Change-Id: I7541a423acd06f69fa944a9044a4768e62e76d68
Sundeep Ghuman [Thu, 20 Apr 2017 20:45:32 +0000 (20:45 +0000)]
Merge "Revert "Force update APs when enabling wifi in WifiSettings."" into oc-dev
Fan Zhang [Thu, 20 Apr 2017 20:45:23 +0000 (13:45 -0700)]
Remove deep link to app store from app header.
The link doesn't actually work and uses wrong icon. There is a working
version at the app info screen already.
Change-Id: I16890bd66e095c3185e12d604d8daba5036ab24c
Fix:
37544209
Test: robotests
Anas Karbila [Thu, 20 Apr 2017 12:44:13 +0000 (21:44 +0900)]
Settings: PreviewPagerAdapter: copy the full theme
getThemeResId() returns the theme resource id which is defined inside AndroidManifest.xml.
If you set a theme via code (or add extra attributes using applyStyle method), the new theme will not be carried over.
Fix this by using setTo method with the context theme as argument.
Issue: https://issuetracker.google.com/
37543358
Test: set new theme via code (or add extra attributes using applyStyle method) and check if they are carried over to the configContext context
Change-Id: I82739fe47b2d5b2d05da4cb3759b630b10dc8c8f
Bill Yi [Thu, 20 Apr 2017 19:33:03 +0000 (12:33 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
37353209
Change-Id: I74ac083b61ca01dc00b2f2a5a8a442f8accb6f14
Daniel Nishi [Thu, 20 Apr 2017 18:54:28 +0000 (18:54 +0000)]
Merge "Gracefully handle null volumes after forgetting." into oc-dev am:
d6d6185167
am:
8f68658aef
Change-Id: I1033e51c837c9ed51e424435e8b49cac7eca51dc
Daniel Nishi [Thu, 20 Apr 2017 18:53:59 +0000 (18:53 +0000)]
Merge "Don't show warning dialog on opening ASM settings." into oc-dev am:
81f98a8fd5
am:
c7734f589e
Change-Id: Idc4760b31fa82f2e5387225f3da7c621a8decf4c
Phil Weaver [Thu, 20 Apr 2017 18:53:23 +0000 (18:53 +0000)]
Merge "Fix default for a11y shortcut setting" into oc-dev am:
5ef1135b9f
am:
bffd5636ff
Change-Id: I37e5b5651d3f1930791acf013bce10f9e5cb50ce
Ajay Nadathur [Thu, 13 Apr 2017 23:06:28 +0000 (16:06 -0700)]
Fingerprint suggestion should not be dismissed until fingerprint added
- Do not dismiss fingerprint suggestion until atleast one fingerprint is
added.
bug:
36578142
Test: robotest & manually verified.
Change-Id: I3151c9ae971666a0964be007103a9b7ad41de5ce
(cherry picked from commit
51ef801b3245f37680e1513d7f2b22aea02754ba)
Fan Zhang [Thu, 20 Apr 2017 18:01:32 +0000 (11:01 -0700)]
Bidi wrap keyboard names before displaying them.
This is needed because keyboard names can contain characters from mixed
locale. Without Bidi wrapping the labels will be garbled and not
readable.
Change-Id: I47668a65d7bef8828ad0424097834929ec12700d
Fix:
37353900
Test: make RunSettingsRoboTests
Matthew Fritze [Tue, 11 Apr 2017 20:22:40 +0000 (13:22 -0700)]
Remove duplicates between battery and display settings
Change preference keys of duplicate settings between
display and battery to avoid duplication in search.
Bug:
33701673
Test: make RunSettingsRoboTests
Change-Id: Iaad52f16ce33c478c64bcec656cc8edbe0c97283
Merged-In: I56c82e9e7f163d345065ca478849de9b14c173fe
Malcolm Chen [Wed, 19 Apr 2017 23:12:45 +0000 (16:12 -0700)]
Reset APN when doing network reset.
Bug:
35956245
Test: Manual test
Change-Id: Iadb00c55d41a51204be1678bb77c2367e1bcb775
Sundeep Ghuman [Thu, 20 Apr 2017 17:49:20 +0000 (17:49 +0000)]
Revert "Force update APs when enabling wifi in WifiSettings."
This reverts commit
1c231d32b125f368e29fc30b6edebc81b9db7623.
Reason for revert: b/
37530557 - ANR in Settings due to deadlock
Change-Id: I85d70aa957dca76189b7600d7b39cb9a09437e91
jackqdyulei [Thu, 20 Apr 2017 17:30:50 +0000 (10:30 -0700)]
Add connect string for bluetooth page
Bug:
37365660
Test: Build
Change-Id: I964b9d25e892666c51dbd98e499be23fe93007ec
Daniel Nishi [Thu, 20 Apr 2017 17:18:27 +0000 (17:18 +0000)]
Merge "Gracefully handle null volumes after forgetting." into oc-dev
am:
d6d6185167
Change-Id: I55411a233e2dfb6239d4d2f8e17f32dc2c9fdc73
Daniel Nishi [Thu, 20 Apr 2017 17:05:28 +0000 (17:05 +0000)]
Merge "Gracefully handle null volumes after forgetting." into oc-dev
Daniel Nishi [Thu, 20 Apr 2017 17:04:50 +0000 (17:04 +0000)]
Merge "Don't show warning dialog on opening ASM settings." into oc-dev
am:
81f98a8fd5
Change-Id: I70516ed0b6bbc7720d3da33461fed52a0aa8adda
Phil Weaver [Thu, 20 Apr 2017 17:04:28 +0000 (17:04 +0000)]
Merge "Fix default for a11y shortcut setting" into oc-dev
am:
5ef1135b9f
Change-Id: Ifd07d03a81c62e6f82afec9cb964bc9bc007a54e
jackqdyulei [Thu, 20 Apr 2017 16:59:28 +0000 (09:59 -0700)]
Change "Cell standby" to "Mobile network standby"
Bug:
37356060
Test: Build
Change-Id: I2c726a7f31ae37cf0a31b76e2a99d9c5735692fe
Daniel Nishi [Thu, 20 Apr 2017 16:55:28 +0000 (16:55 +0000)]
Merge "Don't show warning dialog on opening ASM settings." into oc-dev
Gustav Sennton [Thu, 20 Apr 2017 16:37:22 +0000 (16:37 +0000)]
Merge "Remove WebView MultiProcess Developer Option." into oc-dev am:
ae72f1eeef
am:
b54f96015f
Change-Id: I6dc23db7a2043310860e56d7f5aa0f591f2813ce
Lenka Trochtova [Thu, 20 Apr 2017 16:36:46 +0000 (16:36 +0000)]
Check for user restrictions disallowing BT in BluetoothEnabler. am:
363b3303c0
am:
33707767be
Change-Id: I102ee434e7d8f2931f3cdedffdbb6955b0b8d897
Gustav Sennton [Thu, 20 Apr 2017 16:04:02 +0000 (16:04 +0000)]
Merge "Remove WebView MultiProcess Developer Option." into oc-dev
am:
ae72f1eeef
Change-Id: I93b5db79f458b8808935f0d005e3a5631d96e496
Lenka Trochtova [Thu, 20 Apr 2017 16:03:26 +0000 (16:03 +0000)]
Check for user restrictions disallowing BT in BluetoothEnabler.
am:
363b3303c0
Change-Id: I6c85b31a44930e174a8caff04696d70884fc1dbc
Phil Weaver [Thu, 20 Apr 2017 14:52:22 +0000 (14:52 +0000)]
Merge "Fix default for a11y shortcut setting" into oc-dev
TreeHugger Robot [Thu, 20 Apr 2017 12:59:31 +0000 (12:59 +0000)]
Merge "Remove WebView MultiProcess Developer Option." into oc-dev
Gustav Sennton [Fri, 7 Apr 2017 13:20:42 +0000 (14:20 +0100)]
Remove WebView MultiProcess Developer Option.
Now that MultiProcess WebView is enabled by default we can remove the
Developer Option that lets users choose whether to enable MultiProcess
for WebView.
Bug:
36513859
Test: Ensure the WebView MultiProcess Dev Setting no longer exists.
Change-Id: Ib2eab3831b5d8b56daeaf4c7a06337075804a1d4
OSDN Git Service
