drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
315,517 Commits 1 Branch 0 Tags
Commit Graph

315517 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaewan Kim
e391fe76e8 Merge "Add documentation for 'am start-foreground-service'" into oc-dev 
am: e7ce1d40e1

Change-Id: I4202bc13102f35b8d3cd4b328c5a1de49b7cb08e
 2017-04-12 19:45:21 +00:00
Seigo Nonaka
1e924df63e Merge "Update Typeface.Builder API to reflect API feedback." into oc-dev 2017-04-12 19:39:50 +00:00
TreeHugger Robot
684b5381e9 Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev 2017-04-12 19:39:16 +00:00
TreeHugger Robot
e7ce1d40e1 Merge "Add documentation for 'am start-foreground-service'" into oc-dev 2017-04-12 19:37:26 +00:00
Julia Reynolds
bf3f4dd7f5 Merge "Clear calling identity before verifying listeners" into oc-dev 
am: 43dd3ba3c4

Change-Id: I05a728d069a06f4ec36dff79db022407f4d3504c
 2017-04-12 19:24:55 +00:00
Casey Burkhardt
79bc410133 Merge "Improved multiuser support for A11y button/Magnification" into oc-dev 
am: 9aa64e6cfa

Change-Id: Ia7a56ce9ddc39d1e9e5d814d593dba96c95ae957
 2017-04-12 19:14:04 +00:00
Julia Reynolds
43dd3ba3c4 Merge "Clear calling identity before verifying listeners" into oc-dev 2017-04-12 19:13:05 +00:00
Julius D'souza
0a8ecc6886 DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. 
Bug: 36515029
Test: the build still works.
Change-Id: I39ae2c55b6b2b0d6547f75f4ef06e62e3e5f0b84
(cherry picked from commit 8e9ea907448c49f573dd045707e37dd14efdf152)
 2017-04-12 12:06:50 -07:00
Casey Burkhardt
9aa64e6cfa Merge "Improved multiuser support for A11y button/Magnification" into oc-dev 2017-04-12 19:04:18 +00:00
Svet Ganov
400f10fe50 Merge "Fill UI polish" into oc-dev 
am: c9a83326c2

Change-Id: Iafae2e819d836a1bda463898695f2fbf9334299b
 2017-04-12 19:03:26 +00:00
Julius D'souza
43791354c7 Merge "Remove the development privelege level from SET_DISPLAY_OFFSET." 2017-04-12 19:00:40 +00:00
TreeHugger Robot
c9a83326c2 Merge "Fill UI polish" into oc-dev 2017-04-12 18:54:32 +00:00
Mady Mellor
e5c8b231eb Merge "Don't offer snooze for foreground service notifications" into oc-dev am: 8f395a16fb 
am: cb5b58d990

Change-Id: If20d6cef28c3b79fe4577b0ea82fb6479a8dc163
 2017-04-12 18:46:59 +00:00
Charles He
066b8d8b5f Merge "Disallow direct-boot aware activities to bypass work lock" into oc-dev am: 9f074e2224 
am: fd7eb11a2b

Change-Id: I221b89a01108e1d932a612f45b81798cebbaf66b
 2017-04-12 18:45:49 +00:00
Salvador Martinez
ab932147aa Added strings for thermal shutdown warning 
Strings for thermal shutdown warning were missing
so this CL adds them and a proto message value.

Test: SysUI tests still pass
Bug: 30994946
Change-Id: Ifd0b26248c2ebae5bcf32ecbea2566c14be7dc32
 2017-04-12 18:41:35 +00:00
Kang Li
40afdf05b5 Merge "Updates reportChooserSelection to be synchronized with queryUsageStats in UsageStatsService, to fix a flaky test." into oc-dev 
am: 1f477fb270

Change-Id: Ibab9026c9330218e459091f5d53505a64c039ce8
 2017-04-12 18:41:21 +00:00
Mady Mellor
cb5b58d990 Merge "Don't offer snooze for foreground service notifications" into oc-dev 
am: 8f395a16fb

Change-Id: Ieb5ea626ed2fb83a4959f85be097d0f5563e1471
 2017-04-12 18:40:12 +00:00
nharold
a237a34085 Merge changes from topic 'ipsec-api-tweaks' am: fddf677b8b 
am: 176bfb58c6

Change-Id: I056e52c4c3bf41ffaf482ebaf4c7b14a9091f3ca
 2017-04-12 18:39:15 +00:00
Nathan Harold
99c50add4f IpSecManager and IpSecAlgorithm API Tweaks am: 6045429b35 
am: 9c2428ad4d

Change-Id: I6f7e2011a273d10386b72391d12a0ce55f18ffd7
 2017-04-12 18:37:23 +00:00
