Commit Graph

37294 Commits

Author SHA1 Message Date
Maurice Lam
9b8f36e359 Merge "Make confirm lock screen use the right theme" into oc-dr1-dev
am: 98a9d341c8

Change-Id: Iac233acde24c37fd7f93faba312bc5d894bb224d
2017-06-16 22:17:18 +00:00
TreeHugger Robot
98a9d341c8 Merge "Make confirm lock screen use the right theme" into oc-dr1-dev 2017-06-16 22:08:06 +00:00
Lei Yu
25371b152c Merge "Update wakelock detector" into oc-dr1-dev
am: e2530c2f62

Change-Id: Ib3e2aef02b5b3484ffbc43648210781d39e89a55
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
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
d6db6d8938 Merge "Cleanup unused WifiP2pSettings code in WifiSettings" am: cd1f7a3146 am: 27ca1272a5
am: 879fd4b406

Change-Id: Ie7b7de6ab3e9d8ebf13beffffd0ca0aa4026e8ea
2017-06-16 19:06:38 +00:00
Shinji Sogo
879fd4b406 Merge "Cleanup unused WifiP2pSettings code in WifiSettings" am: cd1f7a3146
am: 27ca1272a5

Change-Id: I70f81796a7c29c416729cc7fd7b4fd8150fdc981
2017-06-16 19:00:18 +00:00
Shinji Sogo
27ca1272a5 Merge "Cleanup unused WifiP2pSettings code in WifiSettings"
am: cd1f7a3146

Change-Id: I18adec05022abe4d96f3aac2e893a5b5cbc7f2dc
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
1522839283 Merge "Display anomaly in battery usage page" into oc-dr1-dev
am: b275471725

Change-Id: Ib9a7a971bdd3c9685287d25985f06f39507dbdad
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
3fb1655289 Merge "Update Night display icon in Settings" into oc-dr1-dev
am: ddd692cf1a

Change-Id: I1af8434bc68283f5579cdf01901022d292ba2a13
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
Tony Mak
caac960e1a Merge "Fix searching work app in settings" into oc-dr1-dev
am: e3d890eaae  -s ours

Change-Id: Ifbb300aa90cad12431121c380aa306d04dedb5bd
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
569a238509 Merge "Escape apostrophes in ConfirmCredential strings." into oc-dr1-dev
am: add67648c7

Change-Id: I2058ec725fb10fc0a8572237d5927f70b3d89525
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
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
ad168d2907 Fix searching work app in settings NO PARTIAL RERUN am: 5651e0f2ce -s ours
am: a59e02fd58

Change-Id: Idb771b9bca8e0e1d93dc9f9f8b9312bae33d9165
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  -s ours

Change-Id: I90afad3ac35c46c64e801631d36d24750a5858f4
2017-06-16 10:55:11 +00:00
Tony Mak
5d25a0c796 Fix searching work app in settings NO PARTIAL RERUN am: 5651e0f2ce
am: 80cdf176e9  -s ours

Change-Id: Iea2c278565436cde6cd1fb8d5c58f7b972c7c2e7
2017-06-16 10:55:11 +00:00
Maurice Lam
adb206fec5 Allow skipping PIN setup screen
am: 4c930fc2d5

Change-Id: I778a8a9d1d1ed98c91057357ec6ee9af6daa326c
2017-06-16 01:15:20 +00:00
Daniel Nishi
b088010d12 Add more sane multi-profile app attribution.
Due to issues w.r.t. attribution across multiple users, we originally
duplicated the previous implementation which zeroed out the sizes. This,
however, caused system bloat due to the change in how we calculate the
system size.

By attributing apps which do not exist in the primary profile to the
first user that shows up with it installed, we can avoid accidentally
attributing it to the system size.

Bug: 62623731
Test: Settings unittest & Settings robotest
Change-Id: I9514c9ecef62ea6270723f62e6bf27c69b75f180
2017-06-15 17:25:10 -07:00
Tony Mak
80cdf176e9 Fix searching work app in settings NO PARTIAL RERUN
am: 5651e0f2ce

Change-Id: Ib670fbde3997c8c6e984bb627bc305da7f235e2e
2017-06-15 22:29:04 +00: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
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
jackqdyulei
3fb054f3d3 Display anomaly in battery usage page
This cl adds a new parameter, mAnomalies, for
AdvancedPowerUsageDetail.

If it is null, fragment will start AnomalyLoader to detect anomaly.
If not null, just display the anomaly.

Bug: 36925180
Test: RunSettingsRoboTests

