Commit Graph

309172 Commits

Author SHA1 Message Date
Android Build Merger (Role)
a0dff34532 Merge "Merge "Only modify window layout params when necessary." into cw-f-dev am: 9fbd981f23 am: d56887f8fa" into nyc-mr2-dev-plus-aosp 2017-02-14 01:01:13 +00:00
Michael Kwan
5af3dd4bb5 Merge "Only modify window layout params when necessary." into cw-f-dev am: 9fbd981f23
am: d56887f8fa

Change-Id: I6e3695c245ed6afb208c0bd422b0ed2ac840281f
2017-02-14 01:00:27 +00:00
Michael Kwan
49fa0405b1 Merge "Only modify window layout params when necessary." into cw-f-dev am: 9fbd981f23
am: a26e371c9b

Change-Id: I72bf9b5fa5dfaaa7573115ed5b6cca23a0be05f4
2017-02-14 01:00:23 +00:00
Amith Yamasani
c510e19d18 Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev
am: 7556690cf5

Change-Id: Ib0446301e56751f6a72403155c576516cd7e559c
2017-02-14 00:57:56 +00:00
Michael Kwan
a26e371c9b Merge "Only modify window layout params when necessary." into cw-f-dev
am: 9fbd981f23

Change-Id: I36aa427a3023dcba2a29eccfc0b7aac43748e534
2017-02-14 00:55:32 +00:00
Michael Kwan
d56887f8fa Merge "Only modify window layout params when necessary." into cw-f-dev
am: 9fbd981f23

Change-Id: I14316841b80bdb25755e174528ef4bb271d3e005
2017-02-14 00:55:29 +00:00
Hakan Seyalioglu
1f8a47ca95 Merge "DO NOT MERGE - Check exported status in chooser am: 7bae18232e am: 45fa749c5a" into nyc-mr2-dev-plus-aosp
am: b98f76e276  -s ours

Change-Id: I16fb9bc8655f057ad431ec8ddf2ffed723c9357f
2017-02-14 00:53:29 +00:00
Hakan Seyalioglu
41892e2d78 DO NOT MERGE - Check exported status in chooser am: 7bae18232e am: aeb1f1241e
am: 62666ab94a  -s ours

Change-Id: Ifee2f4c622da049c524f5e81a2d8d0e5215b4f90
2017-02-14 00:52:26 +00:00
TreeHugger Robot
7556690cf5 Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev 2017-02-14 00:49:44 +00:00
Android Build Merger (Role)
b98f76e276 Merge "DO NOT MERGE - Check exported status in chooser am: 7bae18232e am: 45fa749c5a" into nyc-mr2-dev-plus-aosp 2017-02-14 00:48:20 +00:00
Michael Kwan
9fbd981f23 Merge "Only modify window layout params when necessary." into cw-f-dev 2017-02-14 00:48:12 +00:00
Hakan Seyalioglu
f13504555f DO NOT MERGE - Check exported status in chooser am: 7bae18232e
am: 45fa749c5a

Change-Id: Ie308e49d410863c643c13256076a3ed83c934adc
2017-02-14 00:47:27 +00:00
Hakan Seyalioglu
62666ab94a DO NOT MERGE - Check exported status in chooser am: 7bae18232e
am: aeb1f1241e

Change-Id: Ibdc23df2da0b8ea387f54169224e467a37466cff
2017-02-14 00:47:25 +00:00
Hakan Seyalioglu
aeb1f1241e DO NOT MERGE - Check exported status in chooser
am: 7bae18232e

Change-Id: Id29e65bd455c704738618f1dacfcad53b8d0b773
2017-02-14 00:41:55 +00:00
Hakan Seyalioglu
45fa749c5a DO NOT MERGE - Check exported status in chooser
am: 7bae18232e

Change-Id: Ieda18baab005a6a85b5107dfab37d20dec990110
2017-02-14 00:41:51 +00:00
Makoto Onuki
47c203d4b0 Make the DPM account strings system-APIs.
Bug: 33670246
Test: After making the CTS change in the same topic:
 cts-tradefed run cts --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.AccountCheckHostSideTest

Change-Id: Icefb6aec04a5ec805313e027424e99bdbf769e67
2017-02-13 16:27:35 -08:00
Winson Chung
f88baf8b17 Disable fetching of thumbnails when using snapshots.
- We don't keep the snapshots on the SysUI side so this is just a wasted
  call to load them (the rest of the metadata can still be prefetched
  though).

Test: Launch new tasks and ensure that we aren't fetching task snapshots
      without entering overview.

