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

183952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul McLean
5f035052b6 Merge "Handle simultaneous connect of devices with the same "type" (as in USB)" 2015-03-10 22:48:34 +00:00
Ricky Wai
73f43da509 Merge "Add Phone.ENTERPRISE_CONTENT_URI" 2015-03-10 22:46:23 +00:00
Chris Craik
c016e4c9e6 Merge "Track down unsupported texture target" 2015-03-10 22:40:15 +00:00
Wale Ogunwale
e5afd8293d Merge "Revert "Remove activity and window stacks when last task is removed."" 2015-03-10 22:36:41 +00:00
Craig Mautner
c4be908726 Merge "Correct docs to specify leading slash in paths." 2015-03-10 22:08:28 +00:00
Wale Ogunwale
7a7bf5ea48 Revert "Remove activity and window stacks when last task is removed." 
This reverts commit 0f95e3f0753508344b198c0a76afb892df514f52.

Bug: 19644506
Bug: 19083170
Change-Id: I2eb2a0400be58fe2c5d48a4b68368725e98aaf6f
 2015-03-10 15:05:01 -07:00
Chris Craik
1d21dc22e2 Merge "Add several CallSupers to View" 2015-03-10 22:02:24 +00:00
Paul McLean
394a8e1fa7 Handle simultaneous connect of devices with the same "type" (as in USB) 
Change-Id: I163bf8e33ccf5aacc7ba21775916727430327f18
Bug: 19563570
 2015-03-10 14:55:30 -07:00
Chris Craik
48f650cb24 Track down unsupported texture target 
bug:19641517

Change-Id: Idc2e413abef5bb1438ffb3f52efb001504d3e89f
 2015-03-10 14:02:06 -07:00
John Spurlock
0b4db747d3 Merge "ZenLog: Track changes to effect suppressorship." 2015-03-10 20:11:12 +00:00
Svetoslav
dbbeeb3f44 Remove unused settings constants from the SDK (framework). 
The settings constants for various volumes do nothing and are
used by nothing since API version 2. These are however backed
up in the cloud which is a waste of resource. This change
removes these constants from the SDK while keeping them hidden
to avoid breaking released apps and also prevents unnecessary
backup.

Change-Id: I2e91863115f5a4b997a14f8d0f57b4dc9689cfab
 2015-03-10 19:53:12 +00:00
Robin Lee
5ca9616733 Merge "Move more file handling into LockSettingsStorage" 2015-03-10 18:30:26 +00:00
dcashman
86bb9ba586 am 4c887ac9: am db7fa51f: am c7446790: Merge "ZygoteConnection: remove obsolete security checks." 
* commit '4c887ac9318402b914dbee4462485006395bdfbe':
  ZygoteConnection: remove obsolete security checks.
 2015-03-10 18:15:54 +00:00
Rich Slogar
8ee4cfbe60 am 502c30da: am 5427ac71: am 282099b5: am 5a604b35: am 00e3efb5: am f51020ea: am 6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs 
* commit '502c30da55d0bb6f2a51875558612fc50361c55f':
  docs: android plugin for gradle release 1.1.3 release notes
 2015-03-10 18:15:36 +00:00
Diego Perez
c3a5e591fa Merge "Add support for the new native Builder class on StaticLayout." 2015-03-10 18:14:00 +00:00
John Spurlock
2b50fb61c5 Merge "MediaSession: Notify PlaybackInfo callbacks when playback type changes." 2015-03-10 18:05:11 +00:00
Alan Viverette
ad019a24e3 Merge "Implement bounded ripple animation" 2015-03-10 18:04:01 +00:00
Sander Alewijnse
94ac7556a6 Merge "Do not show toast when forwarding from resolver activity to itself." 2015-03-10 17:51:59 +00:00
Makoto Onuki
d5800c0682 Merge "Cache photo URI too in calllog (contract)" 2015-03-10 17:49:32 +00:00
Craig Mautner
2070646faf Merge "Revert "Revert "Add a timeout state to frozen windows""" 2015-03-10 17:47:12 +00:00
Craig Mautner
51a5a7ccf9 Revert "Revert "Add a timeout state to frozen windows"" 
Insert correct bug id:

Fixes bug 15664090.

This reverts commit 1a07846d4d7f1665345a27da11d0f8d518b3b431.

Change-Id: Id5fd52acc47cb6f50485c14e75a448511d806ae4
 2015-03-10 17:46:05 +00:00
Craig Mautner
a88c31b58d Merge "Revert "Add a timeout state to frozen windows"" 2015-03-10 17:44:41 +00:00
Craig Mautner
1a07846d4d Revert "Add a timeout state to frozen windows" 
Wrong bug listed on comment. Resubmitting with correct bug listed.

This reverts commit a75e3e0b44e31ee5d042480d3da8d13cad56dc5a.

Change-Id: I49cb364c44763fd2d0c120d6998281d38571050b
 2015-03-10 17:44:11 +00:00
James Cook
2a914cb3ae Merge "Handle undo in TextView fields with no cursor" 2015-03-10 17:42:48 +00:00
Craig Mautner
b1febc7f89 Merge "Add a timeout state to frozen windows" 2015-03-10 17:41:54 +00:00
James Cook
900185d003 Handle undo in TextView fields with no cursor 
This fixes a rare crash in the undo system. In particular, if the
TextView did not have a cursor and the first operation was a
programmatic insert/append the "old cursor position" would be -1.
Attempting to undo would try to restore the cursor to -1 and crash.

Test will land separately in CTS.

Bug: 19332904
Change-Id: I9aa18c1e3621b99d13ac707e483154382effb81c
 2015-03-10 10:25:26 -07:00