Change-Id: I572bc5954c1cdb210d18b6dbe1ab9dba25c0a61f
2017-06-15 10:44:34 -07:00
Charles He
22eacfeecb Escape apostrophes in ConfirmCredential strings.
Bug: 62648468
Test: none
Change-Id: Idbfa5c9fc1696e1145d2e33e3df89b5518a13c88
2017-06-15 10:57:23 +01:00
Android Build Merger (Role)
bb71287d3c Merge "Merge "Allow WifiSettings to show old APs on app resume." into oc-dev am: 683a7e2bf5 -s ours am: ea46967c2e -s ours" into oc-dr1-dev-plus-aosp 2017-06-15 06:45:48 +00:00
Sundeep Ghuman
e3dfeaf9c0 Merge "Allow WifiSettings to show old APs on app resume." into oc-dev am: 683a7e2bf5 -s ours
am: ea46967c2e  -s ours

Change-Id: I12005bef18a23f1aad2c1b5b9ee7982206426a5f
2017-06-15 06:45:21 +00:00
Sundeep Ghuman
51b31c5354 Merge "Allow WifiSettings to show old APs on app resume." into oc-dev am: 683a7e2bf5
am: 0c02e22c99  -s ours

Change-Id: Iea1015089c955056d319f5365c1fb8d07e7acb93
2017-06-15 06:45:20 +00:00
Sundeep Ghuman
ea46967c2e Merge "Allow WifiSettings to show old APs on app resume." into oc-dev
am: 683a7e2bf5  -s ours

Change-Id: I68959f0803cd714d540299ac916616a933594c00
2017-06-15 06:39:42 +00:00
Sundeep Ghuman
0c02e22c99 Merge "Allow WifiSettings to show old APs on app resume." into oc-dev
am: 683a7e2bf5

Change-Id: Id9ef9060ce76f96d36338e5ba4ddd0701b538a08
2017-06-15 06:39:40 +00:00
TreeHugger Robot
683a7e2bf5 Merge "Allow WifiSettings to show old APs on app resume." into oc-dev 2017-06-15 06:30:58 +00:00
Sundeep Ghuman
6ab460c354 Allow WifiSettings to show old APs on app resume.
am: 4ae59dde43

Change-Id: I57cb72fcdcbe98223ccda71f1ae6de2756b7ec08
2017-06-15 04:21:38 +00:00
Sundeep Ghuman
60b814ba43 Allow WifiSettings to show old APs on app resume.
If we do not have any recent scan results, show the previous APs from
when the app was last paused, by not triggering a force update.

Accompanying changes are also made in WifiTracker to prevent
onAccessPointsChanged callbacks from being invoked until the tracker
receives a new 'SCAN_RESULTS_AVAILABLE' broadcast (ag/2409026).

Bug: b/38212080
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
one minute later.

Change-Id: I4f9b2ec855e057e28235b0253ab42c6b4521bebc
Merged-In: I4f9b2ec855e057e28235b0253ab42c6b4521bebc
2017-06-14 19:07:05 -07:00
Sundeep Ghuman
4ae59dde43 Allow WifiSettings to show old APs on app resume.
MANUAL MERGE of ag/2398149 to avoid merge conflicts when trying to
submit to oc-dev.

If we do not have any recent scan results, show the previous APs from
when the app was last paused, by not triggering a force update.

Accompanying changes are also made in WifiTracker to prevent
onAccessPointsChanged callbacks from being invoked until the tracker
receives a new 'SCAN_RESULTS_AVAILABLE' broadcast (ag/2409026).

Bug: b/38212080
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
one minute later.

Change-Id: I4f9b2ec855e057e28235b0253ab42c6b4521bebc
2017-06-14 19:05:21 -07:00
Kevin Chyn
36d4b81119 Merge "Move assist gestures settings to overlay" into oc-dr1-dev
am: 6f365765f7

Change-Id: I23f3bdbcbd60c80842a51da61a16225252dc179c
2017-06-14 01:51:50 +00:00
Kevin Chyn
6f365765f7 Merge "Move assist gestures settings to overlay" into oc-dr1-dev 2017-06-14 01:43:48 +00:00
Tarandeep Singh
4c2ef7c144 Merge "Replace showSoftInput with ImeAwareEditText.scheduleShowSoftInput" into oc-dr1-dev
am: fc9622ef53

Change-Id: I4390c0d04e56726950b9a404e4d5fe6483d6b9ee
2017-06-14 00:06:44 +00:00
TreeHugger Robot
fc9622ef53 Merge "Replace showSoftInput with ImeAwareEditText.scheduleShowSoftInput" into oc-dr1-dev 2017-06-13 23:53:33 +00:00