Change-Id: I1fe01a162f15e4f75b333e7e1bbe32d07e5d0b8d
2017-02-13 16:11:40 -08:00
Amith Yamasani
d725de1e86 Merge "Revert "No direct Uri grants from system."" 2017-02-14 00:04:34 +00:00
Fan Zhang
70967f38e6 Add metrics for settings
Change-Id: I93d6209c70f26c1c60d746b5816324d6b995e4bd
Fix: 33209678
Fix: 30137094
Test: builds
2017-02-13 16:02:24 -08:00
Philip P. Moltmann
755d78dbd9 [DO NOT MERGE] Revert "[DO NOT MERGE] Delay SharedPreferences.apply() by 50 ms"
This reverts commit 2fc44947dd.

Bug: 30662828
Change-Id: Ia22343c19e155555dff3b0cb58f7b58df0ce6301
2017-02-13 23:44:31 +00:00
Amith Yamasani
dae86855cc Revert "No direct Uri grants from system."
Reason for revert: b/35158271
Bug: 35158271
This reverts commit 2dfe92c2df.

Change-Id: Id04eab8100bfb0b3e137095b25b7d4b12c6d11e6
2017-02-13 23:43:31 +00:00
Ningyuan Wang
a6ea570a4a Create createFromByteArray() for WifiSsid
Bug: 35318006
Test: compile, unit tests
Change-Id: I0138bd67c0dec37419897318401b18ee4445a111
2017-02-13 15:40:19 -08:00
Doris Liu
2bf869e97c Merge "Correctly handle infinite start time" 2017-02-13 23:39:52 +00:00
Hyunyoung Song
4d20ee8c46 Merge "Icon class should support Maskable bitmap type" 2017-02-13 23:36:15 +00:00
Hakan Seyalioglu
13405c5529 Fix interaction w/ work profile & last chosen
bug: 34677697
Test: New unit tests added
Change-Id: Ibb5c804c16a758ff041ce7165fda561d903b5f31
2017-02-13 15:24:58 -08:00
Robin Lee
3c82d3d5bf Theme work lock activity with the task primaryColor
This involves adding another system RPC, getTaskDescription(taskId)
gated on MANAGE_ACTIVITY_STACKS permission.

Bug: 31001762
Test: runtest -x frameworks/base/packages/SystemUI/tests/src/com/android/systemui/keyguard/WorkLockActivityTest.java
Change-Id: Ieb996f7fab5bc79737df570e35733551118118d3
2017-02-13 23:22:34 +00:00
gopinath
d3c50019b1 Add Simulate maitanance mode in app startup test cases.
Note : Dismissing initial dialogs on the apps (maps, youtube
and camera) craetes the profile.

Bug : b/28941042

Change-Id: Ifbc2853059ca59026d0a833e6dc7e7f96bda9117
2017-02-13 15:19:48 -08:00
Andrii Kulian
d7f8f942e5 Update display contents when metrics change
When display was resized its windows weren't updated because of
two problems: old LogicaDisplay#mOverrideDisplayInfo was preventing
WM from detecting the change and base display metrics were never
updated by resize.

Bug: 35258051
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testDisplayResize
Change-Id: I30155e4d83e61ffe969c81dfcf932f3f3882cc59
2017-02-13 15:17:00 -08:00
Hakan Seyalioglu
7bae18232e DO NOT MERGE - Check exported status in chooser
Relevant change in master is ag/1844170

bug: 34147053
Change-Id: Ic9d9d65c66325904c95ab3966bdcc16e7668278b
(cherry picked from commit e3286c3145)
2017-02-13 23:12:28 +00:00
Chen Xu
817c2097e7 Merge "Add simActivationState to PhoneStateListener" 2017-02-13 23:07:53 +00:00
Shuzhen Wang
7d0674ceb1 Camera: Update doc to allow unchanged configs in finalizeOutputConfigs
Bug: 35137641
Test: Compile
Change-Id: I671fc13c005eee27c87041dce23c30f40a394443
2017-02-13 14:55:34 -08:00
sergeyv
00eb43dbc0 DeferredLayerUpdater: clean up Layer lifecycle
Test: refactoring CL, all existent tests should pass
bug:34919311
Change-Id: Ib2889667a5ab8a2aaba443458782bc163467f0ea
2017-02-13 14:41:20 -08:00
Fan Zhang
f8eb664492 Deprecate openTile method.
We no longer have tile drawer. Deprecatign this will make logging easier.

