Fan Zhang
0969b8ff35
Merge "Remove deep link to app store from app header." into oc-dev am: 8d01d48672
...
am: 2c8649f641
Change-Id: If6f87a8b3c7ac989a83dd4518354658e42669ef0
2017-04-21 01:42:34 +00:00
Fan Zhang
2c8649f641
Merge "Remove deep link to app store from app header." into oc-dev
...
am: 8d01d48672
Change-Id: I984df5f918fd0f5cafb5fc73c7edc3ca054c4dc9
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
16ec5c85d3
Merge "Bidi wrap keyboard names before displaying them." into oc-dev am: b8d6222e23
...
am: 6a2fa09ff4
Change-Id: Ic185accac95ae48dd5f1a1e184b438db9920550a
2017-04-21 01:08:44 +00:00
Fan Zhang
6a2fa09ff4
Merge "Bidi wrap keyboard names before displaying them." into oc-dev
...
am: b8d6222e23
Change-Id: I46d9cc46789d193d13cdb64f0cccd65dbb1e727f
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
ff9ec983a5
Merge "Change "Cell standby" to "Mobile network standby"" into oc-dev am: 746eb9e14c
...
am: 31eb8cb3d1
Change-Id: Iccf0f71f027d378982fb0f604f9c4d2b2534144e
2017-04-21 00:54:30 +00:00
jackqdyulei
31eb8cb3d1
Merge "Change "Cell standby" to "Mobile network standby"" into oc-dev
...
am: 746eb9e14c
Change-Id: I91366082ac7d86e9b74f22a5689682874c718f91
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
23a5ec550c
Merge "Update security status icons." into oc-dev am: 52064f63f0
...
am: 9fbc10ada8
Change-Id: I952d7bab8a5f567aac8b8c62ef7aae4ed6066c84
2017-04-21 00:32:59 +00:00
William Luh
9fbc10ada8
Merge "Update security status icons." into oc-dev
...
am: 52064f63f0
Change-Id: I25c89c9f24428be537ec5d754be3710491e01b81
2017-04-21 00:26:18 +00:00
jackqdyulei
36b6669b08
Merge "Add connect string for bluetooth page" into oc-dev am: b172a9a1d9
...
am: c5196a2066
Change-Id: I04cc53d4578d1905e401a8d5ef4d4982da3c1601
2017-04-21 00:24:04 +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
Change-Id: I132704765b2f85d3c93557111167a0e5dbf6d8e6
2017-04-21 00:11:49 +00:00
Xiangyu/Malcolm Chen
609f1256e5
Merge "Reset APN when doing network reset."
2017-04-21 00:07:34 +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
a45574729b
Merge "Settings: PreviewPagerAdapter: copy the full theme" am: b6bbbc91ca
am: aaf9fdc5cf
am: bffc5230f7
...
am: cf5053a31f
Change-Id: I4d6ad57c0d469b445b5b1e8311ea5eda73f0cc5d
2017-04-20 23:28:00 +00:00
Anas Karbila
cf5053a31f
Merge "Settings: PreviewPagerAdapter: copy the full theme" am: b6bbbc91ca
am: aaf9fdc5cf
...
am: bffc5230f7
Change-Id: I545673221d7218cbc8d8196ebb8714c6d822d51a
2017-04-20 23:25:28 +00:00
Anas Karbila
bffc5230f7
Merge "Settings: PreviewPagerAdapter: copy the full theme" am: b6bbbc91ca
...
am: aaf9fdc5cf
Change-Id: I5d28e158cd1159ad7074cf596752f8cbe54fab1b
2017-04-20 23:22:27 +00:00
Anas Karbila
aaf9fdc5cf
Merge "Settings: PreviewPagerAdapter: copy the full theme"
...
am: b6bbbc91ca
Change-Id: I083114a9c4658e8c02be0445bc0b54ba3b225217
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
TreeHugger Robot
f06b38fbaa
Merge "Import translations. DO NOT MERGE"
2017-04-20 21:21:54 +00:00
Sundeep Ghuman
949306bde8
Merge "Revert "Force update APs when enabling wifi in WifiSettings."" into oc-dev am: 76ed3e5344
...
am: e4d80f99a1
Change-Id: Ia6908c4211e3c4c872436bca7fdf0a7522db38a6
2017-04-20 20:58:13 +00:00
Sundeep Ghuman
e4d80f99a1
Merge "Revert "Force update APs when enabling wifi in WifiSettings."" into oc-dev
...
am: 76ed3e5344
Change-Id: I7541a423acd06f69fa944a9044a4768e62e76d68
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
Bill Yi
1b978ba56d
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 37353209
Change-Id: I74ac083b61ca01dc00b2f2a5a8a442f8accb6f14
2017-04-20 12:33:03 -07:00
Daniel Nishi
4a150e75fd
Merge "Gracefully handle null volumes after forgetting." into oc-dev am: d6d6185167
...
am: 8f68658aef
Change-Id: I1033e51c837c9ed51e424435e8b49cac7eca51dc
2017-04-20 18:54:28 +00:00
Daniel Nishi
9ef9bfb6e9
Merge "Don't show warning dialog on opening ASM settings." into oc-dev am: 81f98a8fd5
...
am: c7734f589e
Change-Id: Idc4760b31fa82f2e5387225f3da7c621a8decf4c
2017-04-20 18:53:59 +00:00
Phil Weaver
debcceb6b4
Merge "Fix default for a11y shortcut setting" into oc-dev am: 5ef1135b9f
...
am: bffd5636ff
Change-Id: I37e5b5651d3f1930791acf013bce10f9e5cb50ce
2017-04-20 18:53:23 +00: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
Malcolm Chen
e9d96b7bc1
Reset APN when doing network reset.
...
Bug: 35956245
Test: Manual test
Change-Id: Iadb00c55d41a51204be1678bb77c2367e1bcb775
2017-04-20 10:58:32 -07:00
Sundeep Ghuman
b2bdc8f17b
Revert "Force update APs when enabling wifi in WifiSettings."
...
This reverts commit 1c231d32b1
.
Reason for revert: b/37530557 - ANR in Settings due to deadlock
Change-Id: I85d70aa957dca76189b7600d7b39cb9a09437e91
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
Change-Id: I55411a233e2dfb6239d4d2f8e17f32dc2c9fdc73
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
Change-Id: I70516ed0b6bbc7720d3da33461fed52a0aa8adda
2017-04-20 17:04:50 +00:00
Phil Weaver
bffd5636ff
Merge "Fix default for a11y shortcut setting" into oc-dev
...
am: 5ef1135b9f
Change-Id: Ifd07d03a81c62e6f82afec9cb964bc9bc007a54e
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
cad1d15586
Merge "Remove WebView MultiProcess Developer Option." into oc-dev am: ae72f1eeef
...
am: b54f96015f
Change-Id: I6dc23db7a2043310860e56d7f5aa0f591f2813ce
2017-04-20 16:37:22 +00:00
Lenka Trochtova
5cb384e625
Check for user restrictions disallowing BT in BluetoothEnabler. am: 363b3303c0
...
am: 33707767be
Change-Id: I102ee434e7d8f2931f3cdedffdbb6955b0b8d897
2017-04-20 16:36:46 +00:00
Gustav Sennton
b54f96015f
Merge "Remove WebView MultiProcess Developer Option." into oc-dev
...
am: ae72f1eeef
Change-Id: I93b5db79f458b8808935f0d005e3a5631d96e496
2017-04-20 16:04:02 +00:00
Lenka Trochtova
33707767be
Check for user restrictions disallowing BT in BluetoothEnabler.
...
am: 363b3303c0
Change-Id: I6c85b31a44930e174a8caff04696d70884fc1dbc
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
TreeHugger Robot
8e4abb13d0
Merge "Check for user restrictions disallowing BT in BluetoothEnabler."
2017-04-20 10:23:10 +00:00