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

139592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
75af3f3c96 Merge "Add abort logging for huge scales and tessellation recursion depth" 2014-06-17 20:49:29 +00:00
Chris Craik
fe02b4b344 Add abort logging for huge scales and tessellation recursion depth 
bug:15615144
Change-Id: I275732eb97f9d5179beed23eecd2ee3cc7112e10
 2014-06-17 12:23:29 -07:00
George Mount
b960752328 Merge changes Id7ae3838,I8e297443 
* changes:
  Fix NPE when shared elements are empty.
  Allow antroid.transition Transitions in fragments.
 2014-06-17 05:00:50 +00:00
George Mount
4d994261e9 Fix NPE when shared elements are empty. 
Bug 15608384

Change-Id: Id7ae383873d8d09b51d9c680942076a3a8ffea5b
 2014-06-17 20:45:31 +00:00
Adam Lesinski
afc00e1c81 Change am get-config command to use ABI string array 
There is a list of supported ABIs in android.os.Build which
is ordered by preference. This is a more flexible list to use
instead of 2 fixed ABIs.

Change-Id: I6aa3b39b5ffa888ed83a870b937e18328dd6de39
 2014-06-17 20:27:39 +00:00
George Mount
d4c3c91dd0 Allow antroid.transition Transitions in fragments. 
Bug 15274281
Bug 15189829

Change-Id: I8e2974430b84a611866fe20afe1f5745e803683f
 2014-06-17 20:24:16 +00:00
Sai Cheemalapati
e54a764cfd Merge "Adds speakerphone extra to ACTION_DIAL (2/2)." 2014-06-17 04:50:03 +00:00
Yuhao Zheng
3bcbf38e7d Passpoint OSU bug fix + API rename 
- OSU bug fix
- API rename

Change-Id: Ic4a09d53177e5c6a81269da7208841d4c6f02716
 2014-06-17 12:56:02 -07:00
Sai Cheemalapati
0f0bcb5ac5 Adds speakerphone extra to ACTION_DIAL (2/2). 
If optional extra EXTRA_SPEAKERPHONE_ON is added
to an ACTION_DIAL intent, the speakerphone will turn
on automatically once the call is connected.

Bug: 6810980

Change-Id: Ie4e1c5b413e72f9b0dbd590384571147a43a11ac
 2014-06-17 11:54:05 -07:00
Anish Athalye
a4649d95fe Merge "Implement Paint.breakText() using Minikin" 2014-06-17 04:50:03 +00:00
Robert Ly
31f8d22ec5 am 1d3f9b72: am 0bfee5a4: Merge "fix javadocs b/14414251" into klp-modular-dev 
* commit '1d3f9b72505cdf72889f9f1984005097ed35d314':
  fix javadocs b/14414251
 2014-06-17 19:31:43 +00:00
Robert Ly
1d3f9b7250 am 0bfee5a4: Merge "fix javadocs b/14414251" into klp-modular-dev 
* commit '0bfee5a4905a14a318731661214558792abc2f7d':
  fix javadocs b/14414251
 2014-06-17 19:26:48 +00:00
Adam Lesinski
7efc0eb163 am f5cb96cf: am 51736de1: am 4c488cca: Merge "[Asset Manager] Fix memory leakage bug" 
* commit 'f5cb96cfbbd2a7148b4b337097c94bea3f52d5f3':
  [Asset Manager] Fix memory leakage bug
 2014-06-17 19:21:56 +00:00
Adam Lesinski
f5cb96cfbb am 51736de1: am 4c488cca: Merge "[Asset Manager] Fix memory leakage bug" 
* commit '51736de19a4c225a54cda73754d0f57aa68def4f':
  [Asset Manager] Fix memory leakage bug
 2014-06-17 19:13:58 +00:00
Adam Lesinski
51736de19a am 4c488cca: Merge "[Asset Manager] Fix memory leakage bug" 
* commit '4c488cca531f209921cc4dfbc27ff7cdecfda71b':
  [Asset Manager] Fix memory leakage bug
 2014-06-17 19:08:50 +00:00
