Commit Graph

18891 Commits

Author SHA1 Message Date
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
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

Change-Id: I0d270d27a3f8b5050c9b14519bec16e2937ce12e
2017-06-16 19:13:22 +00: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
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

Change-Id: Ia234aa8a6e478ae7e5dac88867cef9297ff74ceb
2017-06-16 17:11:07 +00:00
Lei Yu
b275471725 Merge "Display anomaly in battery usage page" into oc-dr1-dev 2017-06-16 16:55:53 +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
Jian Zhou
2b7e3f228d Settings: Fix SparseArray null pointer issue in monkey issues
SparseArray null pointer causes monkey test exception, add a
protect for this.

Change-Id: Iade3148a846962875f5f38c5d2bf5631d0d9ac42

Bug: 62685823
2017-06-16 13:51:15 +08:00
TreeHugger Robot
edaf453a33 Merge "Remove some dead code" 2017-06-16 02:19:43 +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
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
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
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
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
Tony Mantler
a5ce7e3132 Merge "Use Settings.ACTION_ADD_ACCOUNT" 2017-06-14 18:07:14 +00:00
Julia Reynolds
ee4b6ba6ae Migrate from setting to NotificationManager.
Test: manual; changing settings and confirming with bugreport
Change-Id: I1595fc3ceca8cd31d5bece52dff75aebe29d2ae3
2017-06-14 11:34:47 -04:00
Kevin Chyn
ec102eb32e Merge "Move assist gestures settings to overlay" into oc-dr1-dev am: 6f365765f7
am: 36d4b81119

Change-Id: I789735e5c4c72b16597320b62b46ad2fbf46acc5
2017-06-14 02:00:37 +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
ab9e3eaba4 Merge "Replace showSoftInput with ImeAwareEditText.scheduleShowSoftInput" into oc-dr1-dev am: fc9622ef53
am: 4c2ef7c144

Change-Id: I8e38b190c0d28c763eb95e476ca21f0672a31727
2017-06-14 00:27:16 +00:00
jackqdyulei
68aaf66242 Merge "Add action active check for anomaly action." into oc-dr1-dev am: e7735b8d52
am: 010c9d9535

Change-Id: I5d7d02d5387b8d58d8ea6f158311c1aae659fe19
2017-06-13 23:58:14 +00:00
TreeHugger Robot
fc9622ef53 Merge "Replace showSoftInput with ImeAwareEditText.scheduleShowSoftInput" into oc-dr1-dev 2017-06-13 23:53:33 +00:00
Katsiaryna Naliuka
0092a5c676 Merge "Added support for external tiles to the lockscreen activity" into oc-dr1-dev am: 9871df58f1
am: 9922ec065d

Change-Id: Ib948ffa809eb64b9077f20e174d1e2b89ede38a0
2017-06-13 23:11:35 +00:00
jackqdyulei
1ad9be5623 Merge "Update dialogs for anomaly" into oc-dr1-dev am: d907b99d79
am: 0966eeb919

Change-Id: I9ac8bee459bdc7409e0c46112e5c59bb69032c50
2017-06-13 23:10:40 +00:00
TreeHugger Robot
e7735b8d52 Merge "Add action active check for anomaly action." into oc-dr1-dev 2017-06-13 22:36:06 +00:00
Tony Mantler
1c9e2f65a2 Use Settings.ACTION_ADD_ACCOUNT
Bug: 62586588
Test: No functional change
Change-Id: I01ffc240fe7299a6d5f08c390870eaf3ba0f4260
2017-06-13 15:16:50 -07:00
Katsiaryna Naliuka
9871df58f1 Merge "Added support for external tiles to the lockscreen activity" into oc-dr1-dev 2017-06-13 22:15:34 +00:00
Kevin Chyn
f475bc2fbe Move assist gestures settings to overlay
Bug: 37427306

Test: make -j RunSettingsRoboTests && manual testing of settings
Change-Id: If2b0ec9a966334a91f090051dee661011bfc0d70
2017-06-13 14:56:43 -07:00
Maurice Lam
d7c7c44d3c Merge "Allow skipping PIN setup screen" 2017-06-13 21:50:22 +00:00
TreeHugger Robot
d907b99d79 Merge "Update dialogs for anomaly" into oc-dr1-dev 2017-06-13 21:36:42 +00:00
jackqdyulei
9453e89aca Add action active check for anomaly action.
This cl adds the action active check for the following actions:
1. ForceStopAction: check whether app is stopped
2. BackgroundActivityAction: check whether background activity
is turned on

If related action is not active, we won't report anomaly
to users. Future cl will add active check for bluetooth anomaly.

Bug: 62452014
Test: RunSettingsRoboTests

Change-Id: Ib490227f4570accf8ca4840a99bf85a022c42a5b
2017-06-13 13:23:46 -07:00