Marie Janssen
f119ab31ad
Merge "Bluetooth: Make pairing notification cancellable" am: 6c142b35b4 am: 28bbd5bacb
...
am: c7ad828691
2017-04-21 18:54:11 +00:00
Marie Janssen
c7ad828691
Merge "Bluetooth: Make pairing notification cancellable" am: 6c142b35b4
...
am: 28bbd5bacb
2017-04-21 18:41:41 +00:00
Marie Janssen
28bbd5bacb
Merge "Bluetooth: Make pairing notification cancellable"
...
am: 6c142b35b4
2017-04-21 18:38:40 +00:00
Treehugger Robot
6c142b35b4
Merge "Bluetooth: Make pairing notification cancellable"
2017-04-21 18:31:46 +00:00
Daniel Nishi
f3c3cd97ba
Merge "Add EXTRA_FROM_STORAGE to photos gallery intent." into oc-dev
...
am: bad8171d05
2017-04-21 17:22:07 +00:00
Daniel Nishi
bad8171d05
Merge "Add EXTRA_FROM_STORAGE to photos gallery intent." into oc-dev
2017-04-21 17:18:05 +00:00
Ajay Nadathur
872efe5914
Merge "Fingerprint suggestion should not be dismissed until fingerprint added" into oc-dev
...
am: 9e89d528f6
2017-04-21 02:23:13 +00:00
TreeHugger Robot
9e89d528f6
Merge "Fingerprint suggestion should not be dismissed until fingerprint added" into oc-dev
2017-04-21 01:56:58 +00:00
jackqdyulei
aaaa4b4b42
Merge "Include type service as type system" into oc-dev
...
am: 72ca5b0bb2
2017-04-21 01:54:11 +00:00
TreeHugger Robot
72ca5b0bb2
Merge "Include type service as type system" into oc-dev
2017-04-21 01:45:28 +00:00
Fan Zhang
2c8649f641
Merge "Remove deep link to app store from app header." into oc-dev
...
am: 8d01d48672
2017-04-21 01:40:34 +00:00
TreeHugger Robot
8d01d48672
Merge "Remove deep link to app store from app header." into oc-dev
2017-04-21 01:36:19 +00:00
Fan Zhang
6a2fa09ff4
Merge "Bidi wrap keyboard names before displaying them." into oc-dev
...
am: b8d6222e23
2017-04-21 01:06:16 +00:00
TreeHugger Robot
b8d6222e23
Merge "Bidi wrap keyboard names before displaying them." into oc-dev
2017-04-21 01:02:35 +00:00
jackqdyulei
31eb8cb3d1
Merge "Change "Cell standby" to "Mobile network standby"" into oc-dev
...
am: 746eb9e14c
2017-04-21 00:53:01 +00:00
TreeHugger Robot
746eb9e14c
Merge "Change "Cell standby" to "Mobile network standby"" into oc-dev
2017-04-21 00:45:16 +00:00
William Luh
9fbc10ada8
Merge "Update security status icons." into oc-dev
...
am: 52064f63f0
2017-04-21 00:26:18 +00:00
TreeHugger Robot
52064f63f0
Merge "Update security status icons." into oc-dev
2017-04-21 00:16:30 +00:00
jackqdyulei
c5196a2066
Merge "Add connect string for bluetooth page" into oc-dev
...
am: b172a9a1d9
2017-04-21 00:11:49 +00:00
TreeHugger Robot
b172a9a1d9
Merge "Add connect string for bluetooth page" into oc-dev
2017-04-20 23:47:01 +00:00
Anas Karbila
cf5053a31f
Merge "Settings: PreviewPagerAdapter: copy the full theme" am: b6bbbc91ca am: aaf9fdc5cf
...
am: bffc5230f7
2017-04-20 23:25:28 +00:00
Anas Karbila
bffc5230f7
Merge "Settings: PreviewPagerAdapter: copy the full theme" am: b6bbbc91ca
...
am: aaf9fdc5cf
2017-04-20 23:22:27 +00:00
Anas Karbila
aaf9fdc5cf
Merge "Settings: PreviewPagerAdapter: copy the full theme"
...
am: b6bbbc91ca
2017-04-20 23:19:55 +00:00
Treehugger Robot
b6bbbc91ca
Merge "Settings: PreviewPagerAdapter: copy the full theme"
2017-04-20 23:14:20 +00:00
Marie Janssen
c79470d089
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
2017-04-20 15:22:20 -07:00
Daniel Nishi
9e107c5682
Add EXTRA_FROM_STORAGE to photos gallery intent.
...
Change-Id: I050149f558df0de83e7139354ac54176d7ced162
Fixes: 36991234
Test: Settings robotest
2017-04-20 14:46:28 -07:00
Sundeep Ghuman
e4d80f99a1
Merge "Revert "Force update APs when enabling wifi in WifiSettings."" into oc-dev
...
am: 76ed3e5344
2017-04-20 20:52:45 +00:00
Sundeep Ghuman
76ed3e5344
Merge "Revert "Force update APs when enabling wifi in WifiSettings."" into oc-dev
2017-04-20 20:45:33 +00:00
Fan Zhang
dcc0af50c6
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
2017-04-20 13:45:23 -07:00
Anas Karbila
ada2ea57b4
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
2017-04-20 20:11:00 +00:00
Ajay Nadathur
22ebdd9493
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 51ef801b32
2017-04-20 11:34:54 -07:00
Fan Zhang
b1bdf90c35
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
2017-04-20 11:23:14 -07:00
Sundeep Ghuman
b2bdc8f17b
Revert "Force update APs when enabling wifi in WifiSettings."
...
This reverts commit 1c231d32b1
2017-04-20 17:49:20 +00:00
jackqdyulei
2532438693
Add connect string for bluetooth page
...
Bug: 37365660
Test: Build
Change-Id: I964b9d25e892666c51dbd98e499be23fe93007ec
2017-04-20 10:30:50 -07:00
Daniel Nishi
8f68658aef
Merge "Gracefully handle null volumes after forgetting." into oc-dev
...
am: d6d6185167
2017-04-20 17:18:27 +00:00
Daniel Nishi
d6d6185167
Merge "Gracefully handle null volumes after forgetting." into oc-dev
2017-04-20 17:05:29 +00:00
Daniel Nishi
c7734f589e
Merge "Don't show warning dialog on opening ASM settings." into oc-dev
...
am: 81f98a8fd5
2017-04-20 17:04:50 +00:00
Phil Weaver
bffd5636ff
Merge "Fix default for a11y shortcut setting" into oc-dev
...
am: 5ef1135b9f
2017-04-20 17:04:28 +00:00
jackqdyulei
0a8e081855
Change "Cell standby" to "Mobile network standby"
...
Bug: 37356060
Test: Build
Change-Id: I2c726a7f31ae37cf0a31b76e2a99d9c5735692fe
2017-04-20 10:03:21 -07:00
Daniel Nishi
81f98a8fd5
Merge "Don't show warning dialog on opening ASM settings." into oc-dev
2017-04-20 16:55:29 +00:00
Gustav Sennton
b54f96015f
Merge "Remove WebView MultiProcess Developer Option." into oc-dev
...
am: ae72f1eeef
2017-04-20 16:04:02 +00:00
Lenka Trochtova
33707767be
Check for user restrictions disallowing BT in BluetoothEnabler.
...
am: 363b3303c0
2017-04-20 16:03:26 +00:00
Phil Weaver
5ef1135b9f
Merge "Fix default for a11y shortcut setting" into oc-dev
2017-04-20 14:52:23 +00:00
TreeHugger Robot
ae72f1eeef
Merge "Remove WebView MultiProcess Developer Option." into oc-dev
2017-04-20 12:59:34 +00:00
Gustav Sennton
c14e09bde0
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
2017-04-20 11:51:46 +01:00
Lenka Trochtova
363b3303c0
Check for user restrictions disallowing BT in BluetoothEnabler.
...
Test: make RunSettingsRoboTests -j40
Test: manual
BUG: 35596982
BUG: 32895313
Change-Id: Ie8f53b665a4aad4e6b17b20602cbe5502998d7a2
(cherry picked from commit 479d197196
2017-04-20 10:26:14 +00:00
Sundeep Ghuman
638a864cd5
Merge "Fix scanning settings link clickability in Talkback mode." into oc-dev
...
am: 2ba8f10717
2017-04-20 00:18:05 +00:00
William Luh
b03f19991f
Update security status icons.
...
Bug: 36847800
Test: make RunSettingsRoboTests
Also tested manually in app.
Change-Id: I5b7c043ed6af4c5a888710b582e8e69c6e3974c3
2017-04-19 17:06:46 -07:00
Daniel Nishi
aebda427d8
Merge "Change how we calculate system size." into oc-dev
...
am: 0b75d39312
2017-04-19 23:56:54 +00:00
Fan Zhang
feea41f6cc
Merge "Display and parse numbers properly in all locales" into oc-dev
...
am: 28e5271c61
2017-04-19 23:56:32 +00:00
