Sundeep Ghuman
f4bee3bb18
Allow WifiSettings to show old APs on app resume. am: 4ae59dde43
...
am: 6ab460c354
2017-06-15 04:24:26 +00:00
Sundeep Ghuman
6ab460c354
Allow WifiSettings to show old APs on app resume.
...
am: 4ae59dde43
2017-06-15 04:21:38 +00: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
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
2017-06-14 02:00:37 +00:00
Kevin Chyn
36d4b81119
Merge "Move assist gestures settings to overlay" into oc-dr1-dev
...
am: 6f365765f7
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
2017-06-14 00:27:16 +00:00
Tarandeep Singh
4c2ef7c144
Merge "Replace showSoftInput with ImeAwareEditText.scheduleShowSoftInput" into oc-dr1-dev
...
am: fc9622ef53
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
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
2017-06-13 23:11:35 +00:00
jackqdyulei
1ad9be5623
Merge "Update dialogs for anomaly" into oc-dr1-dev am: d907b99d79
...
am: 0966eeb919
2017-06-13 23:10:40 +00:00
jackqdyulei
010c9d9535
Merge "Add action active check for anomaly action." into oc-dr1-dev
...
am: e7735b8d52
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
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
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
Alison Cichowlas
7fe3dfc46d
Merge "Fix build - fix import of SettingsRobolectricTestRunner." into oc-dr1-dev am: 39efd4ec44
...
am: 8421bc0d29
2017-06-13 11:20:39 +00:00
Alison Cichowlas
8421bc0d29
Merge "Fix build - fix import of SettingsRobolectricTestRunner." into oc-dr1-dev
...
am: 39efd4ec44
2017-06-13 11:17:07 +00:00
Alison Cichowlas
39efd4ec44
Merge "Fix build - fix import of SettingsRobolectricTestRunner." into oc-dr1-dev
2017-06-13 11:08:34 +00:00
Katsiaryna Naliuka
7e4fc2b59f
Added support for external tiles to the lockscreen activity
...
Bug: 62487664
Test: Built and flashed a system image.
Change-Id: I75e42a042f9212e247f02c5523979bcd5ea57baa
2017-06-13 12:34:33 +02:00
Bill Yi
b82e7ac9f5
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 42e494228b -s ours
...
am: af27a8fd5b
2017-06-13 09:54:32 +00:00
Bill Yi
af27a8fd5b
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 42e494228b
2017-06-13 09:51:01 +00:00
TreeHugger Robot
42e494228b
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-06-13 09:45:21 +00:00
Bill Yi
8b39f5f66c
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 327b9119d7 -s ours am: 0c2bb34f5c -s ours" into oc-dr1-dev-plus-aosp
...
am: 8315525c76
2017-06-13 08:19:20 +00:00
Bill Yi
d45aaae866
Merge "Import translations. DO NOT MERGE" into oc-dev am: 327b9119d7 -s ours am: e637b663e8 -s ours
...
am: 52eb891200
2017-06-13 08:18:38 +00:00
Android Build Merger (Role)
8315525c76
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 327b9119d7 -s ours am: 0c2bb34f5c -s ours" into oc-dr1-dev-plus-aosp
2017-06-13 08:15:27 +00:00
Bill Yi
1c6a01293a
Merge "Import translations. DO NOT MERGE" into oc-dev am: 327b9119d7 -s ours
...
am: 0c2bb34f5c
2017-06-13 08:15:09 +00:00
Bill Yi
52eb891200
Merge "Import translations. DO NOT MERGE" into oc-dev am: 327b9119d7 -s ours
...
am: e637b663e8
2017-06-13 08:14:54 +00:00
Bill Yi
0c2bb34f5c
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: 327b9119d7
2017-06-13 08:11:23 +00:00
Bill Yi
e637b663e8
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: 327b9119d7
2017-06-13 08:11:23 +00:00
TreeHugger Robot
327b9119d7
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-06-13 08:07:08 +00:00
TreeHugger Robot
ca96da9718
Merge "Import translations. DO NOT MERGE"
2017-06-13 07:58:28 +00:00
Alison Cichowlas
b81004dd35
Fix build - fix import of SettingsRobolectricTestRunner.
...
Test: Only changing imports in test files.
Change-Id: Ib0d1433983da36416b979a0eaa1bb57419150374
2017-06-12 23:04:40 -04:00
Alison Cichowlas
8531fbc05e
Limit unconfigurability to specified channels. am: 80fa6b5833 am: 665384a8eb
...
am: c8752ca07c
2017-06-13 03:04:08 +00:00
Alison Cichowlas
a29b0f6a00
Limit unconfigurability to specified channels. am: 80fa6b5833 am: 0320d4e69f
...
am: 79f12ed51e
2017-06-13 03:03:24 +00:00
Alison Cichowlas
c8752ca07c
Limit unconfigurability to specified channels. am: 80fa6b5833
...
am: 665384a8eb
2017-06-13 01:59:42 +00:00
Alison Cichowlas
79f12ed51e
Limit unconfigurability to specified channels. am: 80fa6b5833
...
am: 0320d4e69f
2017-06-13 01:49:37 +00:00
Alison Cichowlas
665384a8eb
Limit unconfigurability to specified channels.
...
am: 80fa6b5833
2017-06-13 01:45:10 +00:00
