Commit Graph

37625 Commits

Author SHA1 Message Date
Tony Mak
d1e089b6c3 Merge "Fix searching work app in settings" into oc-dr1-dev am: e3d890eaae -s ours
am: caac960e1a  -s ours

Change-Id: I085d29824d90f74b5254f1efc4e18056d8814eb4
2017-06-16 13:06:23 +00: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
4e9713fc96 Merge "Escape apostrophes in ConfirmCredential strings." into oc-dr1-dev am: add67648c7
am: 569a238509

Change-Id: Ibae09f8a237e528aa9122d1fc26142e1ede10629
2017-06-16 11:49:14 +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
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  -s ours

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

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

Change-Id: I80bc94d6fff7eef72efb21392ce6c43ab0dd0ea6
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

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
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

Change-Id: I3ea2310633c0a01858a9f6d5cf04793bd40cd1b0
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

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
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

Change-Id: Ib670fbde3997c8c6e984bb627bc305da7f235e2e
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
TreeHugger Robot
1a1c3dd240 Merge "Update category for AccountDetailDashboardFragment." 2017-06-15 18:08:18 +00: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
Alison Cichowlas
d58d342967 Add separator line in notification settings,
above link to in-app settings.

Test: make RunSettingsRoboTests
Bug: 62543732
Change-Id: Ibf4f08c3d5feba90598d71f48c050e87ab9c3fdf
2017-06-15 15:11:19 +00:00
Charles He
22eacfeecb Escape apostrophes in ConfirmCredential strings.
Bug: 62648468
Test: none
Change-Id: Idbfa5c9fc1696e1145d2e33e3df89b5518a13c88
2017-06-15 10:57:23 +01:00
Sundeep Ghuman
08f1523ac7 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
am: bb71287d3c  -s ours

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

Change-Id: Idcb397b3de44fc56c92340032171cb80f46e86e6
2017-06-15 06:53:09 +00: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
f4bee3bb18 Allow WifiSettings to show old APs on app resume. am: 4ae59dde43
am: 6ab460c354

Change-Id: I1f3b7d405ea6e98d4cfa0a69b4468494f7867d4a
2017-06-15 04:24:26 +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
Doris Ling
b30ce6f7d7 Update category for AccountDetailDashboardFragment.
- use a separate category key for AccountDetailDashboardFragment instead
of sharing the same key with UserAndAccountDashboardFragment. Tile using
the original category will now show up at the top level account
setting, and tile using the new account detail detail will be displayed
under the specified account type.

Bug: 62446202
Test: make RunSettingsRoboTests
Change-Id: I06f781a20f24498bdc6207aef5469be9cd0c8e47
2017-06-14 15:25:24 -07:00
TreeHugger Robot
f357f78eef Merge "Refactor hotspot into a full page" 2017-06-14 21:33:22 +00:00
TreeHugger Robot
6437db830a Merge "Update string for reset screen" 2017-06-14 20:54:17 +00:00
Fan Zhang
78d5efdfea Refactor hotspot into a full page
- Deprecated WifiAPEnabler, and copied most of its logic into various
  controllers and WifiTetherSettings.
- Added tests

Fix: 37253404
Fix: 36181835

Test: make RunSettingsRoboTests
Change-Id: Iad994d61b694ad7f1113d045a3e7500eeaec178b
2017-06-14 12:32:44 -07:00