OSDN Git Service
Tony Mantler [Sat, 3 Jun 2017 22:00:17 +0000 (22:00 +0000)]
Merge "Move strings to SettingsLib so TV can use them" into oc-dev
am:
685041559a
Change-Id: I9ff3757e28b82caac7d83394f3734eee040a7b00
TreeHugger Robot [Sat, 3 Jun 2017 21:40:51 +0000 (21:40 +0000)]
Merge "Move strings to SettingsLib so TV can use them" into oc-dev
Tony Mantler [Fri, 26 May 2017 20:34:14 +0000 (13:34 -0700)]
Move strings to SettingsLib so TV can use them
Bug:
38496265
Test: Compiles
Change-Id: Iea90cbcf858cd598af4adc017e673e299a62ed39
Merged-In: Iea90cbcf858cd598af4adc017e673e299a62ed39
Peter Qiu [Fri, 2 Jun 2017 20:38:58 +0000 (20:38 +0000)]
Merge "wifi: use WifiSavedConfigUtils to retrieve saved configurations" into oc-dev
am:
7eeca4b052
Change-Id: I5a8daed2e821623aaa953ccf256808776f7febdd
TreeHugger Robot [Fri, 2 Jun 2017 20:25:12 +0000 (20:25 +0000)]
Merge "wifi: use WifiSavedConfigUtils to retrieve saved configurations" into oc-dev
Lei Yu [Fri, 2 Jun 2017 19:29:09 +0000 (19:29 +0000)]
Merge "Restart loader in onResume" into oc-dev
am:
74ca6aa060
Change-Id: I4cc76a8eeee55335bd6a4ab7d6870084ec609f9b
Lei Yu [Fri, 2 Jun 2017 19:21:27 +0000 (19:21 +0000)]
Merge "Restart loader in onResume" into oc-dev
Alison Cichowlas [Fri, 2 Jun 2017 18:49:29 +0000 (18:49 +0000)]
Merge "Delay adding app settings link until data fetch returns, to avoid reordering/visible misplaced "additional settings in the app" during transition." into oc-dev
am:
e811873b4e
Change-Id: Ia4def66e47faf702c22a4e3aba04d52965052aa8
TreeHugger Robot [Fri, 2 Jun 2017 18:42:24 +0000 (18:42 +0000)]
Merge "Delay adding app settings link until data fetch returns, to avoid reordering/visible misplaced "additional settings in the app" during transition." into oc-dev
jackqdyulei [Thu, 1 Jun 2017 01:03:09 +0000 (18:03 -0700)]
Restart loader in onResume
We need to refresh batterystatsHelper in onResume, so we need to
call restartLoader instead of initLoader
Bug:
62237848
Test: RunSettingsRoboTests
Change-Id: I6f7e1b57b945c92d34587ca24db192600e7f797f
Merged-In: I6f7e1b57b945c92d34587ca24db192600e7f797f
Peter Qiu [Wed, 31 May 2017 17:19:42 +0000 (10:19 -0700)]
wifi: use WifiSavedConfigUtils to retrieve saved configurations
Bug:
62048284
Test: manual test
Change-Id: Ib1719af1b256020bbf57d07ebe8c29ac1c460c1a
Lei Yu [Fri, 2 Jun 2017 17:13:55 +0000 (17:13 +0000)]
Merge "Refine the ProgressCategory" into oc-dev
am:
5f4f1b81af
Change-Id: I2b0fda608b8fe33eaa8ba6e7580c3becc1ebad71
Lei Yu [Fri, 2 Jun 2017 17:08:43 +0000 (17:08 +0000)]
Merge "Refine the ProgressCategory" into oc-dev
Alison Cichowlas [Fri, 2 Jun 2017 16:56:59 +0000 (16:56 +0000)]
Merge "Disallow buzz/beep/disturb changes for notifications with locked importance." into oc-dev
am:
3efc502840
Change-Id: Ib9006beaec685ef91583278585c9522f995d3c09
TreeHugger Robot [Fri, 2 Jun 2017 16:46:51 +0000 (16:46 +0000)]
Merge "Disallow buzz/beep/disturb changes for notifications with locked importance." into oc-dev
Alison Cichowlas [Fri, 2 Jun 2017 15:48:25 +0000 (15:48 +0000)]
Merge "Add group name into channel summary, if applicable." into oc-dev
am:
4b29f593f0
Change-Id: Ia4c0c9a506894033471b563f89e02a35cbf25601
Alison Cichowlas [Fri, 2 Jun 2017 15:39:44 +0000 (15:39 +0000)]
Merge "Add group name into channel summary, if applicable." into oc-dev
Bartosz Fabianowski [Fri, 2 Jun 2017 13:30:12 +0000 (13:30 +0000)]
Hide "Changes made by your organization's admin" when empty
am:
493495452a
Change-Id: Ided6278456fe5ffdbb843717a1ec7070e7a3d3dc
Bartosz Fabianowski [Thu, 18 May 2017 09:46:38 +0000 (11:46 +0200)]
Hide "Changes made by your organization's admin" when empty
The admin of a manged device can take a number actions that will be
listed in the "Changes made by your organization's admin" section of
Settings. If the admin has not taken any such actions, the section
will be empty and should be hidden. This is accomplished by having a
PreferenceController for the section that observes the state of the
PreferenceControllers inside it.
Bug:
35912953
Test: m RunSettingsRoboTests
Merged-in: Ia95754493ee6c5a19b4aa9731fd56fd558e61849
Change-Id: I82ca00b757001390f9a517b0c07057bdc49dab20
Esteban Talavera [Fri, 2 Jun 2017 08:38:51 +0000 (08:38 +0000)]
Merge "Include disabled managed profiles in Accounts page" into oc-dev
am:
92f78354f9
Change-Id: I3dc5fd6bb4c7466b204946db179b10d9a3c9ccdf
Esteban Talavera [Fri, 2 Jun 2017 08:33:16 +0000 (08:33 +0000)]
Merge "Include disabled managed profiles in Accounts page" into oc-dev
Lorenzo Colitti [Fri, 2 Jun 2017 06:18:13 +0000 (06:18 +0000)]
Merge changes from topic 'wifi_detail_jank' into oc-dev
am:
0187221bd8
Change-Id: I7873b3f06b40e416b89b44615e9fe28a5b3c7a29
TreeHugger Robot [Fri, 2 Jun 2017 06:11:51 +0000 (06:11 +0000)]
Merge changes from topic 'wifi_detail_jank' into oc-dev
* changes:
Reduce jank in the wifi detail status page.
Improve testing of IP address display code.
Sheng Wang [Fri, 2 Jun 2017 04:29:05 +0000 (04:29 +0000)]
Volume can not be updated in Sound¬ification
am:
8c329af634
Change-Id: I8031a9bbe82b40e79698e9d6be75bcd85bcde028
Sheng Wang [Fri, 2 Jun 2017 00:27:56 +0000 (00:27 +0000)]
Merge "Volume can not be updated in Sound¬ification" am:
c0fdbab185 am:
161e3d14e1
am:
9dbd34a3d9
Change-Id: I50a30452b6e0162070960ffdc35197ddef785609
Sheng Wang [Fri, 2 Jun 2017 00:25:17 +0000 (00:25 +0000)]
Merge "Volume can not be updated in Sound¬ification" am:
c0fdbab185
am:
161e3d14e1
Change-Id: Ie08f168cc2bf544d1f44a05f100a47d50ae15dd5
Sheng Wang [Fri, 2 Jun 2017 00:21:45 +0000 (00:21 +0000)]
Merge "Volume can not be updated in Sound¬ification"
am:
c0fdbab185
Change-Id: I467cb1cc5e0dbe49e383c7eace0be4475c21f762
Treehugger Robot [Fri, 2 Jun 2017 00:14:15 +0000 (00:14 +0000)]
Merge "Volume can not be updated in Sound¬ification"
Sheng Wang [Fri, 19 Aug 2016 09:09:32 +0000 (17:09 +0800)]
Volume can not be updated in Sound¬ification
After "onActivityPause()" is invoked and "onActivityResume()"
is invoked again, "mVolumizer" is not empty object,
so volume is not updated.
To fix this issue, set "mVolumizer" is null in "onActivityPause()",
if "onActivityResume()" is invoked again, recreate "mVolumizer"
and update volume.
Bug:
37558283
Test: manual, cherrypicking from AOSP
Change-Id: Id91064ea32305b5bf203f34e31988ac923beee6d
jackqdyulei [Thu, 1 Jun 2017 22:46:21 +0000 (15:46 -0700)]
Refine the ProgressCategory
1. Make the progressbar align with settings gear
2. Make text vertical center
Bug:
37190885
Test: Screenshot
Change-Id: Ib69b949179a0e097b78717cbe93c39aa0064ea9e
Andrew Sapperstein [Thu, 1 Jun 2017 22:17:44 +0000 (22:17 +0000)]
Merge "Add search bar to SearchActivity." into oc-dev
am:
fbc9035bcd
Change-Id: I63823bc03fe97fe683c9775b1b28f5cc770ae4e7
TreeHugger Robot [Thu, 1 Jun 2017 22:02:31 +0000 (22:02 +0000)]
Merge "Add search bar to SearchActivity." into oc-dev
Matthew Fritze [Thu, 1 Jun 2017 21:24:36 +0000 (21:24 +0000)]
Merge "Prevent crash when removing duplicates" into oc-dev
am:
7a148b9e09
Change-Id: I9ea047489b44bc538033343a6350a5abb8afef63
TreeHugger Robot [Thu, 1 Jun 2017 21:12:10 +0000 (21:12 +0000)]
Merge "Prevent crash when removing duplicates" into oc-dev
Fan Zhang [Thu, 1 Jun 2017 20:28:34 +0000 (20:28 +0000)]
Merge "Add method to disable "disable" button in installed app UI" into oc-dev
am:
e12790e34f
Change-Id: I4a5223a27c98f7ae9422fb017f4206721080890a
TreeHugger Robot [Thu, 1 Jun 2017 20:24:05 +0000 (20:24 +0000)]
Merge "Add method to disable "disable" button in installed app UI" into oc-dev
Alison Cichowlas [Thu, 1 Jun 2017 20:07:32 +0000 (16:07 -0400)]
Delay adding app settings link until data fetch returns,
to avoid reordering/visible misplaced "additional settings
in the app" during transition.
Bug:
62051521
Test: manual with transition scale turned to 10x sloooow.
Change-Id: I50666fbcb2a14344bbdbb2f4347c8470edb96619
Andrew Sapperstein [Thu, 1 Jun 2017 20:01:49 +0000 (20:01 +0000)]
Merge "Initial search bar implementation." into oc-dev
am:
91fe76263f
Change-Id: I7e6921134a239e136aaf6380ab4d7993e943435a
Andrew Sapperstein [Thu, 1 Jun 2017 19:52:06 +0000 (19:52 +0000)]
Merge "Initial search bar implementation." into oc-dev
xudiwen [Thu, 1 Jun 2017 19:09:25 +0000 (19:09 +0000)]
Merge "NullPointerException when running monkey test in IccLockSettings" am:
2c8d826b01 am:
957c4d7720
am:
0ff0487b51
Change-Id: I22cd436533a745a415a49122fe2469ef9a96cdc9
jackqdyulei [Thu, 1 Jun 2017 19:05:44 +0000 (19:05 +0000)]
Merge "Add method to calculate last full charge time" into oc-dev
am:
d4991dc24d
Change-Id: I4d8bd3099f493497adeb9afe42395225d7fb949c
xudiwen [Thu, 1 Jun 2017 19:05:23 +0000 (19:05 +0000)]
Merge "NullPointerException when running monkey test in IccLockSettings" am:
2c8d826b01
am:
957c4d7720
Change-Id: I6f872dc828e25a849cfa5f2a4c56961f94b63541
xudiwen [Thu, 1 Jun 2017 19:01:50 +0000 (19:01 +0000)]
Merge "NullPointerException when running monkey test in IccLockSettings"
am:
2c8d826b01
Change-Id: I8d54ebc4a699bd57631acc2150662cb923ca0015
TreeHugger Robot [Thu, 1 Jun 2017 18:55:53 +0000 (18:55 +0000)]
Merge "Add method to calculate last full charge time" into oc-dev
Treehugger Robot [Thu, 1 Jun 2017 18:51:43 +0000 (18:51 +0000)]
Merge "NullPointerException when running monkey test in IccLockSettings"
Matthew Fritze [Tue, 30 May 2017 15:36:52 +0000 (08:36 -0700)]
Prevent crash when removing duplicates
The method that crashes is removed in O-DR, and thus
does not need to be merged down.
Change-Id: If30bd8bd92d578133984f7f35e7ec5288adfc390
Fixes:
62100634
Test: make RunSettingsRoboTests
Merged-In: Id36f7bf4ceaaa3a2bd326ecafbfe97fd0b247df2
Andrew Sapperstein [Sun, 28 May 2017 23:28:08 +0000 (16:28 -0700)]
Add search bar to SearchActivity.
Styling doesn't look exactly right yet but there's a bar.
Creates an ItemDecoration to add a spacer above the first view.
Removes the action bar and replaces it with a SearchView
inside of a CardView.
Remaining work: pixel pushing
Bug:
37477506
Test: make RunSettingsRoboTests
Change-Id: Ibf38c3c2725551bc4cd90e98d0020ec49c2eab2b
Merged-In: I4a0f0c91c51ff5820b61a596520d80a3337c3466
Daniel Nishi [Thu, 1 Jun 2017 17:42:55 +0000 (17:42 +0000)]
Merge "Fix a bug where cache was double-counted." into oc-dev
am:
7035a41715
Change-Id: I2c465b9561cea69e5772efd08af7794f762758ca
Daniel Nishi [Thu, 1 Jun 2017 17:30:32 +0000 (17:30 +0000)]
Merge "Fix a bug where cache was double-counted." into oc-dev
Alison Cichowlas [Wed, 31 May 2017 21:01:24 +0000 (17:01 -0400)]
Disallow buzz/beep/disturb changes for notifications with locked importance.
If mAppRow.lockedImportance (which comes from the whitelist config_nonBlockableNotificationPackages), don't allow sound, vibration, or override dnd to be changed.
Bug:
38480212
Test: manually verified for now
Change-Id: I04aa7f15f2480472ec6ee487472098e81ab3d99f
Esteban Talavera [Tue, 30 May 2017 15:48:08 +0000 (16:48 +0100)]
Include disabled managed profiles in Accounts page
At the moment we include disabled profiles when deciding
whether the Work section needs to be added, and then only
include enabled ones when searching for the managed profile's
user handle
Change-Id: I96b0c36aad6b9326abc2992fa3309716f5cd1e74
Fix:
62021410
Test: m RunSettingsRoboTests
Kevin Chyn [Thu, 1 Jun 2017 08:17:06 +0000 (08:17 +0000)]
Merge "Add onResume to FingerprintEnrollEnrolling" into oc-dev
am:
98b67a4e94
Change-Id: Ic3497ccbd63ba4e56ad1923f6b4d082e78c95b70
TreeHugger Robot [Thu, 1 Jun 2017 08:09:51 +0000 (08:09 +0000)]
Merge "Add onResume to FingerprintEnrollEnrolling" into oc-dev
Lorenzo Colitti [Tue, 2 May 2017 03:06:32 +0000 (12:06 +0900)]
Reduce jank in the wifi detail status page.
Currently, when anything changes, the wifi detail status page
removes and then redraws all IP address information. This causes
the whole screen to flicker. Instead, only add and remove things
when they actually change.
In order to do this, convert the IPv6 addresses from a list of
Preference objects to a single newline-separated text field.
This removes the need to keep track of addresses as they are
added and deleted, and also looks a bit better.
Also, minor correctness fixes:
- Get the gateway from the default route, not from the last route
with a non-null gateway.
- Get the IPv4 subnet mask from the IPv4 address prefix, not from
the last route with prefix length > 0.
Bug:
62171690
Test: make -j64 RunSettingsRoboTests
Test: IP information does not flicker when signal strength changes
Change-Id: Ia9f2a277e53a2800407ae327701c5b95a9eec20a
Kevin Chyn [Thu, 1 Jun 2017 00:11:03 +0000 (17:11 -0700)]
Add onResume to FingerprintEnrollEnrolling
Fixes:
62233947
Test: revoke usb permissions, start enrolling, attach usb,
press ok, continue enroll. enroll should be able to continue
and complete
onPause was added in b/
38102355, but onResume was not added. We should
set the listener in onResume()
Change-Id: I59e617b4789f028d01b86d38049671888c07a5ec
Christine Franks [Wed, 31 May 2017 22:52:57 +0000 (22:52 +0000)]
Merge "Allow FR in carrier demo mode" into oc-dev
am:
9ef166a578
Change-Id: I1cc4ed80c31c572b2d091e234c1a41a4dbc9f992
Christine Franks [Wed, 31 May 2017 22:47:42 +0000 (22:47 +0000)]
Merge "Allow FR in carrier demo mode" into oc-dev
Matthew Fritze [Wed, 31 May 2017 22:47:27 +0000 (22:47 +0000)]
Merge "Remove dynamic summary from Security Patch info" into oc-dev
am:
564d90faf0
Change-Id: I91993bdbf7de1256fb8149478126ec507833611b
TreeHugger Robot [Wed, 31 May 2017 22:41:22 +0000 (22:41 +0000)]
Merge "Remove dynamic summary from Security Patch info" into oc-dev
Andrew Sapperstein [Sun, 28 May 2017 19:20:10 +0000 (12:20 -0700)]
Initial search bar implementation.
Replaces the default Toolbar in SettingsActivity with one that looks
like a search bar. It uses a Toolbar inside a CardView with some custom
styling.
Since the search bar is a floating element, the new toolbar lives in the
content frame of the dashboard. A FrameLayout is used to provide the
layering that is desired.
Since the search bar is on top, an additional spacer view is added to
the list of items in the dashboard. Its color changes based on what
the first view is so that it always matches.
Adds android-support-v7-cardview as a dependency (and reorders the
other deps to be in alphabetical order).
Remaining work (in future CLs):
- remove search menu option?
- clean up initial window
- remove the line between the header and the first condition
when there's a condition
Change-Id: I627b406735c8e2280ac08f44ca32f7098621a830
Merged-In: Id7477b90fbaf30eb5cac1ee244c847bddb95b3fd
Bug:
37477506
Test: make RunSettingsRoboTests
Joe Onorato [Wed, 31 May 2017 19:50:03 +0000 (19:50 +0000)]
Merge "Add unoptimized ble scans to batterystats." into oc-dev
am:
37eb1c580b
Change-Id: Ia794a4e1d51a6a0a28b65f9ade1530ca2c79cf90
Joe Onorato [Wed, 31 May 2017 19:26:45 +0000 (19:26 +0000)]
Merge "Add unoptimized ble scans to batterystats." into oc-dev
Fan Zhang [Wed, 31 May 2017 17:42:19 +0000 (10:42 -0700)]
Add method to disable "disable" button in installed app UI
OEMs can now force grey out the "disable" button for important apps on
device.
Change-Id: I8ea431b52e50e424be55946f70175db5412e2f4a
Merged-In: Ic075a07ad12592bd60238c7b1c9ab84932c8db3c
Fix:
38250742
Test: make RunSettingsRoboTests
Alison Cichowlas [Tue, 30 May 2017 12:48:59 +0000 (08:48 -0400)]
Add group name into channel summary, if applicable.
Bug:
36642898
Test: ran integration & robo tests (no new failures); verified manually with apps with channels & without.
Change-Id: I16a255b0e5d929f4485d3725bd18179e6f411c03
Christine Franks [Sat, 27 May 2017 01:23:38 +0000 (18:23 -0700)]
Allow FR in carrier demo mode
Bug:
62133292
Test: make RunSettingsRoboTests -j100, and manually verified FR is
available in carrier demo mode.
Change-Id: Ia793bf234b229da0490accfea6d44b72395a04bc
Bill Yi [Wed, 31 May 2017 18:36:26 +0000 (18:36 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
76e9bd72f9 -s ours
Change-Id: Iba41564e3e6efc69724c8da69663bbe93c0b358f
TreeHugger Robot [Wed, 31 May 2017 18:18:04 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Daniel Nishi [Wed, 31 May 2017 17:59:04 +0000 (10:59 -0700)]
Fix a bug where cache was double-counted.
Cache was being counted as cache and also as data in the app info page.
This is due to a faulty assumption I made that getDataBytes() and
getCacheBytes() measured distinct areas of storage (in actuality,
getCacheBytes() is a subset of getDataBytes()). This improper assumption
also led to the unit test being incorrect.
Change-Id: I4144d50800f82feaecb7a0a8dff26be3e4f14da8
Fixes:
62182151
Test: Settings robotest & manual
Matthew Fritze [Wed, 31 May 2017 16:38:02 +0000 (09:38 -0700)]
Remove dynamic summary from Security Patch info
Change-Id: I96b2e32a101077c58efd56115e70b63e4eb25049
Fixes:
36101902
Test: builds :)
Jeff Sharkey [Wed, 31 May 2017 14:48:43 +0000 (14:48 +0000)]
Merge "Consistent "low storage" behavior." into oc-dev
am:
552e3c4dba
Change-Id: I70e8a1aac274f6a96626272127d5dab060e10966
Bill Yi [Wed, 31 May 2017 14:24:59 +0000 (07:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I26a4e18c3186ee2388da40e2bf1232314f944813
Auto-generated-cl: translation import
Jeff Sharkey [Wed, 31 May 2017 14:18:24 +0000 (14:18 +0000)]
Merge "Consistent "low storage" behavior." into oc-dev
Esteban Talavera [Wed, 31 May 2017 12:04:57 +0000 (12:04 +0000)]
Merge "Launchers that don't support managed profiles cannot be selected" into oc-dev
am:
535533680f
Change-Id: I9058ae475e16c3b3c3227aa979af78c8958d0628
TreeHugger Robot [Wed, 31 May 2017 11:58:38 +0000 (11:58 +0000)]
Merge "Launchers that don't support managed profiles cannot be selected" into oc-dev
Lorenzo Colitti [Tue, 2 May 2017 03:06:32 +0000 (12:06 +0900)]
Improve testing of IP address display code.
This is a test-only change whose goal is to increase our
confidence in future changes that touch the actual code.
Bug:
62171690
Test: make -j64 RunSettingsRoboTests
Change-Id: Ic5122453c9fec2b166fcfe0c5c33be2705c10906
Jeff Sharkey [Tue, 30 May 2017 20:39:14 +0000 (14:39 -0600)]
Consistent "low storage" behavior.
Fix several bugs related to storage accounting. Since getDataBytes()
already includes cached data, we need to subtract it to avoid blaming
apps for it.
We also need to blame app code on someone, so we blame it on the
current user. StorageStatsManager was fixed awhile back to only
return the app code size on the requested storage volume, so we can
remove the system app checks.
Subtract "appBytes" from external storage accounting, since it's
already been blamed elsewhere against specific apps.
Pass along storage results from all users on the device, and subtract
them all when estimating size of "system" data. To avoid embarrassing
estimation bugs, make sure that "system" data is at least 1GB.
Bug:
38008706
Test: cts-tradefed run commandAndExit cts-dev -m CtsJobSchedulerTestCases -t android.jobscheduler.cts.StorageConstraintTest
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.StorageHostTest
Change-Id: Ide1e6d0690e5ad4e751c87891f63ba1036434619
Hugo Benichi [Wed, 31 May 2017 00:27:43 +0000 (00:27 +0000)]
Merge "Wifi details page: sign-in uses primary color" into oc-dev
am:
0c5573a0e3
Change-Id: I9e67f7a6d957a062d549f12133fd8f42bc83d187
Hugo Benichi [Wed, 31 May 2017 00:16:41 +0000 (00:16 +0000)]
Merge "Wifi details page: sign-in uses primary color" into oc-dev
Suprabh Shukla [Tue, 30 May 2017 23:12:10 +0000 (23:12 +0000)]
Merge "Disabling the activate button when paused" into oc-dev
am:
dacdcb9b42
Change-Id: Ia9033892369078556d1874fe9fe4b46f4d2bf5a5
Suprabh Shukla [Tue, 30 May 2017 23:02:09 +0000 (23:02 +0000)]
Merge "Disabling the activate button when paused" into oc-dev
Rebecca Silberstein [Tue, 30 May 2017 22:02:18 +0000 (22:02 +0000)]
Merge "SettingsAppWidgetProvider: do not use setWifiApEnabled" into oc-dev
am:
bbc260d408
Change-Id: Iec61f95ab0c0e77e280461f3142e6b878725cc7d
Phil Weaver [Tue, 30 May 2017 22:01:40 +0000 (22:01 +0000)]
Merge "Fix clickjacking again for accessibility services" into oc-dev
am:
7348c5c91b
Change-Id: I3244c4cd41919e691641f9696f1f2c24f3c07bcd
Rebecca Silberstein [Tue, 30 May 2017 21:48:36 +0000 (21:48 +0000)]
Merge "SettingsAppWidgetProvider: do not use setWifiApEnabled" into oc-dev
Phil Weaver [Tue, 30 May 2017 21:45:36 +0000 (21:45 +0000)]
Merge "Fix clickjacking again for accessibility services" into oc-dev
Matthew Fritze [Tue, 30 May 2017 20:38:57 +0000 (20:38 +0000)]
Merge "Location summary is no longer indexed" into oc-dev
am:
fed6e817a5
Change-Id: Id776317a3925920652677ec884be7b9bf73e90d3
TreeHugger Robot [Tue, 30 May 2017 20:24:22 +0000 (20:24 +0000)]
Merge "Location summary is no longer indexed" into oc-dev
Daniel Nishi [Tue, 30 May 2017 19:50:21 +0000 (19:50 +0000)]
Merge "Fix an override filter bug." into oc-dev
am:
5cc0a122d3
Change-Id: I9188da01862ae2af964ac09b84f5b3c6078572cc
Daniel Nishi [Tue, 30 May 2017 19:44:36 +0000 (19:44 +0000)]
Merge "Fix an override filter bug." into oc-dev
Rebecca Silberstein [Thu, 25 May 2017 09:50:29 +0000 (02:50 -0700)]
SettingsAppWidgetProvider: do not use setWifiApEnabled
Calls to stop tethering should use stopTethering instead of
setWifiApEnabled.
Bug:
38017909
Test: manual
Change-Id: Ib43f8c29b190ba7bad9c5b2d6a01bc9558110890
Phil Weaver [Fri, 26 May 2017 00:02:21 +0000 (17:02 -0700)]
Fix clickjacking again for accessibility services
Turns out that the flag for the window being obscured
does not imply that it is also partially obscured.
Also blocking system alerts and toast windows over the
accessibility service preference screen (and its associated
warning dialog) as well as the warning dialog shown when
a service is made available with the accessibiity shortcut.
Bug:
62104030
Test: Manually verified that I can't enable Select to Speak
when switch access is highlighting the button. I am able to
do that without this fix. Also started a service that
displayed a system overlay and confirmed that the overlay
disappears on a11y service preference screens and when a
new service is configured for the a11y shortcut.
Merged-In: Ie00bafa736c837881a258c9de10891b27c5baefd
Change-Id: Iabbded1a12dbc33d76e51c0bac710280a88080f3
Matthew Fritze [Tue, 30 May 2017 16:58:55 +0000 (09:58 -0700)]
Location summary is no longer indexed
Change-Id: I794e52b2f18e6e79033fbdaf2643209714b88025
Fixes:
38254258
Test: Search "mode" -> no summary text
Esteban Talavera [Thu, 25 May 2017 10:23:04 +0000 (11:23 +0100)]
Launchers that don't support managed profiles cannot be selected
If there is a managed profile, launchers that don't support managed profiles
cannot be selected as default Home
Change-Id: I7a19b5951402ec87a48464d783a539a607adabfe
Fix:
62013411
Test: m RunSettingsRoboTests
Hugo Benichi [Fri, 26 May 2017 06:45:03 +0000 (15:45 +0900)]
Wifi details page: sign-in uses primary color
Test: tested with nearby captive portals
Bug:
36203355
Bug:
36656914
Change-Id: I726f1226862150ba6875c20f919df91ca8043335
Suprabh Shukla [Mon, 22 May 2017 22:20:06 +0000 (15:20 -0700)]
Disabling the activate button when paused
This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.
Test: CtsVerifier -> Device Administration -> Device Admin Tapjacking Test
Bug:
35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
jackqdyulei [Thu, 25 May 2017 22:26:03 +0000 (15:26 -0700)]
Add method to calculate last full charge time
Bug:
38481300
Test: RunSettingsRoboTests
Change-Id: Icd551921f263352eb01d0c6ada62d277c8699507
Christine Franks [Fri, 26 May 2017 20:18:28 +0000 (20:18 +0000)]
Merge "Align settings seekbar to match other preferences" into oc-dev
am:
532a88dcd0
Change-Id: I32e55dbc14a1da1237d7cee061b832524954c56f
Christine Franks [Fri, 26 May 2017 20:12:24 +0000 (20:12 +0000)]
Merge "Align settings seekbar to match other preferences" into oc-dev
Doris Ling [Fri, 26 May 2017 19:42:56 +0000 (19:42 +0000)]
Merge "Fix issue for new account not being shown in work profile." into oc-dev
am:
dd7912e12f
Change-Id: I343ca041d57d45511bb33d1ef3cd6ceae6c03d40
TreeHugger Robot [Fri, 26 May 2017 19:38:37 +0000 (19:38 +0000)]
Merge "Fix issue for new account not being shown in work profile." into oc-dev
Christine Franks [Fri, 26 May 2017 17:24:45 +0000 (10:24 -0700)]
Align settings seekbar to match other preferences
Change preference_widget_seekbar_settings start padding to 56dp
to match the updated standard.
Bug:
62104638
Test: manual - verify layout of night display intensity and a11y
TTS sliders.
Change-Id: I3eba7e04f7e6a2a4484e89cac3526dd23275b299