OSDN Git Service
Marie Janssen [Wed, 19 Apr 2017 20:47:07 +0000 (13:47 -0700)]
Bluetooth: Make pairing notification cancellable
Add actions to the pairing service notification so the user can dismiss
the pairing request if they want to.
Add some more information to logs when the user takes an action.
Reformat the file to match android style.
Test: pair from a remote device, dismiss using the new actions
Bug:
36036358
Change-Id: Ie110044bd4caf465f454452737000f01e7430925
(cherry picked from commit
c79470d0896f5ccfaa9a0e872dd396d47ec28daf)
TreeHugger Robot [Fri, 21 Apr 2017 20:04:07 +0000 (20:04 +0000)]
Merge "Fix wrong voice call time in battery page" into oc-dev
jackqdyulei [Thu, 20 Apr 2017 16:48:02 +0000 (09:48 -0700)]
Fix wrong voice call time in battery page
The voice call is belong to DrainType.PHONE, which is not an app.
This cl stop using method in BatteryUtils to calculate the time, since
that method should only be used for DrainType.APP
Bug:
37402819
Test: RunSettingsRoboTests
Change-Id: I3aa7366401e54df87ffe913af0dcb1bcd5abf110
Daniel Nishi [Fri, 21 Apr 2017 17:18:04 +0000 (17:18 +0000)]
Merge "Add EXTRA_FROM_STORAGE to photos gallery intent." into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 01:56:57 +0000 (01:56 +0000)]
Merge "Fingerprint suggestion should not be dismissed until fingerprint added" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 01:45:28 +0000 (01:45 +0000)]
Merge "Include type service as type system" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 01:36:19 +0000 (01:36 +0000)]
Merge "Remove deep link to app store from app header." into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 01:02:34 +0000 (01:02 +0000)]
Merge "Bidi wrap keyboard names before displaying them." into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 00:45:15 +0000 (00:45 +0000)]
Merge "Change "Cell standby" to "Mobile network standby"" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 00:16:29 +0000 (00:16 +0000)]
Merge "Update security status icons." into oc-dev
TreeHugger Robot [Thu, 20 Apr 2017 23:47:00 +0000 (23:47 +0000)]
Merge "Add connect string for bluetooth page" into oc-dev
Daniel Nishi [Thu, 20 Apr 2017 21:46:28 +0000 (14:46 -0700)]
Add EXTRA_FROM_STORAGE to photos gallery intent.
Change-Id: I050149f558df0de83e7139354ac54176d7ced162
Fixes:
36991234
Test: Settings robotest
Sundeep Ghuman [Thu, 20 Apr 2017 20:45:32 +0000 (20:45 +0000)]
Merge "Revert "Force update APs when enabling wifi in WifiSettings."" into oc-dev
Fan Zhang [Thu, 20 Apr 2017 20:45:23 +0000 (13:45 -0700)]
Remove deep link to app store from app header.
The link doesn't actually work and uses wrong icon. There is a working
version at the app info screen already.
Change-Id: I16890bd66e095c3185e12d604d8daba5036ab24c
Fix:
37544209
Test: robotests
Ajay Nadathur [Thu, 13 Apr 2017 23:06:28 +0000 (16:06 -0700)]
Fingerprint suggestion should not be dismissed until fingerprint added
- Do not dismiss fingerprint suggestion until atleast one fingerprint is
added.
bug:
36578142
Test: robotest & manually verified.
Change-Id: I3151c9ae971666a0964be007103a9b7ad41de5ce
(cherry picked from commit
51ef801b3245f37680e1513d7f2b22aea02754ba)
Fan Zhang [Thu, 20 Apr 2017 18:01:32 +0000 (11:01 -0700)]
Bidi wrap keyboard names before displaying them.
This is needed because keyboard names can contain characters from mixed
locale. Without Bidi wrapping the labels will be garbled and not
readable.
Change-Id: I47668a65d7bef8828ad0424097834929ec12700d
Fix:
37353900
Test: make RunSettingsRoboTests
Sundeep Ghuman [Thu, 20 Apr 2017 17:49:20 +0000 (17:49 +0000)]
Revert "Force update APs when enabling wifi in WifiSettings."
This reverts commit
1c231d32b125f368e29fc30b6edebc81b9db7623.
Reason for revert: b/
37530557 - ANR in Settings due to deadlock
Change-Id: I85d70aa957dca76189b7600d7b39cb9a09437e91
jackqdyulei [Thu, 20 Apr 2017 17:30:50 +0000 (10:30 -0700)]
Add connect string for bluetooth page
Bug:
37365660
Test: Build
Change-Id: I964b9d25e892666c51dbd98e499be23fe93007ec
Daniel Nishi [Thu, 20 Apr 2017 17:05:28 +0000 (17:05 +0000)]
Merge "Gracefully handle null volumes after forgetting." into oc-dev
jackqdyulei [Thu, 20 Apr 2017 16:59:28 +0000 (09:59 -0700)]
Change "Cell standby" to "Mobile network standby"
Bug:
37356060
Test: Build
Change-Id: I2c726a7f31ae37cf0a31b76e2a99d9c5735692fe
Daniel Nishi [Thu, 20 Apr 2017 16:55:28 +0000 (16:55 +0000)]
Merge "Don't show warning dialog on opening ASM settings." into oc-dev
Phil Weaver [Thu, 20 Apr 2017 14:52:22 +0000 (14:52 +0000)]
Merge "Fix default for a11y shortcut setting" into oc-dev
TreeHugger Robot [Thu, 20 Apr 2017 12:59:31 +0000 (12:59 +0000)]
Merge "Remove WebView MultiProcess Developer Option." into oc-dev
Gustav Sennton [Fri, 7 Apr 2017 13:20:42 +0000 (14:20 +0100)]
Remove WebView MultiProcess Developer Option.
Now that MultiProcess WebView is enabled by default we can remove the
Developer Option that lets users choose whether to enable MultiProcess
for WebView.
Bug:
36513859
Test: Ensure the WebView MultiProcess Dev Setting no longer exists.
Change-Id: Ib2eab3831b5d8b56daeaf4c7a06337075804a1d4
Lenka Trochtova [Tue, 11 Apr 2017 18:29:21 +0000 (20:29 +0200)]
Check for user restrictions disallowing BT in BluetoothEnabler.
Test: make RunSettingsRoboTests -j40
Test: manual
BUG:
35596982
BUG:
32895313
Change-Id: Ie8f53b665a4aad4e6b17b20602cbe5502998d7a2
(cherry picked from commit
479d1971962ea79985535f00a323cd9a1597a553)
William Luh [Wed, 19 Apr 2017 17:02:31 +0000 (10:02 -0700)]
Update security status icons.
Bug:
36847800
Test: make RunSettingsRoboTests
Also tested manually in app.
Change-Id: I5b7c043ed6af4c5a888710b582e8e69c6e3974c3
TreeHugger Robot [Wed, 19 Apr 2017 23:49:02 +0000 (23:49 +0000)]
Merge "Fix scanning settings link clickability in Talkback mode." into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 23:33:56 +0000 (23:33 +0000)]
Merge "Change how we calculate system size." into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 23:30:07 +0000 (23:30 +0000)]
Merge "Display and parse numbers properly in all locales" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 22:29:24 +0000 (22:29 +0000)]
Merge "Revert "Listen to brigtness updates to update brightness summary."" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 21:48:19 +0000 (21:48 +0000)]
Merge "Force update APs when enabling wifi in WifiSettings." into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 21:42:35 +0000 (21:42 +0000)]
Merge "Fix malformatted preference xml." into oc-dev
Fan Zhang [Mon, 17 Apr 2017 23:58:25 +0000 (16:58 -0700)]
Display and parse numbers properly in all locales
Change-Id: Iddf74fd6ed3139eede27733b69a31ce2fa7d1a92
Fix:
37311645
Test: make RunSettingsRoboTests
Sundeep Ghuman [Wed, 19 Apr 2017 00:16:00 +0000 (17:16 -0700)]
Fix scanning settings link clickability in Talkback mode.
Bug: b/
37431709
Test: make RunSettingsRoboTests
Change-Id: I0dc0a524a3c4abd1743748ebc8ebf20937018047
Daniel Nishi [Tue, 18 Apr 2017 21:12:54 +0000 (14:12 -0700)]
Don't show warning dialog on opening ASM settings.
On older devices, the activation warning dialog would show upon the
switchbar changing to On. This was occurring when the page opens
because the status was changing onResume. By shuffling the switchbar
changes into the ASMSwitchBarController, we can register our listener
after the initialization of the switch bar's first status.
Change-Id: I3610d07345684d1e66444981a8059d1c2965e955
Fixes:
37472724
Test: Settings robotests
Adrian Roos [Wed, 19 Apr 2017 20:50:32 +0000 (20:50 +0000)]
Merge "Revert "Changed the ambient display setting name"" into oc-dev
Matthew Fritze [Wed, 19 Apr 2017 15:35:54 +0000 (15:35 +0000)]
Revert "Listen to brigtness updates to update brightness summary."
This reverts commit
4b95879634639e9d3ff81262a87478f081866ca9.
Change-Id: I13de29b0e42a09f6b3618826d7eb2a9ed00a54d8
Merged-In: I09fd9c843a4d32a131b87cd638785af552f81507
Fan Zhang [Wed, 19 Apr 2017 19:41:26 +0000 (12:41 -0700)]
Fix malformatted preference xml.
Change-Id: I48273492bebb280f422b97ad0d5cbe23ff667a53
Fix:
37343765
Test: instrumentation test
TreeHugger Robot [Wed, 19 Apr 2017 19:36:24 +0000 (19:36 +0000)]
Merge "Fix action bar background not wide enough on tablets" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 19:32:54 +0000 (19:32 +0000)]
Merge "Use AfW user handle when setting auto_sync for work" into oc-dev
Daniel Nishi [Tue, 18 Apr 2017 00:25:06 +0000 (17:25 -0700)]
Change how we calculate system size.
As per storage discussions, the best way to calculate storage for the
System is to just take all known data and subtract it from the used
bytes. There is more to the system than just the /system partition and,
even if we ignore the partitions and use the underlying block device
method of calculating it, we run into the problem of it not adding up to
the actual device size.
Change-Id: I6e1f775ea3f3b8b2cc78d734623934651e2fb7b4
Fixes:
37166310
Test: Robotests
Phil Weaver [Wed, 19 Apr 2017 18:09:23 +0000 (11:09 -0700)]
Fix default for a11y shortcut setting
Settings thought the default for "Allow from lock screen" was
on. It's really off.
Bug:
37158451
Test: Manually confirmed that a fresh device now shows off.
Change-Id: I38dc4f6d2bfec5e0c8562c0d2c6e034db461aa98
Fan Zhang [Tue, 18 Apr 2017 23:29:05 +0000 (16:29 -0700)]
Use AfW user handle when setting auto_sync for work
Change-Id: Ib1aa576a0083282dc59d8fe0d5c4784233eef024
Fix:
36675513
Test: make RunSettingsRoboTests
Phil Weaver [Wed, 19 Apr 2017 16:09:15 +0000 (16:09 +0000)]
Merge "Respect user's choice on a11y shortcut dialog" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 08:07:53 +0000 (08:07 +0000)]
Merge "FP name shouldn't be allowed to allow/display non-null names" into oc-dev
Sundeep Ghuman [Wed, 19 Apr 2017 02:17:22 +0000 (19:17 -0700)]
Force update APs when enabling wifi in WifiSettings.
Bug: b/
37324736
Test: See bug for repro steps.
Change-Id: I2a789e13781c64d2cc72b059685c5f3dfb9ff2ad
TreeHugger Robot [Wed, 19 Apr 2017 02:43:40 +0000 (02:43 +0000)]
Merge "Using a common class for loading drawables and handling various badging" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 02:17:31 +0000 (02:17 +0000)]
Merge "Remove animations in WifiSettings." into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 01:48:39 +0000 (01:48 +0000)]
Merge "Add test to verify regulatory info launches properly" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 00:54:32 +0000 (00:54 +0000)]
Merge "IPv6 addresses should not be selectable." into oc-dev
Phil Weaver [Wed, 19 Apr 2017 00:53:14 +0000 (17:53 -0700)]
Respect user's choice on a11y shortcut dialog
Wasn't checking if the user actually agreed. Whoops.
Bug:
37123004
Test: Manually verified that canceling leaves the selection
unchanged.
Change-Id: I48a052eb74733d3d0105fc1e72c4bf77ce8be0c5
Sundeep Ghuman [Tue, 18 Apr 2017 22:41:38 +0000 (15:41 -0700)]
Remove animations in WifiSettings.
This addresses jank issues when first showing the WifiSettings. Given
the new loading bar, animated transitions seem less relevant. Based on
user feedback, animations may be readded after a delay in ODR.
Bug: b/
37429702
Test: Visual
Change-Id: I9a44820bb354885d0ef31d50278aee6a47727701
Adrian Roos [Tue, 18 Apr 2017 23:25:20 +0000 (16:25 -0700)]
Revert "Changed the ambient display setting name"
This reverts commit
8d164e659d492b9b9a380554c888722fa1e215e3.
Fixes:
36516811
Test: Settings > Display > More, observe that it says "Ambient Display" there again.
Change-Id: I2831bc89e430d08f875c05a1441e1b0556df97e5
Sundeep Ghuman [Mon, 17 Apr 2017 21:42:21 +0000 (14:42 -0700)]
IPv6 addresses should not be selectable.
Disable selectable when adding ipv6 addresses to the
WifiNetworkDetailsPage.
Bug: b/
37351354
Test: make RunSettingsRoboTests
Change-Id: I79bc3dcab7339df96598aa1a6505f0148f8844b0
Daniel Nishi [Tue, 18 Apr 2017 21:57:54 +0000 (14:57 -0700)]
Gracefully handle null volumes after forgetting.
If a user tells a device to forget a storage volume and then
goes back to the PrivateVolumeForget activity from their Recents, it
attempts to re-initialize itself with a volume that it forgot.
And this makes Settings crash.
By gracefully killing the activity when we try to open
PrivateVolumeForget for a forgotten volume, we avoid this crash.
Change-Id: Ib4e881c10f0c872ce6b268b16a573960230ef99b
Fixes:
34856304
Test: Settings unit test
Saige McVea [Tue, 18 Apr 2017 21:47:25 +0000 (21:47 +0000)]
Merge "Conditionally reposition experimental preferences." into oc-dev
TreeHugger Robot [Tue, 18 Apr 2017 21:47:05 +0000 (21:47 +0000)]
Merge "Listen to brigtness updates to update brightness summary." into oc-dev
Fan Zhang [Tue, 18 Apr 2017 21:29:51 +0000 (14:29 -0700)]
Fix action bar background not wide enough on tablets
Change-Id: I82e444dc913429c77c768afada24e10c12c79160
Fix:
37475599
Test: make RunSettingsRoboTests
Sunny Goyal [Wed, 12 Apr 2017 22:53:30 +0000 (15:53 -0700)]
Using a common class for loading drawables and handling various badging
Test: make RunSettingsRoboTests -j31
Bug:
36591157
Change-Id: I4cb1d313920d5d8604fd79ff65b40e2dda180e2e
Alison Cichowlas [Tue, 18 Apr 2017 20:36:53 +0000 (20:36 +0000)]
Merge "In apps with no channels, provide settings for misc channel in top level." into oc-dev
Doris Ling [Thu, 13 Apr 2017 22:06:36 +0000 (15:06 -0700)]
Listen to brigtness updates to update brightness summary.
- add content observer for brightness relates changes, and update the
brightness preference summary when changes occur.
- also check for VR mode and auto brightness mode when reading the
current brightness value.
Merged-In: I895d251e1dc12cb114ef00328eb8aa0075d77ab1
Change-Id: Ice549ffd708c2dad311a87b6a92bf1c8db426456
Fix:
37227609
Test: make RunSettingsRoboTests
Fan Zhang [Tue, 18 Apr 2017 19:06:11 +0000 (12:06 -0700)]
Add test to verify regulatory info launches properly
Test: runtest --path tests/unit/src/com/android/settings/RegulatoryInfoDisplayActivityTest.java
Change-Id: I531a05bde858790819ac11c8ffcea2f6d1942ec2
Fix:
34370866
Anna Galusza [Tue, 18 Apr 2017 19:35:05 +0000 (19:35 +0000)]
Merge "Update Setup Wizard Vision Settings colors." into oc-dev
Alison Cichowlas [Mon, 17 Apr 2017 19:50:29 +0000 (15:50 -0400)]
In apps with no channels, provide settings for misc channel in top level.
Test: robolectric tests pass, plus manual verification
Bug:
36561295
Change-Id: I58872a41fab562787d85bade0552c7735d716e5b
Matthew Fritze [Tue, 18 Apr 2017 17:39:12 +0000 (17:39 +0000)]
Merge "Revert "Add summary to special app access."" into oc-dev
Matthew Fritze [Tue, 18 Apr 2017 17:35:07 +0000 (17:35 +0000)]
Revert "Add summary to special app access."
This reverts commit
0e1b53fa6fda4382e4430492679cb7543f1cb510.
Change-Id: Ica5a9f7f40be3a4c2ae0e999d9832717dc44f3b5
TreeHugger Robot [Tue, 18 Apr 2017 15:03:54 +0000 (15:03 +0000)]
Merge "Channel settings updates" into oc-dev
TreeHugger Robot [Tue, 18 Apr 2017 03:21:54 +0000 (03:21 +0000)]
Merge "Hide User category if only one user in device" into oc-dev
jackqdyulei [Mon, 17 Apr 2017 18:27:35 +0000 (11:27 -0700)]
Include type service as type system
Bug:
37293081
Test: RunSettingsRoboTests
Change-Id: Id9259a1a516fdf368d41f1b7205a1515d0989aab
jackqdyulei [Mon, 17 Apr 2017 21:54:29 +0000 (14:54 -0700)]
Hide User category if only one user in device
Fix:
37293124
Test: RunSettingsRoboTests
Change-Id: If50548396614672b05811d37a719f8f08df3165d
Lei Yu [Tue, 18 Apr 2017 00:56:10 +0000 (00:56 +0000)]
Merge "Don't show Screen as Apps in advanced battery page" into oc-dev
Maurice Lam [Thu, 30 Mar 2017 04:10:15 +0000 (21:10 -0700)]
Sticky footer for GLIF theme
For settings screens using GLIF theme, update to sticky footers.
Test: Existing tests pass
Bug:
35448201
Change-Id: If26e7e25f7f02b4c24979503e0c9359b88ff16d1
(cherry picked from commit
a857c8da4fcac98e70ea0d8d5b108aff24561341)
TreeHugger Robot [Tue, 18 Apr 2017 00:32:55 +0000 (00:32 +0000)]
Merge "Use buttons for EncryptionInterstitial" into oc-dev
Casey Burkhardt [Tue, 18 Apr 2017 00:06:52 +0000 (00:06 +0000)]
Merge "Hide "Magnify with button" if no navbar is shown" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 23:16:31 +0000 (23:16 +0000)]
Merge "Consolidate notification settings." into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 22:47:28 +0000 (22:47 +0000)]
Merge "Fix startup jank in the Wifi Picker." into oc-dev
Maurice Lam [Thu, 23 Feb 2017 22:43:48 +0000 (14:43 -0800)]
Use buttons for EncryptionInterstitial
Bug:
30742121
Test: Run EncryptionInterstitialTest via `am instrument`
Change-Id: I04d304da4153ebc7f8809ce9c640bccc5e1f5685
(cherry picked from commit
9be96e06bb1e12e5068f2672dfbb9baa0051d604)
Jeff Sharkey [Mon, 17 Apr 2017 22:26:35 +0000 (22:26 +0000)]
Merge "Follow storage API polishing." into oc-dev
Daniel Nishi [Mon, 17 Apr 2017 22:26:10 +0000 (22:26 +0000)]
Merge "Update the old Storage view to look better." into oc-dev
Daniel Nishi [Mon, 17 Apr 2017 22:25:52 +0000 (22:25 +0000)]
Merge "Fix a bug where options menu was not showing." into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 21:53:56 +0000 (21:53 +0000)]
Merge "Make battery status refresh in SettingsActivity" into oc-dev
Julia Reynolds [Mon, 17 Apr 2017 21:22:09 +0000 (17:22 -0400)]
Consolidate notification settings.
App notifications now appears under configure notifications.
Bug:
36562211
Test: functional test, NotificationsSettingsTests
Change-Id: If6a5fd062b7983fc97621b9e7240e6bdad04ee86
TreeHugger Robot [Mon, 17 Apr 2017 21:10:30 +0000 (21:10 +0000)]
Merge "Use standard preference layout for wallpaper picker" into oc-dev
Sundeep Ghuman [Thu, 13 Apr 2017 23:11:18 +0000 (16:11 -0700)]
Fix startup jank in the Wifi Picker.
Synchronously fetch the latest APs during onResume and show these before
displaying the other wifi preferences. This fixes a visibile shuffling
issue. Additional Setting preferences are now programatically added
during onStart and hidden during onStop in order to avoid the animation
delay which causes a shuffling effect.
Bug: b/
36406983
Test: Visual inspection. Animation jank is difficult to programatically
test.
Change-Id: I34b2d737a8e72e1dc296c170f753975fafce7a3e
Jeff Sharkey [Mon, 17 Apr 2017 15:31:33 +0000 (09:31 -0600)]
Follow storage API polishing.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.StorageHostTest
Bug:
37325923,
35812899,
35806020
Change-Id: I4965b7391018354157f0683a643a14c5e9cd338d
Sarah Fortune [Mon, 17 Apr 2017 20:07:31 +0000 (20:07 +0000)]
Merge "Disable the wifi wakeup preference when wifi scanning is disabled" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 19:43:13 +0000 (19:43 +0000)]
Merge "Disable SetupRedactionInterstitial when complete" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 19:37:06 +0000 (19:37 +0000)]
Merge "Add summary to special app access." into oc-dev
Fan Zhang [Mon, 17 Apr 2017 18:19:27 +0000 (11:19 -0700)]
Use standard preference layout for wallpaper picker
Change-Id: I7c76a9af5e64af4ac8641227289a94ab00f923f2
Fix:
37351626
Test: visual
jackqdyulei [Sat, 15 Apr 2017 00:04:49 +0000 (17:04 -0700)]
Don't show Screen as Apps in advanced battery page
Bug:
37293020
Test: RunSettngsRoboTests
Change-Id: I9a6259e1eb3a2d3451b0479bfe20be735825cd64
Saige McVea [Sat, 8 Apr 2017 05:24:29 +0000 (22:24 -0700)]
Conditionally reposition experimental preferences.
Specifically, move colour inversion and colour correction preferences
to the display category if device is color transform accelerated.
Test: Manual
Bug:
36603386
Change-Id: I4f7e4e569f5f358e6e3c705f9df02e0da473a081
Julia Reynolds [Fri, 14 Apr 2017 13:30:30 +0000 (09:30 -0400)]
Channel settings updates
- Update master switch preference to store enabled state in case
it's set before the view holder is bound
- Update master switch preference to prevent disabled switches
from being toggled
- Show an importance summary for max importance
- properly handle null notification sounds
Change-Id: I395b95b76d2a3c1c94b41d1c2720bb0cf1cae917
Fixes:
36920159
Fixes:
37421928
Fixes:
36939825
Test: RunSettingsRoboTests & manual
Sarah Fortune [Wed, 12 Apr 2017 23:36:34 +0000 (16:36 -0700)]
Disable the wifi wakeup preference when wifi scanning is disabled
Bug:
36033488
Test: Manual testing on the device, make RunSettingsRoboTests
Change-Id: I0abfe69a8a84dc9c5e78f1debce7748c92b47e04
Christine Franks [Mon, 17 Apr 2017 18:30:26 +0000 (18:30 +0000)]
Merge "Add test for Settings#ACTION_NIGHT_DISPLAY_SETTINGS" into oc-dev
Doris Ling [Tue, 11 Apr 2017 22:35:49 +0000 (15:35 -0700)]
Add summary to special app access.
Get the count of apps that has unrestricted data access and add that to
the summary for Apps & notifications -> Special app access.
Bug:
36376411
Test: make RunSettingsRoboTests
Change-Id: Ic72cd165da9a91e18e1982d2696830f3f5a0987c
Christine Franks [Thu, 13 Apr 2017 23:34:55 +0000 (16:34 -0700)]
Add test for Settings#ACTION_NIGHT_DISPLAY_SETTINGS
Bug:
35356645
Test: Verify for both config_nightDisplayAvailable true and false,
adb shell am instrument -e class
com.android.settings.display.NightDisplayTest -w
com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
Change-Id: I7de3eddf62428d75bef621d3387fa33a76205fe7
Fan Zhang [Fri, 14 Apr 2017 19:31:02 +0000 (12:31 -0700)]
Update action bar style in app header UI.
- Update background color of actionbar
- Remove elevation of actionbar so it appears to be the same entity as
app header.
- Add a shadow below app header view. We can't set elevation on app
header unfortunately because that will add shadow all round the view,
but we only want shadow below it.
- Updated app icon size/text size per to match UI spec.
Change-Id: I63d7fa42b859a008fa662aaf19848cd40529c2ff
Fix:
37207527
Fix:
37079248
Test: visual && make RunSettingsRoboTests
Doris Ling [Sun, 16 Apr 2017 00:50:58 +0000 (00:50 +0000)]
Merge "Update subtext for Security settings." into oc-dev
Doris Ling [Mon, 10 Apr 2017 22:14:22 +0000 (15:14 -0700)]
Update subtext for Security settings.
Instead of using summary for verifer, change the security setting
summary to a static text.
Bug:
36889582
Test: make RunSettingsRoboTests
Change-Id: Ia3e2c7c595f403965751bacf2239c70070408e49
TreeHugger Robot [Sat, 15 Apr 2017 09:20:49 +0000 (09:20 +0000)]
Merge "Fix setting crash when removing screenlock with fp" into oc-dev