Commit Graph

17139 Commits

Author SHA1 Message Date
jackqdyulei
34145705de 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
2017-04-21 11:00:50 -07:00
Daniel Nishi
ca32f1d354 Merge "Add EXTRA_FROM_STORAGE to photos gallery intent." into oc-dev am: bad8171d05
am: f3c3cd97ba

Change-Id: I41a99ae57dbd5abd1309f643831aa9d20e62836a
2017-04-21 17:25:35 +00:00
Daniel Nishi
f3c3cd97ba Merge "Add EXTRA_FROM_STORAGE to photos gallery intent." into oc-dev
am: bad8171d05

Change-Id: I63dde23276126e7d246b5b36bf201acb24e2f9af
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
Fan Zhang
0c6bd7efe7 Properly check wallpaper state before showing suggestion
The old check only considers static wallpaper. So if user set a dynamic
one we still think wallpaper is not set.

Change-Id: I3fa0908b29891cf7b90c24d5a63ce60d5985a70d
Fix: 34719455
Test: make RunSettingsRoboTests
2017-04-21 09:58:29 -07:00
Ajay Nadathur
872efe5914 Merge "Fingerprint suggestion should not be dismissed until fingerprint added" into oc-dev
am: 9e89d528f6

Change-Id: I1ee72cec3e831652d1bae451b8c43d9d8032c74d
2017-04-21 02:23:13 +00:00
jackqdyulei
949c116941 Merge "Include type service as type system" into oc-dev am: 72ca5b0bb2
am: aaaa4b4b42

Change-Id: I3d9b13c483fd7918f3f7b5858718c28cc77915ab
2017-04-21 02:00:12 +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

Change-Id: I74a9883ada03f26ea3e2d22c053958bacae87a2e
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
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
Xiangyu/Malcolm Chen
609f1256e5 Merge "Reset APN when doing network reset." 2017-04-21 00:07:34 +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
Fan Zhang
b61f945e8e 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
2017-04-20 15:52:12 -07: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
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
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
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
Matthew Fritze
3266e3d712 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
2017-04-20 11:11:20 -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
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
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
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
Sundeep Ghuman
ebde427ebb Merge "Fix scanning settings link clickability in Talkback mode." into oc-dev am: 2ba8f10717
am: 638a864cd5

Change-Id: I3a58f97a7a43902b90af33c265f079c756eead51
2017-04-20 01:16:57 +00:00