smain@google.com
aa3ebacd4f am dc9f74a5: misc cleanup to the SDK install steps 
* commit 'dc9f74a567f7997db669d8a48f1c79a10ae4fd2e':
  misc cleanup to the SDK install steps
 2014-06-17 18:10:24 +00:00
smain@google.com
dc9f74a567 misc cleanup to the SDK install steps 
Change-Id: I76cb566d20d134b6ba6d63ab5adb689d6bbfc0e5
 2014-06-17 11:03:51 -07:00
Griff Hazen
6762a3351c am 831ca9d3: Document best practices for display intent activities. 
* commit '831ca9d3bc73e37f555f6c07babde270f83044fe':
  Document best practices for display intent activities.
 2014-06-17 16:20:30 +00:00
Griff Hazen
831ca9d3bc Document best practices for display intent activities. 
Bug: 15412926

Change-Id: I1c3082dfde85cd03ffc97be6383a0608f925edcf
 2014-06-17 00:38:38 -07:00
Adam Lesinski
4c488cca53 Merge "[Asset Manager] Fix memory leakage bug" 2014-06-17 05:00:50 +00:00
Jeff Sharkey
40ff293a1a Merge "Only movedex() when working with apps-on-SD." 2014-06-17 04:50:03 +00:00
Jeff Sharkey
96f4e595ba Only movedex() when working with apps-on-SD. 
Partial revert of earlier change that tried doing movedex() during
a package upgrade.  Verified that the normal package upgrade path
already wipes old code as part of InstallArgs.cleanUpResourcesLI().

Change-Id: Icc5ae0d2718a0c494bfe7becf72df50c641efe1b
 2014-06-17 11:51:31 -07:00
Jae Seo
16a95459c6 Merge "TvContract: Enable building programs URI also with channel ID" 2014-06-17 05:00:50 +00:00
smain@google.com
d9e9843924 am aa3ebacd: am dc9f74a5: misc cleanup to the SDK install steps 
* commit 'aa3ebacd4f7cd7ecf02291114c109a4cd3d1d27a':
  misc cleanup to the SDK install steps
 2014-06-17 18:16:45 +00:00
Chris Craik
c4fc71dec8 Merge "Interrupt canvas before invoke" 2014-06-17 04:56:28 +00:00
Chris Craik
734df4b427 Interrupt canvas before invoke 
Change-Id: I5b818958f6255c594339bd10d9efa99e9e2c00d4
 2014-06-17 10:15:46 -07:00
John Reck
81efa15fad Merge "Make sure the root node has a type" 2014-06-17 04:56:28 +00:00
John Reck
2dc223d237 Make sure the root node has a type 
Bug: 15686491

Change-Id: I4bd64a6470dd704740e99d21cfdbe84805961401
 2014-06-17 10:47:11 -07:00
Richard Coles
2995606963 Merge "Connect WebView Async Cookie APIs" 2014-06-17 05:13:46 +00:00
Hector Dearman
24a11d311c Connect WebView Async Cookie APIs 
Bug: 14379829
Change-Id: I6b0e0644153a805eccb48d30b0ad3e91babd8093
 2014-06-17 15:32:07 +01:00
Baligh Uddin
0f8f45edad am 3358b9fe: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 
* commit '3358b9fe124a192a1775630d57485bcdec16069d':
  Import translations. DO NOT MERGE
 2014-06-17 14:30:19 +00:00
Baligh Uddin
d99d5e098f am 1d96174c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 
* commit '1d96174cd57699272fb6dd9abf08599acc6ce8d0':
  Import translations. DO NOT MERGE
 2014-06-17 14:30:14 +00:00
