Commit Graph

37047 Commits

Author SHA1 Message Date
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
TreeHugger Robot
86e1ee948a Merge "Add divider line below "see all apps" preference" 2017-06-15 23:09:29 +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
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
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
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
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
Fan Zhang
e6ee3788cc Update string for reset screen
Change-Id: Ia36b5011f3a0effa91e07bd6fd0f90c6ee742877
Fix: 62265094
Test: manual
2017-06-14 11:43:05 -07:00
Tony Mantler
a5ce7e3132 Merge "Use Settings.ACTION_ADD_ACCOUNT" 2017-06-14 18:07:14 +00: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
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
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
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
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
jackqdyulei
010c9d9535 Merge "Add action active check for anomaly action." into oc-dr1-dev
am: e7735b8d52

Change-Id: I01b51abb73fdc39597388878a846266c339815e2
2017-06-13 22:43:26 +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
Katsiaryna Naliuka
9922ec065d Merge "Added support for external tiles to the lockscreen activity" into oc-dr1-dev
am: 9871df58f1

Change-Id: I0f5e5069ff4a69004dce46921f894cde9d4d854f
2017-06-13 22:22:13 +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
jackqdyulei
0966eeb919 Merge "Update dialogs for anomaly" into oc-dr1-dev
am: d907b99d79

Change-Id: Icb92d38004bbbc109e7867638528bc7d80b9ac29
2017-06-13 21:48:51 +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
TreeHugger Robot
0c69b5bea9 Merge "ActivityPicker shouldn't grant permissions." 2017-06-13 19:27:50 +00:00
Tony Mak
3bef8ce30a 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

Change-Id: I333372699b263d02cc4083289dc746c7aacd414d
2017-06-13 18:11:30 +01:00