Bug: 30137094
Test: RunSettingsLibTests
Change-Id: I19777ede597e9db57b7c27b1850c39f9e2a61aa7
2017-02-13 14:40:59 -08:00
Makoto Onuki
976071a631 Follow-up to I61640146 Remove duplicate check.
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest2 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest3 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest4 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest5 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest6 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest7 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest8 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest9 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest10 -w com.android.frameworks.servicestests
Change-Id: I0af448186c90e548542160d1902bc462545bb03e
2017-02-13 14:32:41 -08:00
Geoffrey Pitsch
33366c31a3 Merge "Fix reference to old string in Inline controls." 2017-02-13 22:17:57 +00:00
Yohei Yukawa
ff54b306de Merge "Track event flow to IMMS#setImeWindowStatus" 2017-02-13 22:08:35 +00:00
Matt Sarett
c54b76e97d Replace bitmap shaders with image shaders in test code
Test: Verified that unit tests still pass.

Change-Id: I67d8046e49b9469e73caa9fe2a44ef2602c95d59
2017-02-13 17:01:59 -05:00
Amith Yamasani
55100571da DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."
Reason: Breaking setting the user avatar in Settings.
Bug: 35158271
This reverts commit b61338ecb3.

Change-Id: Ia08c12be3da06b0d02e71635b46350c8ff50ec19
2017-02-13 22:00:12 +00:00
Geoffrey Pitsch
1f7fb1a30c Fix reference to old string in Inline controls.
Test: runtest systemui
Change-Id: Idddba349f38fb08415b4206538f43ab1cccdc34f
2017-02-13 16:57:40 -05:00
Selim Cinek
ef8c225704 Fixed an issue where children dissappeared the wrong way
Because we were comparing relative to absolute positions,
we need to calculate the next view the right way.

Test: add children in group, remove the last / middle one
Fixes: 35193074
Change-Id: I415a978b84d528ded402b99b872769b98aa49ec0
2017-02-13 13:51:40 -08:00
Selim Cinek
00708abfe6 The transformhelper now also transforms gone views
Because a notification's views could change from GONE
to VISIBLE without notifying the transformhelper, we're
now adding the transformed views even if they are gone
at the resolution time.
This fixes a bug where the Time would fade in / out
properly.

This also fixes another bug where the time could remain
invisible.

Test: add notification group without any header text and observe smooth fading when expanding group
Change-Id: I1d6b0126df1550a71baa2e7729bdf9664b934b02
Fixes: 35127160
2017-02-13 13:51:39 -08:00
Selim Cinek
87ed69bd6b Heads-up notifications of increased height behave better
In the shade, the heads-up version when their height is
increased now behave better and the notification shows more
then a single message as well.

Test: add heads-up for messaging style notification while shade is expanded
Bug: 34469375
Change-Id: Ia3475eec5b4474aae950ef0eb84afb28689245ae
2017-02-13 13:51:37 -08:00
TreeHugger Robot
b068dd5b66 Merge "Don't hide summary text in RestrictedPreference." 2017-02-13 21:51:10 +00:00
Makoto Onuki
0a2b187309 Merge "Do not allow work profile to see main other profiles" 2017-02-13 21:33:22 +00:00
Michael Peck
5b51730b8a Pass targetSdkVersion specifier for SELinux labeling
Motivation:
Provide the ability to phase in new security policies by
applying them to apps with a minimum targetSdkVersion

Test: Marlin builds and boots. Apps targeting targetSdkVersion<=25
run in untrusted_app_25 domain. Apps targeting the current development
build >=26 run in the untrusted_app domain with fewer permissions. No
new denials observed during testing.
Bug: 34115651
Change-Id: Ib9f6ded9bd2f426861a6d843861b4074084253b0
2017-02-13 13:29:35 -08:00
Michael Kwan
134ad6ef3f Only modify window layout params when necessary.
Cancelling swipe-to-dismiss will trigger a check to ensure the window
is reset to its original state. Ensure that the reset is actually
required before setting the new layout attributes.

Bug: 34816397
Change-Id: Idf26ce7c8b63dc44a76effefcb32eb8d8665f605
2017-02-13 13:20:09 -08:00
Mike Reed
3318f8bf0c include SkRegion.h explicitly (SkCanvas.h no longer does)
Change-Id: I5a601dbeeec0a9942051ed0c699c70138fcbcb95
2017-02-13 16:14:10 -05:00
TreeHugger Robot
4c7a3d1206 Merge "Adding a little more verbose logging." 2017-02-13 21:12:08 +00:00
Dianne Hackborn
3023320d33 Merge "Fix issue #35309312: Background start not allowed: service..." 2017-02-13 21:09:54 +00:00
Bryan Mawhinney
908c46069e Merge "Fix live wallpaper not showing on lock screen after restore" into nyc-mr2-dev am: 5de3e5ab36
am: 8542554d93

Change-Id: I1c3fa7d3a3e6118bc869b7046b6469ec09ce0058
2017-02-13 20:59:36 +00:00