Baligh Uddin
22669d0024 Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 2014-06-17 05:00:50 +00:00
Baligh Uddin
281b14eea0 Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 2014-06-17 04:56:28 +00:00
Baligh Uddin
d31899bb76 Merge "Import translations. DO NOT MERGE" 2014-06-17 04:56:28 +00:00
Baligh Uddin
f67ce362cf Merge "Import translations. DO NOT MERGE" 2014-06-17 05:00:50 +00:00
Jungshik Jang
3ecdd832c7 Fix missing iteration policy on device discover action 
Device polling requires both pick policy and pick iteration policy,
however, device discovery action has no iteration policy.
Along with fix, move send result and pick policy constants
to HdmiConstants package

Change-Id: Ibbcfdc482a189bbc3aa2c61143422541da78447d
 2014-06-17 14:04:38 +09:00
John Reck
bf6899ed76 Merge "Handle Z in DA" 2014-06-17 04:50:03 +00:00
George Mount
13ccb79b34 Fix when allowExitOverlap is true to start entering as soon as possible 
Bug 15474908

Change-Id: I6d2e8f940c9ed8427183b58a712c244c9940d535
 2014-06-17 17:59:54 +00:00
John Reck
293e868bfc Handle Z in DA 
Bug: 15671775

Change-Id: I33c7a70e78ef523ffd03165fb6c39d8e04d04f1f
 2014-06-17 10:56:00 -07:00
George Mount
b963e13913 Merge "Better coordination of transition destination." 2014-06-17 04:50:03 +00:00
Jorim Jaggi
129e7ac809 Fix paddings for user switch and status bar icons. 
Bug: 15540707
Change-Id: If7288d032b9625e0fbb5b657afcf680d178e63ee
(cherry picked from commit 5d545e7c89231ac80ab2b666bd83f63bcf54f78f)
 2014-06-17 10:36:31 -07:00
George Mount
67d924341a Better coordination of transition destination. 
Bug 15470128
Bug 15470558

Wait for shared element destinations to be complete
before sending it to the calling activity.

Don't allow layout between setting final destination
and the transition values capture.

Use snapshots to hold the final position while waiting
for the called Activity to take the shared element.

Fixed problem with exiting views sometimes disappearing
when exiting.

Change-Id: Ibc655f7bb9e8dd6e8a15778c96931e3d845cc15c
 2014-06-17 10:26:50 -07:00
Griff Hazen
ea54579b54 am 6762a335: am 831ca9d3: Document best practices for display intent activities. 
* commit '6762a3351ce84ec31ce7cd54c952ddb65a108958':
  Document best practices for display intent activities.
 2014-06-17 16:25:10 +00:00
Alex Klyubin
fd445e0336 Merge "Add PSKKeyManager to enable the use of TLS-PSK." 2014-06-17 04:56:28 +00:00
Griff Hazen
f8f8bdaeba am e2f0160f: [Doc fix] Document best practices for display intent activities. 
* commit 'e2f0160f776448d18411c25c4dccd888b0cefd92':
  [Doc fix] Document best practices for display intent activities.
 2014-06-17 16:52:24 +00:00
Griff Hazen
0d0c177518 [Doc fix] Document best practices for display intent activities. 
Bug: 15412926

Change-Id: I1c3082dfde85cd03ffc97be6383a0608f925edcf
(cherry picked from commit 831ca9d3bc73e37f555f6c07babde270f83044fe)
 2014-06-17 16:26:28 +00:00
Robin Lee
b12f1778d6 Merge "Publish DevicePolicyManager CA certificate APIs" 2014-06-17 05:12:50 +00:00
John Reck
593007b804 Merge "Remove incorrect isEnabled() check" 2014-06-17 04:50:03 +00:00
John Reck
9d7ee60e5e Remove incorrect isEnabled() check 
Bug: 15683945

 invokeFunctor() does not require isEnabled() to be true
 to execute. Specifically it does not care if HardwareRenderer
 has a Surface or not, as it will fall back to a pbuffer surface
 if available. If there is no context at all, it will invoke
 with kModeProcessNoContext.

Change-Id: Ie6abe566b92c8fa33bb7a673fc3b9fa9ce913446
 2014-06-17 09:01:33 -07:00