Lei Yu
69050d2bda
Merge "Update wakelock detector" into oc-dr1-dev am: e2530c2f62
...
am: 25371b152c
2017-06-16 21:12:21 +00:00
Lei Yu
25371b152c
Merge "Update wakelock detector" into oc-dr1-dev
...
am: e2530c2f62
2017-06-16 20:52:09 +00:00
jackqdyulei
837200041f
Move "Received files" in BluetoothSettings
...
Move it from menu to preference
Also clean up the code about menu since there is no menu anymore
in BluetoothSettings
Bug: 35876447
Test: RunSettingsRoboTests
Change-Id: I4a3821595a0cc75382f1cf74bcafb3ecc44cc178
2017-06-16 13:45:46 -07:00
Lei Yu
e2530c2f62
Merge "Update wakelock detector" into oc-dr1-dev
2017-06-16 20:30:37 +00:00
Maurice Lam
f3c5b4d3eb
Make Accessibility settings a SUW suggestion
...
Make it a suggestion so that SUW can show it during deferred setup
Test: Manual
Bug: 38506169
Change-Id: I03d5d0d7c2e5168b8d3ccccedce74620675865b8
2017-06-16 13:20:54 -07:00
Fan Zhang
5d811c40d3
Hide app info button from app notification settings header
...
Change-Id: I10803e78fe4f30c2d84ec795c343ed660aab7762
Bug: 62708686
Test: visual and runtest --path AppNotificationSettingsTest.java
2017-06-16 13:12:44 -07:00
Maurice Lam
846172564e
Make confirm lock screen use the right theme
...
Test: cd tests/robotests && mma
Bug: 62348472
Change-Id: Ie05c2e6adba8450a1092f0fefcad6b003398de7d
2017-06-16 13:02:36 -07:00
Shinji Sogo
1bed022001
Merge "Cleanup unused WifiP2pSettings code in WifiSettings" am: cd1f7a3146 am: 27ca1272a5 am: 879fd4b406
...
am: d6db6d8938
2017-06-16 19:13:22 +00:00
Shinji Sogo
d6db6d8938
Merge "Cleanup unused WifiP2pSettings code in WifiSettings" am: cd1f7a3146 am: 27ca1272a5
...
am: 879fd4b406
2017-06-16 19:06:38 +00:00
Shinji Sogo
879fd4b406
Merge "Cleanup unused WifiP2pSettings code in WifiSettings" am: cd1f7a3146
...
am: 27ca1272a5
2017-06-16 19:00:18 +00:00
Shinji Sogo
27ca1272a5
Merge "Cleanup unused WifiP2pSettings code in WifiSettings"
...
am: cd1f7a3146
2017-06-16 18:53:50 +00:00
Treehugger Robot
cd1f7a3146
Merge "Cleanup unused WifiP2pSettings code in WifiSettings"
2017-06-16 18:41:42 +00:00
Lei Yu
bc723ba161
Merge "Display anomaly in battery usage page" into oc-dr1-dev am: b275471725
...
am: 1522839283
2017-06-16 17:11:07 +00:00
Lei Yu
1522839283
Merge "Display anomaly in battery usage page" into oc-dr1-dev
...
am: b275471725
2017-06-16 17:06:37 +00:00
Lei Yu
b275471725
Merge "Display anomaly in battery usage page" into oc-dr1-dev
2017-06-16 16:55:53 +00:00
Christine Franks
0adb62176d
Merge "Update Night display icon in Settings" into oc-dr1-dev am: ddd692cf1a
...
am: 3fb1655289
2017-06-16 14:47:57 +00:00
Christine Franks
3fb1655289
Merge "Update Night display icon in Settings" into oc-dr1-dev
...
am: ddd692cf1a
2017-06-16 14:43:56 +00:00
Christine Franks
ddd692cf1a
Merge "Update Night display icon in Settings" into oc-dr1-dev
2017-06-16 14:36:12 +00:00
Bill Yi
251cbcbcc5
Import translations. DO NOT MERGE
...
Change-Id: I3f7cec1865c8447d601b0d369de105da3fc7afa1
Auto-generated-cl: translation import
2017-06-16 07:12:33 -07:00
Bill Yi
76d55da74b
Import translations. DO NOT MERGE
...
Change-Id: I1c041b74f7d78f0b69a4c8553118ed069393586e
Auto-generated-cl: translation import
2017-06-16 07:00:00 -07:00
Bill Yi
4d29fa9938
Import translations. DO NOT MERGE
...
Change-Id: I0774e86c6160591d1048a8f60c74d29aecaa8c9f
Auto-generated-cl: translation import
2017-06-16 06:33:12 -07:00
Tony Mak
d1e089b6c3
Merge "Fix searching work app in settings" into oc-dr1-dev am: e3d890eaae -s ours
...
am: caac960e1a
2017-06-16 13:06:23 +00:00
Tony Mak
caac960e1a
Merge "Fix searching work app in settings" into oc-dr1-dev
...
am: e3d890eaae
2017-06-16 13:01:51 +00:00
TreeHugger Robot
e3d890eaae
Merge "Fix searching work app in settings" into oc-dr1-dev
2017-06-16 12:55:40 +00:00
Charles He
4e9713fc96
Merge "Escape apostrophes in ConfirmCredential strings." into oc-dr1-dev am: add67648c7
...
am: 569a238509
2017-06-16 11:49:14 +00:00
Charles He
569a238509
Merge "Escape apostrophes in ConfirmCredential strings." into oc-dr1-dev
...
am: add67648c7
2017-06-16 11:44:42 +00:00
Charles He
add67648c7
Merge "Escape apostrophes in ConfirmCredential strings." into oc-dr1-dev
2017-06-16 11:36:07 +00:00
Tony Mak
6ae20193e0
Merge "Fix searching work app in settings NO PARTIAL RERUN am: 5651e0f2ce -s ours am: a59e02fd58" into oc-dr1-dev-plus-aosp
...
am: 41a66cccc1
2017-06-16 11:03:45 +00:00
Tony Mak
eaa186de55
Merge "Fix searching work app in settings" into oc-dr1-dev-plus-aosp
...
am: 248cdec3e2
2017-06-16 11:03:13 +00:00
Android Build Merger (Role)
41a66cccc1
Merge "Fix searching work app in settings NO PARTIAL RERUN am: 5651e0f2ce -s ours am: a59e02fd58" into oc-dr1-dev-plus-aosp
2017-06-16 10:59:26 +00:00
TreeHugger Robot
248cdec3e2
Merge "Fix searching work app in settings" into oc-dr1-dev-plus-aosp
2017-06-16 10:59:23 +00:00
Tony Mak
8a92db2487
Fix searching work app in settings NO PARTIAL RERUN am: 5651e0f2ce am: 80cdf176e9 -s ours
...
am: 5d25a0c796
2017-06-16 10:59:13 +00:00
Tony Mak
ad168d2907
Fix searching work app in settings NO PARTIAL RERUN am: 5651e0f2ce -s ours
...
am: a59e02fd58
2017-06-16 10:59:11 +00:00
Tony Mak
c96bbcff90
Fix searching work app in settings
...
Test: m -j RunSettingsRoboTests
Test: Observe search result with badged icon and showing work app info
when tapping on it.
Test: personal app search result is still working
Test: Non app search result is working
Fix: 62366873
Merged-in: I333372699b263d02cc4083289dc746c7aacd414d
Change-Id: I333372699b263d02cc4083289dc746c7aacd414d
(cherry picked from commit 3bef8ce30a
2017-06-16 10:56:11 +00:00
Tony Mak
9f3f5f4fed
Fix searching work app in settings
...
Test: m -j RunSettingsRoboTests
Test: Observe search result with badged icon and showing work app info
when tapping on it.
Test: personal app search result is still working
Test: Non app search result is working
Fix: 62366873
Merged-in: I333372699b263d02cc4083289dc746c7aacd414d
Change-Id: I333372699b263d02cc4083289dc746c7aacd414d
(cherry picked from commit 3bef8ce30a
2017-06-16 10:55:49 +00:00
Tony Mak
a59e02fd58
Fix searching work app in settings NO PARTIAL RERUN
...
am: 5651e0f2ce
2017-06-16 10:55:11 +00:00
Tony Mak
5d25a0c796
Fix searching work app in settings NO PARTIAL RERUN am: 5651e0f2ce
...
am: 80cdf176e9
2017-06-16 10:55:11 +00:00
TreeHugger Robot
edaf453a33
Merge "Remove some dead code"
2017-06-16 02:19:43 +00:00
Maurice Lam
2d33b58e7c
Allow skipping PIN setup screen am: 4c930fc2d5
...
am: adb206fec5
2017-06-16 01:37:46 +00:00
TreeHugger Robot
af3e56bf45
Merge "May nfc_payments_how_it_works layout scrollable."
2017-06-16 01:32:18 +00:00
Maurice Lam
adb206fec5
Allow skipping PIN setup screen
...
am: 4c930fc2d5
2017-06-16 01:15:20 +00:00
TreeHugger Robot
86e1ee948a
Merge "Add divider line below "see all apps" preference"
2017-06-15 23:09:29 +00:00
Tony Mak
80cdf176e9
Fix searching work app in settings NO PARTIAL RERUN
...
am: 5651e0f2ce
2017-06-15 22:29:04 +00:00
Fan Zhang
b3eea29141
Remove some dead code
...
DashboardCategory is no longer rendered in the dashboard ui
Bug: 33861822
Test: make RunSettingsRoboTests existing tests still pass
Change-Id: I0479967b0099f76f8c0c7894643d50b655de2892
2017-06-15 14:58:25 -07:00
Christine Franks
d7f8fb25ff
Update Night display icon in Settings
...
Bug: 62658839
Test: Night display qs tile icon matches the icon used in the Night
display condition in Settings.
Change-Id: Ie319c9c94604dd630d5cf66f114a4de4397c2694
2017-06-15 14:28:20 -07:00
Maurice Lam
4c930fc2d5
Allow skipping PIN setup screen
...
So that setup wizard can show PIN option by default.
Test: Added Robolectric and instrumentation tests
Bug: 38509560
Change-Id: Id72744dd444b9b026ca5f28f230bae3bec254b2f
(cherry picked from commit 0f897d79f6
2017-06-15 20:23:21 +00:00
Tony Mak
5651e0f2ce
Fix searching work app in settings NO PARTIAL RERUN
...
Test: m -j RunSettingsRoboTests
Test: Observe search result with badged icon and showing work app info
when tapping on it.
Test: personal app search result is still working
Test: Non app search result is working
Fix: 62366873
Merged-in: I333372699b263d02cc4083289dc746c7aacd414d
Change-Id: I9c87345478f8df57b151927d8097cd8fd90fbe79
2017-06-15 19:48:44 +00:00
Fan Zhang
6cd558e595
Add divider line below "see all apps" preference
...
Change-Id: I94cbf47fd987a6ff4c4fabcc3124fae1f0438876
Fix: 62040104
Test: make RunSettingsRoboTests
2017-06-15 12:40:57 -07:00
jackqdyulei
c2baa2947a
Update wakelock detector
...
1. Use new API: getSubTimer().getTotalDurationMsLocked(), which returns
the wakelock running time in the background.
2. Add code to detect whether app is currently holding wakelocks, by
using API: getCurrentDurationMsLocked
Bug: 38233034
Test: RunSettingsRoboTests
Change-Id: If69b751acf5741ff8df2c905642c008a0a2b32e6
2017-06-15 11:37:28 -07:00
TreeHugger Robot
1386655155
Merge "Fix searching work app in settings"
2017-06-15 18:21:30 +00:00