Alan Viverette
7d6bc4f022 Merge "Revert RelativeLayout's baseline view to API 22 and below behavior" 2015-03-10 17:19:53 +00:00
Elliott Hughes
126d89bb79 Merge "resolved conflicts for merge of 7545accf to master" 2015-03-10 17:15:42 +00:00
Elliott Hughes
c0b8f647ca resolved conflicts for merge of 7545accf to master 
Change-Id: I7a9264e818fdd14bf59f0dec63ab83985f9e66fb
 2015-03-10 10:14:42 -07:00
Chris Craik
a57e9365ca Add several CallSupers to View 
Change-Id: I3011bd9757273f9c1d35f552bd6fefd4bf830029
 2015-03-10 10:12:55 -07:00
John Spurlock
bfa98599b7 MediaSession: Notify PlaybackInfo callbacks when playback type changes. 
Bug: 19665979
Change-Id: I506a71330ca04a678027f5969638fd1685326b2d
 2015-03-10 13:07:19 -04:00
Sander Alewijnse
053d3ddd40 Do not show toast when forwarding from resolver activity to itself. 
Bug:19540802
Change-Id: I99409aab42bdbf187c07a345ca5c404e88a4c918
 2015-03-10 16:37:53 +00:00
Chris Craik
edacf22ca1 Merge "Glop based composeLayerRegion/Rect" 2015-03-10 16:29:14 +00:00
Chris Craik
ddd72599bf Merge "Rename and simplify DisplayList Canvas classes" 2015-03-10 16:29:01 +00:00
Robin Lee
68e4ba4dd0 Move more file handling into LockSettingsStorage 
Strengthens the guarantee of only one kind of lock type existing at one
time by clearing all of the relevant files out closer to time of write.

Change-Id: I141103dab5d7d4bc80b05a22b8566326d1c9e7e1
 2015-03-10 16:27:43 +00:00
Luan Nguyen
2fb1d06600 am b219eac8: am a05634ff: am 408800c3: am ea9308cf: am a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs 
* commit 'b219eac8e827b034472cf885071b7e76ed6e4d60':
  docs: Add new partners to Wear index page
 2015-03-10 15:49:12 +00:00
Geoff Mendal
c26921538d am c90aa638: (-s ours) am 535bf0f8: (-s ours) am d7852b66: (-s ours) Import translations. DO NOT MERGE 
* commit 'c90aa638f6465f383e40b2063d38496aab7b8914':
  Import translations. DO NOT MERGE
 2015-03-10 15:47:51 +00:00
Eric Gilmore
2977c05fec am 89d0c0fb: am bcea1fcd: am f1eab6f5: am 39d47c7c: am a2d342e3: am beed9332: am 0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs 
* commit '89d0c0fbaec976b8b06c81a2950aed3a3c5e5b1b':
  Reworking geofencing training to new API and sample.
 2015-03-10 15:47:43 +00:00
Glenn Kasten
c9f94b9c81 am f507759e: am e442d914: am ad97ca81: am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos 
* commit 'f507759eea9aaf5eb9aeaef9d93ab4914c1c5b25':
  Fix USB typos
 2015-03-10 15:47:34 +00:00
Diego Perez
fe12aa7774 Add support for the new native Builder class on StaticLayout. 
This patch updates StaticLayout_Delegate to support the new Builder
class introduced in ag/646289.

Change-Id: I9f8c528b8751ce69482e33ac6f1bc42406a0b606
 2015-03-10 13:51:01 +00:00
Rubin Xu
ba4df96297 Merge "Document behavior change of isUninstallBlocked() since L MR1" 2015-03-10 12:34:57 +00:00
Rubin Xu
e1e6faad7b Document behavior change of isUninstallBlocked() since L MR1 
Bug: 17914630
Change-Id: I39ee2775c104e4dca7ca583b83deef0aa0e4d1e3
 2015-03-10 12:22:16 +00:00
Chris Craik
c9070ebd13 Rename and simplify DisplayList Canvas classes 
Change-Id: I49fd2ce02e01401209fe2a378e9f9547c7b27c61
 2015-03-09 19:09:55 -07:00
Mike Lockwood
7f602b75ee Merge "MIDI Manager changes:" 2015-03-10 02:03:00 +00:00
Alan Viverette
6a67db4138 Implement bounded ripple animation 
Bug: 19431322
Change-Id: I5dc1a28d8675cc6fb036b815d6227113c3f1aa4b
 2015-03-09 18:54:25 -07:00
Alan Viverette
53776a2b3c Merge "Refactor ripple components, simplify background animation" 2015-03-10 01:51:59 +00:00
Adam Lesinski
216f3edcb9 Merge "BatteryStats: Record energy info stats from WiFi and Bluetooth controllers" 2015-03-10 01:35:54 +00:00
Alan Viverette
f872ee0057 Refactor ripple components, simplify background animation 
Moves animation lifecycle and software/hardware hand-off into a unified
RippleComponent class, which makes it easier to maintain the components.
Adds better javadocs and comments to explain what's going on.

Bug: 19431322
Change-Id: Ifb9b9a7dcc24238719ef12293493ca3df107679f
 2015-03-09 18:25:21 -07:00
Glenn Kasten
a080050e42 Merge "Revert "soundpool: reuse channel for same sample if available"" 2015-03-10 01:07:32 +00:00
Chris Craik
182952f5ee Glop based composeLayerRegion/Rect 
Change-Id: I69440cabca84948e8aaead9479d616ebc2496517
 2015-03-09 18:06:32 -07:00