OSDN Git Service
Lei Yu [Fri, 7 Apr 2017 21:08:11 +0000 (21:08 +0000)]
Merge "Extend the translation limit to 60" into oc-dev
am:
2a3a92b513
Change-Id: Iba43130a4d300ad62e775d6167aa888b4de9a437
Lei Yu [Fri, 7 Apr 2017 21:03:15 +0000 (21:03 +0000)]
Merge "Extend the translation limit to 60" into oc-dev
Kevin Chyn [Fri, 7 Apr 2017 21:01:09 +0000 (21:01 +0000)]
Merge "renaming/removing fingerprints should be reflected in UI immediately" into oc-dev
am:
78dce02079
Change-Id: I453db9fc9af0ab8f44535aa39517967e8ec9761c
TreeHugger Robot [Fri, 7 Apr 2017 20:55:10 +0000 (20:55 +0000)]
Merge "renaming/removing fingerprints should be reflected in UI immediately" into oc-dev
Doris Ling [Fri, 7 Apr 2017 20:07:55 +0000 (20:07 +0000)]
Merge "Add summary text to Lock screen preferences." into oc-dev
am:
a258e424a2
Change-Id: I11366b87d3f3920a79096dad0dd29938da2f8a52
TreeHugger Robot [Fri, 7 Apr 2017 20:03:35 +0000 (20:03 +0000)]
Merge "Add summary text to Lock screen preferences." into oc-dev
Andrew Sapperstein [Fri, 7 Apr 2017 20:02:37 +0000 (20:02 +0000)]
Merge "Increase char limit for adaptive brightness text." into oc-dev
am:
a9acbd924a
Change-Id: Ie7dea50e40606b39d29247740f7fb659738684a3
TreeHugger Robot [Fri, 7 Apr 2017 19:55:53 +0000 (19:55 +0000)]
Merge "Increase char limit for adaptive brightness text." into oc-dev
Daniel Nishi [Fri, 7 Apr 2017 19:46:05 +0000 (19:46 +0000)]
Merge "Update the automatic storage management preferences." into oc-dev
am:
7badf46542
Change-Id: Ic9311706e67f28607f17e036eee5bfa8290af82b
Daniel Nishi [Fri, 7 Apr 2017 19:38:26 +0000 (19:38 +0000)]
Merge "Update the automatic storage management preferences." into oc-dev
Kevin Chyn [Thu, 6 Apr 2017 18:11:57 +0000 (11:11 -0700)]
renaming/removing fingerprints should be reflected in UI immediately
Fixes
30252265
Test: manual
Change-Id: I5b1bcfff6a6a9ae407db6084562d0244cc5c45c2
Doris Ling [Thu, 6 Apr 2017 23:01:37 +0000 (16:01 -0700)]
Add summary text to Lock screen preferences.
Each time we refresh the security preference page, get the current
summary text from "On the lock screen" and populate to Lock screen
preferences summary.
Bug:
36540633
Test: make RunSettingsRoboTests
Change-Id: I317e3892b35b30981b62f7b7aee9cfdacd04a3ed
Lei Yu [Fri, 7 Apr 2017 17:51:50 +0000 (17:51 +0000)]
Merge "Remove misc data in battery main page." into oc-dev
am:
abde170529
Change-Id: I6552e8280746f53b05421b767fd92adafecdbf4f
Lei Yu [Fri, 7 Apr 2017 17:37:17 +0000 (17:37 +0000)]
Merge "Remove misc data in battery main page." into oc-dev
jackqdyulei [Fri, 7 Apr 2017 17:29:58 +0000 (10:29 -0700)]
Extend the translation limit to 60
Bug:
36830908
Test: Build
Change-Id: Ib7664ac4e625701d928359104ef5e75d158e74ee
Andrew Sapperstein [Thu, 6 Apr 2017 19:46:00 +0000 (12:46 -0700)]
Increase char limit for adaptive brightness text.
Change-Id: I4bab996d94812cf9a2a148ef3dc1119c5dab7a8e
Fixes:
37014409
Test: string change
Filip Pavlis [Fri, 7 Apr 2017 10:38:54 +0000 (10:38 +0000)]
Merge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev
am:
f023f50787
Change-Id: I5209009c77680828d57b2178e3209b20c37f029d
Filip Pavlis [Fri, 7 Apr 2017 10:31:39 +0000 (10:31 +0000)]
Merge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev
Phil Weaver [Fri, 7 Apr 2017 05:50:42 +0000 (05:50 +0000)]
Merge "Don't enable a11y service if scary dialog obscured" into oc-dev
am:
0b9cd1b40e
Change-Id: Ie4987e836593709c52a7afbedf826501180e1299
TreeHugger Robot [Fri, 7 Apr 2017 05:47:32 +0000 (05:47 +0000)]
Merge "Don't enable a11y service if scary dialog obscured" into oc-dev
Jim Miller [Fri, 7 Apr 2017 04:51:09 +0000 (04:51 +0000)]
Merge "Don't crash if we get a onRemove() callback from Fingerprint" into oc-dev
am:
b8aaaf82a2
Change-Id: Ieb50e09eebe645de8d3aca58718cf3ee504edb80
TreeHugger Robot [Fri, 7 Apr 2017 04:47:59 +0000 (04:47 +0000)]
Merge "Don't crash if we get a onRemove() callback from Fingerprint" into oc-dev
Doris Ling [Fri, 7 Apr 2017 02:47:53 +0000 (02:47 +0000)]
Merge "Add summary text for Encryption & credential." into oc-dev
am:
65682e7fa5
Change-Id: I47fa8dffba03f8666972843046537dcbededef9c
TreeHugger Robot [Fri, 7 Apr 2017 02:40:12 +0000 (02:40 +0000)]
Merge "Add summary text for Encryption & credential." into oc-dev
Doris Ling [Fri, 7 Apr 2017 02:33:17 +0000 (02:33 +0000)]
Merge "Add test to verify no crash on selecting brightness level." into oc-dev
am:
43146c4972
Change-Id: I4ae3d7fcd5680af78dd2538399368ad34ecef319
Doris Ling [Fri, 7 Apr 2017 02:33:01 +0000 (02:33 +0000)]
Merge "Update USb preference controller to use the new summary texts." into oc-dev
am:
e94ba3b55f
Change-Id: I19479c26fd00d7e356ff109a089c6605261af870
TreeHugger Robot [Fri, 7 Apr 2017 02:28:46 +0000 (02:28 +0000)]
Merge "Add test to verify no crash on selecting brightness level." into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 02:27:54 +0000 (02:27 +0000)]
Merge "Update USb preference controller to use the new summary texts." into oc-dev
Doris Ling [Fri, 7 Apr 2017 02:17:22 +0000 (02:17 +0000)]
Merge "Update summary text for Trust agent." into oc-dev
am:
b9a54bae08
Change-Id: I16a2423d405c34afe1cd589f9007a4b4dafb6925
TreeHugger Robot [Fri, 7 Apr 2017 02:09:35 +0000 (02:09 +0000)]
Merge "Update summary text for Trust agent." into oc-dev
Doris Ling [Fri, 7 Apr 2017 01:54:46 +0000 (01:54 +0000)]
Merge "Add subtext to Default apps." into oc-dev
am:
1e775c117a
Change-Id: I5e06cdb4513bbc8e2ee23592e5d90f1a9481f994
TreeHugger Robot [Fri, 7 Apr 2017 01:41:50 +0000 (01:41 +0000)]
Merge "Add subtext to Default apps." into oc-dev
Lei Yu [Fri, 7 Apr 2017 01:39:25 +0000 (01:39 +0000)]
Merge "Remove PowerUsageDetail.java" into oc-dev
am:
bde7097fb9
Change-Id: If609c5e9814bd2a18f3a8981937b407b2e94de61
Lei Yu [Fri, 7 Apr 2017 01:34:36 +0000 (01:34 +0000)]
Merge "Remove PowerUsageDetail.java" into oc-dev
Jim Miller [Fri, 7 Apr 2017 01:08:10 +0000 (18:08 -0700)]
Don't crash if we get a onRemove() callback from Fingerprint
Before this fix, it was possible to get a callback after the activity
finishes. This just ensures the operation is a no-op.
Fixes bug
37106041
Test: remove all but last fingerprint and hit back while rotating; check that
Settings doesn't crash.
Change-Id: I99df4f7c06e345d1ed6041a75606b0cc43edb300
Marie Janssen [Fri, 7 Apr 2017 00:50:54 +0000 (00:50 +0000)]
Merge "Bluetooth: only unregisterReceiver if we register" into oc-dev
am:
b26584cf1a
Change-Id: Ifc514b4f3e26f784db246f3fe03fb6ca7eee1cd2
TreeHugger Robot [Fri, 7 Apr 2017 00:42:04 +0000 (00:42 +0000)]
Merge "Bluetooth: only unregisterReceiver if we register" into oc-dev
Doris Ling [Thu, 6 Apr 2017 21:22:18 +0000 (14:22 -0700)]
Update summary text for Trust agent.
Update the summary text to show the number of active trust agent.
Bug:
36540633
Test: make RunSettingsRoboTests
Change-Id: I6627564a8356022c89694c84cfd47e875a0916b1
Doris Ling [Wed, 5 Apr 2017 23:03:02 +0000 (16:03 -0700)]
Add subtext to Default apps.
Retrieve the default Sms app, default Browser app, and default Phone app
and append the label together to form the summary text for Default apps
settings.
Bug:
36376411
Test: make RunSettingsRoboTests
Change-Id: I8ccf71dde43bba04c4bc4a900c9a181513e7710b
Doris Ling [Thu, 6 Apr 2017 23:31:02 +0000 (16:31 -0700)]
Add summary text for Encryption & credential.
Add the static summary to the preference in the xml.
Bug:
36540633
Test: visual
Change-Id: Ie1bb01a42acf969e26c3c9b036d2db68d1817e97
Daniel Nishi [Thu, 6 Apr 2017 23:25:10 +0000 (23:25 +0000)]
Merge ""% used" instead of "% full" in storage donut." into oc-dev
am:
b52a341914
Change-Id: Ie0df09915c2bc3e8c8926e2cec81835a37a7c7b0
Daniel Nishi [Thu, 6 Apr 2017 23:19:17 +0000 (23:19 +0000)]
Merge ""% used" instead of "% full" in storage donut." into oc-dev
Daniel Nishi [Thu, 6 Apr 2017 23:04:36 +0000 (23:04 +0000)]
Merge "Re-add the option to migrate data back." into oc-dev
am:
c660755348
Change-Id: I875d8175577011d422c0105f232d26fdbaf04703
Daniel Nishi [Thu, 6 Apr 2017 22:49:23 +0000 (22:49 +0000)]
Merge "Re-add the option to migrate data back." into oc-dev
jackqdyulei [Thu, 6 Apr 2017 22:35:29 +0000 (22:35 +0000)]
Merge "Update foreground string in battery page" into oc-dev
am:
020bb3bb99
Change-Id: Ie23192f5e28c274e6d750dfa28effc8d17c3b762
TreeHugger Robot [Thu, 6 Apr 2017 22:25:55 +0000 (22:25 +0000)]
Merge "Update foreground string in battery page" into oc-dev
Doris Ling [Thu, 6 Apr 2017 22:10:29 +0000 (15:10 -0700)]
Add test to verify no crash on selecting brightness level.
Add UI test to launch Settings->Display->Brightness level and Settings
app does not crash.
Change-Id: I526f44961bd0efbcacde334affbe2b7a93da0ce3
Fix:
36647069
Test: make SettingsTests
jackqdyulei [Tue, 4 Apr 2017 20:04:36 +0000 (13:04 -0700)]
Remove misc data in battery main page.
The removed types are:
1. DrainType.UNACCOUNTED
2. DrainType.OVERCOUNTED
This cl removes the above types in PowerUsageSummary and
PowerUsageAdvanced
Bug:
36874846
Test: RunSettingsRoboTests
Change-Id: I1807c44a2c0a9c2fa124cdef962a6411ae6830ca
jackqdyulei [Thu, 6 Apr 2017 22:00:23 +0000 (22:00 +0000)]
Merge "Fix crash when clicking item in Battery screen" into oc-dev
am:
bac9b527e7
Change-Id: I5ebed1fea938019771aecf964bfe54bcbc6f156b
TreeHugger Robot [Thu, 6 Apr 2017 21:50:06 +0000 (21:50 +0000)]
Merge "Fix crash when clicking item in Battery screen" into oc-dev
Bill Yi [Thu, 6 Apr 2017 21:49:40 +0000 (21:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
d67a6d7176 -s ours
Change-Id: I5015d0bc4c6c94aa2f3c777f3a1434ee44527f03
TreeHugger Robot [Thu, 6 Apr 2017 21:44:10 +0000 (21:44 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Daniel Nishi [Thu, 2 Mar 2017 23:58:23 +0000 (15:58 -0800)]
Re-add the option to migrate data back.
Currently, users can use an SD card or USB drive and adopt it as
internal storage using existing flows. They can manage this drive
perfectly fine using the old storage screen, which is still around.
One functionality that was lost was the ability to migrate data from
the adopted drive back to the private internal storage. This appeared
in a dropdown in the old storage settings.
By duplicating the code to create just that specific menu item and its
click behavior, we can restore this functionality to the new storage
view.
Change-Id: Id0e01c560e7249acccfe86c5da44466dd58fe5d4
Merged-In: I4b8c06912d2c0b2c5be5bce8b217d45accf34d4b
Fixes:
35926028
Test: Settings Robotest
Doris Ling [Thu, 6 Apr 2017 20:33:14 +0000 (20:33 +0000)]
Merge "Add summary text to Display->Brightness level." into oc-dev
am:
ad69c46712
Change-Id: I6e838fae7cdb2cffab830c73db0c09a5d246437a
Doris Ling [Thu, 6 Apr 2017 20:03:23 +0000 (20:03 +0000)]
Merge "Add summary text to Display->Brightness level." into oc-dev
jackqdyulei [Thu, 6 Apr 2017 19:48:52 +0000 (12:48 -0700)]
Fix crash when clicking item in Battery screen
"last full charge/Screen usage since full charge" goes crash when
clicking on it. This is because The default behaviour for
PowerGaugePreference is to start detail page and the above two items
are PowerGaugePreference.
This cl set these two items as non-selectable.
Bug:
37080048
Test: make -j40 SettingsTest
Change-Id: Ide4e151dcd0b44fb795a5753c91f2197b2a24a56
Bill Yi [Thu, 6 Apr 2017 19:36:34 +0000 (12:36 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
36981734
Change-Id: I2d0ef02f962fd737c6269feb97dc9ca9336671a5
Doris Ling [Thu, 6 Apr 2017 18:43:14 +0000 (18:43 +0000)]
Merge "Update summary for Connected devices->Printing." into oc-dev
am:
4bbfdb13e7
Change-Id: Iec490fa3c38a854d3469d238f1d3acb17196a02d
Doris Ling [Thu, 6 Apr 2017 18:35:52 +0000 (18:35 +0000)]
Merge "Update summary for Connected devices->Printing." into oc-dev
Doris Ling [Thu, 6 Apr 2017 17:08:04 +0000 (17:08 +0000)]
Merge "Update Wifi off summary text." into oc-dev
am:
28e35fcf05
Change-Id: I11dbcaa0c5f4509624b174e7daf1aca5506befc2
Doris Ling [Thu, 6 Apr 2017 17:07:26 +0000 (17:07 +0000)]
Merge "Re-order the display settings items." into oc-dev
am:
5a03e321bc
Change-Id: Icf9d83dba0422af57fdd5dd7b7a158ed900ee08f
Christine Franks [Thu, 6 Apr 2017 17:07:07 +0000 (17:07 +0000)]
Merge "Prevent apps from displaying over Settings" into oc-dev
am:
24596f51d5
Change-Id: Ie410feec95b77b5c97b19e35a3b3642df1f062db
Doris Ling [Thu, 6 Apr 2017 17:04:44 +0000 (17:04 +0000)]
Merge "Update Wifi off summary text." into oc-dev
Doris Ling [Thu, 6 Apr 2017 17:01:45 +0000 (17:01 +0000)]
Merge "Re-order the display settings items." into oc-dev
Christine Franks [Thu, 6 Apr 2017 16:47:52 +0000 (16:47 +0000)]
Merge "Prevent apps from displaying over Settings" into oc-dev
Marie Janssen [Thu, 23 Mar 2017 21:36:45 +0000 (14:36 -0700)]
Bluetooth: only unregisterReceiver if we register
We can get to onDestroy() without registering now.
Test: none
Fixes:
36501241
Change-Id: I90da3b350f9951993238d51f9fde86ccb335cafd
(cherry picked from commit
af34ed06f1b4b3734d883c7398b713b20585e1bd)
Amin Shaikh [Thu, 6 Apr 2017 02:03:30 +0000 (02:03 +0000)]
Merge "Link to "scanning settings" when Wi-Fi is off." into oc-dev
am:
0c4747401a
Change-Id: Ia60bf563b0719b1abf8c336addba620ec17abe32
Amin Shaikh [Thu, 6 Apr 2017 02:03:14 +0000 (02:03 +0000)]
Merge "Update saved networks screen after forget." into oc-dev
am:
191d081d57
Change-Id: I439a7dc573bcc37a540d1bf63dedb7392604e371
TreeHugger Robot [Thu, 6 Apr 2017 01:41:42 +0000 (01:41 +0000)]
Merge "Link to "scanning settings" when Wi-Fi is off." into oc-dev
TreeHugger Robot [Thu, 6 Apr 2017 01:41:27 +0000 (01:41 +0000)]
Merge "Update saved networks screen after forget." into oc-dev
Doris Ling [Thu, 6 Apr 2017 01:30:49 +0000 (01:30 +0000)]
Merge "Add resource string for Security dashboard summary." into oc-dev
am:
8c215807b2
Change-Id: Ie17257d1acae0e391a3f12edefb5dd582687ff15
TreeHugger Robot [Thu, 6 Apr 2017 01:25:06 +0000 (01:25 +0000)]
Merge "Add resource string for Security dashboard summary." into oc-dev
Christine Franks [Wed, 15 Mar 2017 22:13:44 +0000 (15:13 -0700)]
Prevent apps from displaying over Settings
Specifically, the DrawOverlayDetails fragment only.
Bug:
36070413
Test: make RunSettingsRoboTests -j100
Change-Id: I0069f0cacf8c963c8c6878dc89a32b205983a568
Marie Janssen [Thu, 6 Apr 2017 00:20:16 +0000 (00:20 +0000)]
Merge "Bluetooth: only unregisterReceiver if we register" am:
4dc556bda8 am:
c27d7effb0
am:
f72e86f332
Change-Id: Ic0a53a4904b11342fe89bed6d4dea69e595a6cf7
Marie Janssen [Thu, 6 Apr 2017 00:17:05 +0000 (00:17 +0000)]
Merge "Bluetooth: only unregisterReceiver if we register" am:
4dc556bda8
am:
c27d7effb0
Change-Id: I2c477f40e874ad33a5e3a218370f49e744c68787
Marie Janssen [Thu, 6 Apr 2017 00:14:07 +0000 (00:14 +0000)]
Merge "Bluetooth: only unregisterReceiver if we register"
am:
4dc556bda8
Change-Id: I3df22131a424007c5e0448166787598c7d77ea92
Marie Janssen [Thu, 6 Apr 2017 00:01:58 +0000 (00:01 +0000)]
Merge "Bluetooth: only unregisterReceiver if we register"
jackqdyulei [Wed, 5 Apr 2017 22:55:48 +0000 (22:55 +0000)]
Merge "Fix crash when opening battery page" into oc-dev
am:
418e5bffda
Change-Id: I2ea79ff502abaa99c51e1f5e2d4d359d9845a304
TreeHugger Robot [Wed, 5 Apr 2017 22:45:46 +0000 (22:45 +0000)]
Merge "Fix crash when opening battery page" into oc-dev
jackqdyulei [Wed, 5 Apr 2017 22:25:48 +0000 (22:25 +0000)]
Merge "Ui changes in battery main page" into oc-dev
am:
f297e843e9
Change-Id: I3b96043a327498f0ed935a80a24d6fffbd36c913
Daniel Nishi [Wed, 5 Apr 2017 22:25:33 +0000 (22:25 +0000)]
Merge "Lower case the first letter of storage type." into oc-dev
am:
4c52af621a
Change-Id: Ie1aa5e25f13e9d906a3c7c88c8fed60626e88ffe
TreeHugger Robot [Wed, 5 Apr 2017 22:13:00 +0000 (22:13 +0000)]
Merge "Ui changes in battery main page" into oc-dev
Daniel Nishi [Wed, 5 Apr 2017 22:06:55 +0000 (22:06 +0000)]
Merge "Lower case the first letter of storage type." into oc-dev
Sundeep Ghuman [Wed, 5 Apr 2017 21:33:43 +0000 (21:33 +0000)]
Merge "Create Espresso test class for WifiSettings." into oc-dev
am:
8b06cbd3a9
Change-Id: Ia26a458def122f40a162a77a6387e5d22c8d4241
TreeHugger Robot [Wed, 5 Apr 2017 21:27:36 +0000 (21:27 +0000)]
Merge "Create Espresso test class for WifiSettings." into oc-dev
Peter Qiu [Wed, 5 Apr 2017 21:25:02 +0000 (21:25 +0000)]
Merge "wifi: allow manual connection to a Passpoint provided network" into oc-dev
am:
248c04001e
Change-Id: I96798d7c1ad75210e0484e818ba3982b713a46f7
TreeHugger Robot [Wed, 5 Apr 2017 21:20:09 +0000 (21:20 +0000)]
Merge "wifi: allow manual connection to a Passpoint provided network" into oc-dev
jackqdyulei [Wed, 5 Apr 2017 21:20:06 +0000 (14:20 -0700)]
Remove PowerUsageDetail.java
Now we use AdvancedPowerUsageDetail instead.
This cl also:
1. Remove PowerUsageDetail in SearchIndexableResources since we
don't want to index PowerUsageDetail
2. Add AdvancedPowerUsageDetail in SettingsGateway
Bug:
36992358
Test: Build
Change-Id: I598bb159aa2b5a4889071ae9a17d29554e6afe11
jackqdyulei [Fri, 31 Mar 2017 21:26:38 +0000 (14:26 -0700)]
Fix crash when opening battery page
The settings crashes when opening battery usage detail page from
installed app page. Main reason is that it trying to open obsolete
page. This cl directs it to open AdvancedPowerUsageDetail instead.
Following cl will make InstalledAppDetail show calibrated percentage,
which is trakced in b/
36816681
Bug:
36792973
Test: RunSettingsRoboTests
Change-Id: Ie63e64e543ed3b28974ffdda8b42c97e7749a0f7
(cherry picked from commit
fac713318c8834ded349bc6d187499f61d399748)
Felipe Leme [Wed, 5 Apr 2017 20:32:26 +0000 (20:32 +0000)]
Merge "Removed deprecated auto(F)ill settings." into oc-dev
am:
0647c97a8e
Change-Id: I423df9ac9fd928a021151e952865f01fe51f9c62
TreeHugger Robot [Wed, 5 Apr 2017 20:25:36 +0000 (20:25 +0000)]
Merge "Removed deprecated auto(F)ill settings." into oc-dev
Daniel Nishi [Wed, 5 Apr 2017 20:16:25 +0000 (20:16 +0000)]
Merge "Revert "renaming/removing fingerprints should be reflected in UI if fingerprintservice lags"" into oc-dev
am:
7ad05fb1f3
Change-Id: Ica969821c115e9b251589295bfbbc4097dda7d2d
Daniel Nishi [Wed, 5 Apr 2017 20:10:58 +0000 (20:10 +0000)]
Merge "Revert "renaming/removing fingerprints should be reflected in UI if fingerprintservice lags"" into oc-dev
Daniel Nishi [Wed, 5 Apr 2017 20:05:55 +0000 (20:05 +0000)]
Merge "Fix a unit test regression." into oc-dev
am:
affc8fa18e
Change-Id: Iaf1f3515a4bd8ace3a86fdf5b30075c4275c7d10
Daniel Nishi [Wed, 5 Apr 2017 20:04:55 +0000 (20:04 +0000)]
Revert "renaming/removing fingerprints should be reflected in UI if fingerprintservice lags"
This reverts commit
bb994166cb12378be5c3b0372379f5cdb0ffceb0.
Change-Id: I713012a3c449311b5daf8af81b97c050889560c7
Daniel Nishi [Wed, 5 Apr 2017 19:59:12 +0000 (19:59 +0000)]
Merge "Fix a unit test regression." into oc-dev
Doris Ling [Wed, 5 Apr 2017 19:57:58 +0000 (12:57 -0700)]
Add resource string for Security dashboard summary.
Add the summary text to be shown when fingerprint sensor is not
available.
Bug:
36889582
Test: builds
Change-Id: I868ced81ad3b3177c8ca366adba937342b67ce65
Amin Shaikh [Wed, 5 Apr 2017 18:35:08 +0000 (11:35 -0700)]
Update saved networks screen after forget.
Bug:
36891459
Test: m RunSettingsRoboTests and manual testing
Change-Id: Ie125bd9e66ddbb25a1bbad93af19d4eb1e0a8c8b
Phil Weaver [Wed, 5 Apr 2017 16:28:32 +0000 (09:28 -0700)]
Don't enable a11y service if scary dialog obscured
We were only checking if the OK button itself was obscured.
Changing to check if any part of the window is obscured.
Bug:
31855267
Test: Created a sample a11y service that displays a UI to cover
part of the window, but not the OK button. It was possible to
enable an a11y service before this change, but now it displays
a warning toast.
Change-Id: I21974535aba734da6ea9d7accf67fb9237fd16fc
Robin Lee [Wed, 5 Apr 2017 13:45:49 +0000 (13:45 +0000)]
Merge "RejectedExecutionException in DataUsageLIst" am:
7a8121fdd9 am:
543a98806f
am:
1f9c67e982
Change-Id: I1d4c00df6867b9034b21d6d490323364f77c37db
OSDN Git Service