Bill Yi
bc4b6de277 Merge "Import translations. DO NOT MERGE" into oc-dev am: 2d1fb47916 -s ours 
am: d5a6453cba  -s ours

Change-Id: I9bdae2592409be360b274dd45da6d3cfb61e6ab2
 2017-04-12 18:37:18 +00:00
Charles He
fd7eb11a2b Merge "Disallow direct-boot aware activities to bypass work lock" into oc-dev 
am: 9f074e2224

Change-Id: Ie57c07ed9caee3ee66847cbedc4b10b79bcd9abe
 2017-04-12 18:36:10 +00:00
Siyamed Sinir
e1f3987ddb Merge "Do not enforce paragraph constraint for copy ctr" into oc-dev am: 37bfd57ead 
am: fcbc2800db

Change-Id: I1abf46b2204d6c2e382a2aefcf02bbab47fcdf25
 2017-04-12 18:33:39 +00:00
TreeHugger Robot
1f477fb270 Merge "Updates reportChooserSelection to be synchronized with queryUsageStats in UsageStatsService, to fix a flaky test." into oc-dev 2017-04-12 18:33:23 +00:00
nharold
176bfb58c6 Merge changes from topic 'ipsec-api-tweaks' 
am: fddf677b8b

Change-Id: I0c0812164e8fa4b36fd43f00b7388d4c0cc337f1
 2017-04-12 18:29:04 +00:00
Mady Mellor
8f395a16fb Merge "Don't offer snooze for foreground service notifications" into oc-dev 2017-04-12 18:27:29 +00:00
Nathan Harold
9c2428ad4d IpSecManager and IpSecAlgorithm API Tweaks 
am: 6045429b35

Change-Id: I93d58f64834e5a4c7bc1bf03a5baf2eb5364a36d
 2017-04-12 18:27:09 +00:00
Bill Yi
d5a6453cba Merge "Import translations. DO NOT MERGE" into oc-dev 
am: 2d1fb47916  -s ours

Change-Id: Ie7184d013593bad3c8b70974917236fd1717bd6a
 2017-04-12 18:26:14 +00:00
Charles He
9f074e2224 Merge "Disallow direct-boot aware activities to bypass work lock" into oc-dev 2017-04-12 18:25:49 +00:00
Jiaquan He
fb62ecb220 Fix broken CTS tests. 
The default focus highlight should be necessary when the view is
attached to window.

Test: cts-tradefed run singleCommand cts --skip-device-info
--skip-preconditions --abi armeabi-v7a -m CtsViewTestCases -t
android.view.cts.ViewTest
Test: cts-tradefed run singleCommand cts --skip-device-info
--skip-preconditions --abi armeabi-v7a -m CtsWidgetTestCases -t
android.widget.cts.MediaControllerTest
Bug: 37082416

Change-Id: I5d6b0c00b5ba03c8f62e4f71be9336823a73134b
 2017-04-12 18:25:26 +00:00
Jiaquan He
8062949ece Draw a default focus highlight if needed. 
This commit draws a default highlight for a focused
View if it's detected to have no state_focused defined
and its useDefaultFocusHighlight attribute is true.

When we detect a default highlight is needed, we show it
on top of the view to. Once we detect that it's no longer
needed, we remove it.

Test: Check that views without a focused_state in its
state spec have a default highlight when they get focused.
Bug: 35096940

Change-Id: Ifbe4bb9e1297d98845314e24d8b758f14e5987a9
 2017-04-12 18:24:52 +00:00
Jiaquan He
b7daaf8b5f Add a public API defaultFocusHighlightEnabled. 
This commit adds a public API to turn on/off default
focus highlights. When a focused View is detected to
have no state_focused defined, we can use this API to
decide wether we should show a default highlight for it.

Test: cts-tradefed run singleCommand cts --skip-device-info
--skip-preconditions --abi armeabi-v7a -m CtsViewTestCases
-t android.view.cts.View_DefaultFocusHighlightTest
Bug: 35096940

Change-Id: I76b45d6bf5761641a0ed7f4d0b04cb325ed72b52
 2017-04-12 18:23:43 +00:00
Siyamed Sinir
fcbc2800db Merge "Do not enforce paragraph constraint for copy ctr" into oc-dev 
am: 37bfd57ead

Change-Id: I9ccf940b5e2d47bbb29fcb12bea3c20d2ea9ae69
 2017-04-12 18:17:57 +00:00
TreeHugger Robot
2d1fb47916 Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-12 18:17:56 +00:00
Vladislav Kaznacheev
f619ead8d3 Revert "Make scrollbarSize in Material Design theme configurable" 
This reverts commit 98329f4da372e2ab00565b88df785620856cfb65.

