OSDN Git Service
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
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
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
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
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
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 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
Eugene Susla [Sat, 15 Apr 2017 04:17:21 +0000 (04:17 +0000)]
Merge "API for notification listener for Companioon apps" into oc-dev
Eugene Susla [Fri, 14 Apr 2017 17:42:59 +0000 (10:42 -0700)]
API for notification listener for Companioon apps
Test: 1. Trigger the confitrmation dialog.
Ensure it looks exactly like the one from settings.
2. Call an API without associating the appa first
Ensure exception is thrown with a message mentioning the need to associate 1st
Change-Id: I0b280e9bcef7f9d21ce7c9dfeaf2703945481efd
Kevin Chyn [Sat, 15 Apr 2017 00:48:28 +0000 (17:48 -0700)]
FP name shouldn't be allowed to allow/display non-null names
Fixes:
37360324
Test: try to save an empty FP name
make sure it doesn't display the empty name
Change-Id: Ie81699abc0da9513e5173364e8ae969bbe195ac6
Daniel Nishi [Fri, 14 Apr 2017 23:52:07 +0000 (23:52 +0000)]
Merge "Jostle the elements around in app storage settings." into oc-dev
TreeHugger Robot [Fri, 14 Apr 2017 22:54:07 +0000 (22:54 +0000)]
Merge "Fix crash when Assist app does not have settings activity." into oc-dev
Daniel Nishi [Fri, 14 Apr 2017 22:34:53 +0000 (22:34 +0000)]
Merge "Fix storage settings crash." into oc-dev
jackqdyulei [Fri, 14 Apr 2017 18:42:04 +0000 (11:42 -0700)]
Make battery status refresh in SettingsActivity
Before this cl, the battery text in SettingsActivity is one time
update, won't refresh based on real battery status.
This cl elicits BatteryBroadcastReceiver from PowerUsageBase and
make it reusable in both SettingsActivity and battery page.
BatteryBroadcastReceiver will invoke callback if:
1. Battery level changed on integer level(100->99)
2. Battery status has changed(i.e. charging)
Bug:
29346753
Test: RunSettingsRoboTests
Change-Id: If522d15a700ccbc8bae24f5712e05ec27ea4cbfa
Daniel Nishi [Fri, 14 Apr 2017 21:12:35 +0000 (14:12 -0700)]
Fix a bug where options menu was not showing.
There were two issues that stopped the options menu from
showing properly. First, the SettingsPreferenceFragment did
not call its super class, causing the Lifecycle methods to
never be called. Second, the options menu was not being
invalidated which also stopped the Lifecycle methods from
being called.
Change-Id: I29f2fc105c7ecae7adaccb2e4643e48646398d8d
Fixes:
37255835
Test: Robotest
TreeHugger Robot [Fri, 14 Apr 2017 20:57:29 +0000 (20:57 +0000)]
Merge "Apply admin restriction when network reset is disallowed" into oc-dev
Doris Ling [Fri, 14 Apr 2017 19:43:07 +0000 (12:43 -0700)]
Fix crash when Assist app does not have settings activity.
Check for null settings activity before trying to create settings
intent. If there is no settings activity, we will not show settings gear
for the preference.
Change-Id: I16f9d695cf9ef09ff65f4511d53d5778760125b5
Fix:
37161567
Test: make RunSettingsRoboTests
Kevin Chyn [Fri, 14 Apr 2017 20:33:21 +0000 (13:33 -0700)]
Fix setting crash when removing screenlock with fp
If a phone is operating slower than normal, when removing screen lock,
it's possible for the user to go back to settings page while removal
is still in progress. The removal callback will crash ChooseLockGeneric
Fixes:
37329856
Test: in fpc_tee_hal.c, make do_remove slow (5s). set up lockscreen, fingerprint,
then set lockscreen to none or swipe. do device rotations, go back to lock screen,
and then try to enroll fingerprint
Change-Id: I6da131a0001b22d06e359401f2ca1c6496c071ca
Lei Yu [Fri, 14 Apr 2017 20:26:26 +0000 (20:26 +0000)]
Merge "Update some battery string comments" into oc-dev
TreeHugger Robot [Fri, 14 Apr 2017 20:19:46 +0000 (20:19 +0000)]
Merge "Hide summary for Cell in PowerUsageAdvanced" into oc-dev
Daniel Nishi [Fri, 14 Apr 2017 20:18:17 +0000 (20:18 +0000)]
Merge "Shrink the progress bar on storage items." into oc-dev
Daniel Nishi [Fri, 14 Apr 2017 19:50:30 +0000 (19:50 +0000)]
Merge "Use the music note icon for the music files pref." into oc-dev
TreeHugger Robot [Fri, 14 Apr 2017 18:30:12 +0000 (18:30 +0000)]
Merge "Get rid of the extra divider lines in memory usage UI" into oc-dev
Daniel Nishi [Thu, 6 Apr 2017 21:29:03 +0000 (14:29 -0700)]
Use the music note icon for the music files pref.
Change-Id: I0e688321d7697aa4ad5b4ae16e7ca03f60e582cd
Fixes:
36900603
Test: Manual
TreeHugger Robot [Fri, 14 Apr 2017 05:25:56 +0000 (05:25 +0000)]
Merge "Search Icon persists through screen rotation" into oc-dev
TreeHugger Robot [Fri, 14 Apr 2017 01:13:56 +0000 (01:13 +0000)]
Merge "Update summary when toggle background activity" into oc-dev
Fan Zhang [Fri, 14 Apr 2017 01:03:45 +0000 (18:03 -0700)]
Apply admin restriction when network reset is disallowed
- Refactored network restriction checking logic into a checker class to
share across different places
- Added test
Test: make RunSettingsRoboTests
Change-Id: I6b7ea78f28fd1b61aacb070c377821150e441a74
Fix:
37134598
jackqdyulei [Fri, 14 Apr 2017 00:53:02 +0000 (17:53 -0700)]
Update some battery string comments
1. battery_detail_foreground
2. battery_detail_background
Fix:
36874567
Test: Build
Change-Id: I955023ff8919b7019d459bd75a8baccf69a46355
TreeHugger Robot [Fri, 14 Apr 2017 00:41:00 +0000 (00:41 +0000)]
Merge "Instant apps show supported links not open default" into oc-dev
Daniel Nishi [Thu, 13 Apr 2017 23:49:15 +0000 (16:49 -0700)]
Update the old Storage view to look better.
This removes the Manage Storage button and moves the titles of
the preferences to match the new progress bar location.
Bug:
2108251
Test: Manual
Change-Id: I1dce610050e44abd4665537e42a752bf34e94384
jackqdyulei [Mon, 10 Apr 2017 21:23:04 +0000 (14:23 -0700)]
Update summary when toggle background activity
In previous code, it didn't update summary when preference is changed.
This cl adds it and also updates the title for Battery Optimization.
Bug:
37163617
Test: RunSettingsRoboTests
Change-Id: I276d9a267379104794998a605a8e258660dcf350
jackqdyulei [Thu, 13 Apr 2017 22:56:13 +0000 (15:56 -0700)]
Hide summary for Cell in PowerUsageAdvanced
1. Add method "shouldHideSummary" to check it
2. Also change method "shouldHide" to "shouldHideCategory",
to distinguish it from shouldHideSummary
Fix:
37293815
Test: RunSettingsRoboTests
Change-Id: I4364d0331f3aac143fad9ebdeab52207f5cb98bf
Casey Burkhardt [Thu, 13 Apr 2017 22:50:28 +0000 (15:50 -0700)]
Hide "Magnify with button" if no navbar is shown
Devices without a software-rendered navigation bar will be unable to
use "Magnify with button" as no accessibility button trigger for
magnification can be shown.
In this case, we hide the setting by preventing
MagnificationPreferenceFragment from showing the list of mag
modes, instead launching directly into the PreferenceFragment for
"Magnify with triple-tap"
Bug:
36862906
Test: Manual - Configured marlin to disable the navigation bar and
verified behavior in SUW and Settings
Change-Id: Ie614ec292d7779044274b7c79eaed1df080c0fd1
Jesse Evans [Wed, 12 Apr 2017 15:57:27 +0000 (08:57 -0700)]
Instant apps show supported links not open default
On the app info page, instant apps show only the supported links
dialog rather than Open by default which opens in a secondary page
where the user can control things that aren't relevant to instant
apps.
Test: make RunSettingsRoboTests
Bug:
36497697
Change-Id: If4eba7c11c5490cbda1ef617002121fe108c4085
Fan Zhang [Thu, 13 Apr 2017 18:34:45 +0000 (11:34 -0700)]
Get rid of the extra divider lines in memory usage UI
Change-Id: I991f74ed3139f6119188a446fbf12bef23189988
Fix:
37211922
Test: visual
Lei Yu [Thu, 13 Apr 2017 21:43:32 +0000 (21:43 +0000)]
Merge "Revamp battery Ui in low battery mode" into oc-dev
Daniel Nishi [Thu, 13 Apr 2017 21:15:29 +0000 (14:15 -0700)]
Shrink the progress bar on storage items.
Change-Id: I4c9161de01236f7ac7ab633162a806888006fc1f
Fixes:
37283130
Test: Manual
TreeHugger Robot [Thu, 13 Apr 2017 21:09:42 +0000 (21:09 +0000)]
Merge "Use android:resource instead of :value for static summary" into oc-dev
Anna Galusza [Thu, 6 Apr 2017 00:24:58 +0000 (17:24 -0700)]
Update Setup Wizard Vision Settings colors.
Bug:
34470898
Test: UI updates only.
Change-Id: I8693004637f31a433c6911a4c99d5dd1426d76f1
Daniel Nishi [Fri, 31 Mar 2017 01:02:16 +0000 (18:02 -0700)]
Fix storage settings crash.
It may crash if opened during the uninstall of an app. By catching
the exception which may occur, we can just skip the uninstalled app
and avoid crashing.
Change-Id: I1b96b0697f4041be356260d6c675593affc1cb69
Merged-In: If556db7b5a299ba53a29baefbbe9709ba6d12190
Fixes:
36793223
Fixes:
36793372
Test: Settings unit test
Daniel Nishi [Thu, 2 Mar 2017 00:19:53 +0000 (16:19 -0800)]
Jostle the elements around in app storage settings.
This much more closely resembles the later mocks for
this page. The spacing, fonts, and colors are still off
and will be corrected once the final mocks land.
Bug:
34766830
Test: Manual
Change-Id: Ifbb8511d624cd06422025beee943fdead3faf53b
Merged-In: Id131e3596a0d08cb43c924a9f5cd9eb25329d7de
Adam Lesinski [Thu, 13 Apr 2017 20:09:41 +0000 (20:09 +0000)]
Merge "Update FakeUid to match ag/
2099507" into oc-dev
Jack He [Thu, 13 Apr 2017 19:43:49 +0000 (19:43 +0000)]
Merge "Add developer menu entry to enable Bluetooth inband ringing" into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 19:36:52 +0000 (19:36 +0000)]
Merge "Instant apps should not say App Installed by" into oc-dev
Saige McVea [Thu, 13 Apr 2017 19:07:32 +0000 (19:07 +0000)]
Merge "Added generic icon and magnification icon to a11y Settings." into oc-dev
Fan Zhang [Thu, 13 Apr 2017 18:35:35 +0000 (11:35 -0700)]
Use android:resource instead of :value for static summary
android:resource is locale aware, but android:value is not.
Change-Id: I9eb0ff6b86036d769878e530cdca8779ee8b233f
Fix:
37248453
Test: manual
Daniel Nishi [Thu, 13 Apr 2017 18:39:53 +0000 (18:39 +0000)]
Merge "Add a movies & tv apps category to storage settings." into oc-dev
Hyunyoung Song [Thu, 13 Apr 2017 18:11:50 +0000 (18:11 +0000)]
Merge "Remove elevation from Apps detail info view to prevent NPE b/
37286516 Test: manual" into oc-dev
Lei Yu [Thu, 13 Apr 2017 17:33:03 +0000 (17:33 +0000)]
Merge "Update Summary for Battery Optimization" into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 17:08:39 +0000 (17:08 +0000)]
Merge "Add a broadcast receiver to WifiDetailsPreferenceController." into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 17:08:24 +0000 (17:08 +0000)]
Merge "Update Wifi Preferences with custom icons." into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 16:21:57 +0000 (16:21 +0000)]
Merge "Save instance to avoid crash opon restore in onCreate." into oc-dev
Hyunyoung Song [Thu, 13 Apr 2017 15:33:32 +0000 (08:33 -0700)]
Remove elevation from Apps detail info view to prevent NPE
b/
37286516
Test: manual
Change-Id: Ie3a10c94e79cd11eefafef25ac4ecd244cf67ea9