Daniel Sheng
4380a8fd7c
Merge "Added Trust Agent suggestion category from SUW"
2017-04-21 19:36:41 +00:00
Marie Janssen
87c6aa7cc8
Merge "Bluetooth: Make pairing notification cancellable" am: 6c142b35b4
am: 28bbd5bacb
am: c7ad828691
...
am: f119ab31ad
Change-Id: Ic1c9bcbdd27d7e86f16e87e7f4b548ef86370856
2017-04-21 19:22:25 +00:00
Marie Janssen
f119ab31ad
Merge "Bluetooth: Make pairing notification cancellable" am: 6c142b35b4
am: 28bbd5bacb
...
am: c7ad828691
Change-Id: I1b6a63bdca7a104f993b9114f7c0da18c5e8df22
2017-04-21 18:54:11 +00:00
Marie Janssen
c7ad828691
Merge "Bluetooth: Make pairing notification cancellable" am: 6c142b35b4
...
am: 28bbd5bacb
Change-Id: I3669fab18c0cf2abffeba566580a04a8135ee7fc
2017-04-21 18:41:41 +00:00
Marie Janssen
28bbd5bacb
Merge "Bluetooth: Make pairing notification cancellable"
...
am: 6c142b35b4
Change-Id: If7266819da387d53d768e29511c184419a2f8fa5
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
278bea730d
Fake data to be 0B after clearing.
...
The data folder -technically- takes up 16kB of space. By faking it to be
0B immediately after clearing, we can get the UI to look right.
Change-Id: I65321a79fc3266f66f61909682132de176237fb1
Fixes: 34199891
Test: Settings robotest
2017-04-21 11:20:48 -07:00
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
Daniel Sheng
73ffcd55e8
Added Trust Agent suggestion category from SUW
...
Bug: 36513986
Test: make RunSettingsRoboTests
Change-Id: I3238864bfeee1601d735daf811898886baa2b204
2017-04-21 10:15:23 -07: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
c215b4ef7e
Merge "Fingerprint suggestion should not be dismissed until fingerprint added" into oc-dev am: 9e89d528f6
...
am: 872efe5914
Change-Id: I73553ed862ed9cbd98e8c21bdb69b5d254e6eac4
2017-04-21 02:33:18 +00: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
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
Fan Zhang
8ee8323add
Remove icons for setting items in app & notification screen
...
Change-Id: Iddc2008fcf434fdec124db376be0247462f9ff4e
Fix: 35917329
Test: visual
2017-04-20 17:10:39 -07: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
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
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