Bug: 35432058
Test: android.view.cts.ViewTest passes
Change-Id: I4c76450a47b581a8237108180806845f5f66ac39
 2017-04-12 11:16:51 -07:00
Dianne Hackborn
24f3cd4ead Merge "Add new "work queue" feature to JobScheduler." into oc-dev am: 0a0a63c8b1 
am: cba1893400

Change-Id: I67e7438a5563192391366683695c7fc4514a5bd6
 2017-04-12 18:14:58 +00:00
nharold
fddf677b8b Merge changes from topic 'ipsec-api-tweaks' 
* changes:
  Add FileDescriptor Versions of applyTransportModeTransform()
  IpSecManager and IpSecAlgorithm API Tweaks
 2017-04-12 18:13:57 +00:00
Powei Feng
a900f39a9f Merge "Revert "Transition from Activity to Broadcast for TV Search"" into oc-dev am: f63cb49b15 
am: c27853471e

Change-Id: Ib62faa847c91b8629ee9c67fa7efb020b56dae2d
 2017-04-12 18:11:51 +00:00
Siyamed Sinir
37bfd57ead Merge "Do not enforce paragraph constraint for copy ctr" into oc-dev 2017-04-12 18:09:58 +00:00
Makoto Onuki
a56ba60c94 "bmgr restore" really should wait until operation finishes. 
Test: manual test
Bug 37246838

Change-Id: Ice381dc250e2d2a59cff48152dd3c8d6897d0804
 2017-04-12 11:08:49 -07:00
Dianne Hackborn
cba1893400 Merge "Add new "work queue" feature to JobScheduler." into oc-dev 
am: 0a0a63c8b1

Change-Id: I646a3a144833650f9ee7b9727f73ee78c7c82532
 2017-04-12 18:02:53 +00:00
TreeHugger Robot
7aca1f5619 Merge "Import translations. DO NOT MERGE" 2017-04-12 18:01:29 +00:00
Powei Feng
c27853471e Merge "Revert "Transition from Activity to Broadcast for TV Search"" into oc-dev 
am: f63cb49b15

Change-Id: If3d06de8fcc60080b51bb367ddc37b3d924af0b3
 2017-04-12 18:01:12 +00:00
Derek Sollenberger
86a1c30a11 Merge "Change behavior of setBitmap to cleanly reset the canvas" into oc-dev am: 7944962b7e 
am: 43844db75d

Change-Id: I8e362993a2fc51ce93015924d4819884301aa0c1
 2017-04-12 17:59:18 +00:00
Jakub Pawlowski
9e377194e3 Bluetooth 5 PHY simplification 
Having PHY_LE_* constants defined in four different places, with one
value being different than others is misleading. Leave just PHY_LE_*
definitions in BluetoothDevice, and add PHY_LE*_MASK for the mask used
in PHY update API.

This patch also removes need to translate PHY value between PHY update
request and event, as mask is used for request, and the value is
returned in event.

Bug: 30622771
Test: manual
Change-Id: I897effa1204a024465d55501c83c542566c4d37c
 2017-04-12 10:57:03 -07:00
Dianne Hackborn
0a0a63c8b1 Merge "Add new "work queue" feature to JobScheduler." into oc-dev 2017-04-12 17:55:56 +00:00
Dianne Hackborn
83249ec4f1 Add API to get a uid's current importance. 
This is kind-of useful to go along with monitoring
uid importance changes.

Test: none yet

Change-Id: Ic0f8418955d17ea21d06f49dcd9641bc5f32387b
 2017-04-12 10:54:31 -07:00
TreeHugger Robot
f63cb49b15 Merge "Revert "Transition from Activity to Broadcast for TV Search"" into oc-dev 2017-04-12 17:53:02 +00:00
Seigo Nonaka
7bb1c18b58 Merge "Remove unused public APIs." into oc-dev am: feaa8b0f01 
am: d40151e581

Change-Id: Iaf7d6950c821acd48c87dd76b747a8065193de29
 2017-04-12 17:50:10 +00:00
Derek Sollenberger
43844db75d Merge "Change behavior of setBitmap to cleanly reset the canvas" into oc-dev 
am: 7944962b7e

Change-Id: Iced04463ac3e7f0ff696f2cf75dc064cf704863f
 2017-04-12 17:49:19 +00:00
Soonil Nagarkar
1457d4870d Merge "Fix foreground importance bug in LocationManagerService." into oc-dev am: 25a263a303 
am: 865cf6de70

Change-Id: If014b833614862e5224bc900054e24e7c33d620b
 2017-04-12 17:45:43 +00:00