Fan Zhang
f1267ddbe1
Merge "Fix disable/force stop app button incorrect state." into oc-dev
...
am: 6190c159e8
2017-04-21 21:03:20 +00:00
TreeHugger Robot
25b6ef1604
Merge "Remove icons for setting items in app & notification screen" into oc-dev
2017-04-21 21:01:30 +00:00
TreeHugger Robot
6190c159e8
Merge "Fix disable/force stop app button incorrect state." into oc-dev
2017-04-21 21:00:33 +00:00
Marie Janssen
faa8c37da7
Bluetooth: Make pairing notification cancellable am: f8aaed9e1f
...
am: a4ad9d41f4
2017-04-21 20:37:52 +00:00
Marie Janssen
a4ad9d41f4
Bluetooth: Make pairing notification cancellable
...
am: f8aaed9e1f
2017-04-21 20:32:18 +00:00
jackqdyulei
da51747c46
Merge "Fix wrong voice call time in battery page" into oc-dev am: 057bd05420
...
am: 5e42c8e012
2017-04-21 20:29:17 +00:00
Marie Janssen
f8aaed9e1f
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 c79470d089
2017-04-21 20:19:20 +00:00
Matthew Fritze
4897eccd5d
Revert "Listen to brigtness updates to update brightness summary."
...
This reverts commit 83e2741bd7
2017-04-21 20:17:58 +00:00
jackqdyulei
5e42c8e012
Merge "Fix wrong voice call time in battery page" into oc-dev
...
am: 057bd05420
2017-04-21 20:17:47 +00:00
TreeHugger Robot
057bd05420
Merge "Fix wrong voice call time in battery page" into oc-dev
2017-04-21 20:04:08 +00:00
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
2017-04-21 19:22:25 +00:00
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
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
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
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
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
2017-04-21 02:23:13 +00:00
jackqdyulei
949c116941
Merge "Include type service as type system" into oc-dev am: 72ca5b0bb2
...
am: aaaa4b4b42
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
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
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
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
2017-04-21 01:08:44 +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
ff9ec983a5
Merge "Change "Cell standby" to "Mobile network standby"" into oc-dev am: 746eb9e14c
...
am: 31eb8cb3d1
2017-04-21 00:54:30 +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
23a5ec550c
Merge "Update security status icons." into oc-dev am: 52064f63f0
...
am: 9fbc10ada8
2017-04-21 00:32:59 +00:00
William Luh
9fbc10ada8
Merge "Update security status icons." into oc-dev
...
am: 52064f63f0
2017-04-21 00:26:18 +00:00
jackqdyulei
36b6669b08
Merge "Add connect string for bluetooth page" into oc-dev am: b172a9a1d9
...
am: c5196a2066
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
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
2017-04-20 23:28:00 +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
