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

181350 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
de11d28710 Merge "Fix double create of Caches" 2015-01-30 18:15:07 +00:00
Alan Viverette
b59041595b Merge "Add transition support to PopupWindow" 2015-01-30 18:04:48 +00:00
Todd Kennedy
14dc3c900f Merge "Don't get extras from the Intent" 2015-01-30 17:59:19 +00:00
Chris Craik
ff5c8e8097 Fix double create of Caches 
bug:19208182
Change-Id: I91ac591cecc207da1b102013ca4985dd075cca80
 2015-01-30 09:46:18 -08:00
Todd Kennedy
aab56dbc1e Show stacks underneath a resized stack 
When a stack is resized, make sure any non-fullscreen stack beneath it
becomes visible. This may mean additional activities are resumed in the
process.

Bug: 19083171
Change-Id: I5e7a3f82d76932ea2b9dbf0324ea183c42ee5496
 2015-01-30 09:39:53 -08:00
Lorenzo Colitti
728dace14d Merge "Also include the domain when parceling StaticIpConfiguration." automerge: c565a56 automerge: 5b392ee 
automerge: a0057ad

* commit 'a0057ad69083dc09c0c853fd20119f5a9ea877d9':
  Also include the domain when parceling StaticIpConfiguration.
 2015-01-30 15:59:49 +00:00
Lorenzo Colitti
c519b8042f Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" automerge: fba459d automerge: 786deba 
automerge: b6088a8

* commit 'b6088a80b4c3309cd18f5eb46ecf0614af8339ec':
  Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
 2015-01-30 15:58:39 +00:00
Lorenzo Colitti
a0057ad690 Merge "Also include the domain when parceling StaticIpConfiguration." automerge: c565a56 
automerge: 5b392ee

* commit '5b392ee7584688d6929ca40760d0df2a12bd0b16':
  Also include the domain when parceling StaticIpConfiguration.
 2015-01-30 15:56:00 +00:00
Lorenzo Colitti
b6088a80b4 Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" automerge: fba459d 
automerge: 786deba

* commit '786deba636618fcf530e42340b0e5d683c5af74c':
  Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
 2015-01-30 15:54:45 +00:00
Baligh Uddin
50d23adfe2 Fix plurals variable to unblock Translations Pipeline. 
Bug: 19067882
 2015-01-30 07:09:16 -08:00
Derek Sollenberger
c4e4eef64a Merge "Rename Canvas::getSkCanvas to Canvas::asSkCanvas" 2015-01-30 14:25:24 +00:00
Leon Scroggins III
9a1eefe174 Merge "AvoidXferMode -> AvoidXfermode." 2015-01-30 14:12:27 +00:00
Leon Scroggins III
ed1ce37759 AvoidXferMode -> AvoidXfermode. 
When I moved this code here from external/skia, I accidentally changed
the lowercase 'm' to uppercase 'M'. Change back, to keep consistent
with SkXfermode and Xfermode.cpp.

Change-Id: I9694d29a22aaed7fcc8708f5962e3d2032297d08
 2015-01-30 09:05:11 -05:00
Leon Scroggins III
9bf106f156 Merge "Move SkAvoidXferMode into frameworks/base." 2015-01-30 13:55:23 +00:00
Leon Scroggins III
626647c3f6 Move SkAvoidXferMode into frameworks/base. 
We are removing it from Skia, so we need it here to support Android.

Add some small cleanups (remove comment that doesn't apply, convert
SK_OVERRIDE to override, remove 'virtual' keyword from methods with
'override' on them).

BUG:skbug.com/3329
Change-Id: I1f883082d6fb9d49b9c9ba9e1f50bd713eabf915
 2015-01-30 08:32:49 -05:00
Narayan Kamath
12ca74e2a0 Revert "Remove deprecated Telecom APIs" 
This reverts commit a7c9046973260aa71837410ffc8df8c296a2826f.

Change-Id: I66d3d961988ff8dd330c9482c070bfca055f6cb8
 2015-01-30 13:07:32 +00:00
Lorenzo Colitti
5b392ee758 Merge "Also include the domain when parceling StaticIpConfiguration." 
automerge: c565a56

* commit 'c565a5675ac33d97d5c1caed7a5629412997fb4a':
  Also include the domain when parceling StaticIpConfiguration.
 2015-01-30 12:15:39 +00:00
Lorenzo Colitti
786deba636 Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" 
automerge: fba459d

* commit 'fba459d3457a0cb61bcb657c9fafadf0ccea27a9':
  Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
 2015-01-30 12:13:38 +00:00
Lorenzo Colitti
c565a5675a Merge "Also include the domain when parceling StaticIpConfiguration." 2015-01-30 07:07:49 +00:00
Lorenzo Colitti
fba459d345 Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" 2015-01-30 07:00:38 +00:00
Sailesh Nepal
a7c9046973 Remove deprecated Telecom APIs 
This APIs are no longer used and are safe to delete.

Bug: 18607657
Change-Id: I94dad196db9f8be544f05b12b7b71de124fc9328
 2015-01-30 06:18:48 +00:00
Alan Viverette
87d2169b74 am f607fa6b: am d38cc749: Merge "Avoid bug in LinearLayout measurement" into lmp-mr1-dev 
automerge: c89cdf2

* commit 'c89cdf2ad435b3b5da16405a0eceb600e93b7a3e':
  Avoid bug in LinearLayout measurement
 2015-01-30 03:34:25 +00:00
Alan Viverette
c89cdf2ad4 am f607fa6b: am d38cc749: Merge "Avoid bug in LinearLayout measurement" into lmp-mr1-dev 
* commit 'f607fa6b73019998588e613aa2ae8ee97958cee7':
  Avoid bug in LinearLayout measurement
 2015-01-30 03:32:33 +00:00
Alan Viverette
f607fa6b73 am d38cc749: Merge "Avoid bug in LinearLayout measurement" into lmp-mr1-dev 
* commit 'd38cc749215c0e41bcb06703066c379de83d91e4':
  Avoid bug in LinearLayout measurement
 2015-01-30 03:20:44 +00:00
Alan Viverette
d38cc74921 Merge "Avoid bug in LinearLayout measurement" into lmp-mr1-dev 2015-01-30 03:15:07 +00:00
Christopher Ferris
50e54d01bd am fd41feee: Merge "Fix wrap property creation when truncating." into lmp-mr1-dev automerge: 5d0cf917 
automerge: fd00f1e

* commit 'fd00f1e92606e656ea305eeead6f21fb991e9a57':
  Fix wrap property creation when truncating.
 2015-01-30 02:42:32 +00:00
Christopher Ferris
fd00f1e926 am fd41feee: Merge "Fix wrap property creation when truncating." into lmp-mr1-dev 
automerge: 5d0cf917

* commit '5d0cf917c3e21490ed709e27893b9f02e997cf52':
  Fix wrap property creation when truncating.
 2015-01-30 02:40:09 +00:00
Christopher Ferris
5d0cf917c3 am fd41feee: Merge "Fix wrap property creation when truncating." into lmp-mr1-dev 
* commit 'fd41feee6b909670010da79a0800c1aa2ce44255':
  Fix wrap property creation when truncating.
 2015-01-30 02:33:34 +00:00
Christopher Ferris
fd41feee6b Merge "Fix wrap property creation when truncating." into lmp-mr1-dev 2015-01-30 02:29:27 +00:00
Rich Slogar
7dfd737c4c am 4649dcd7: am f4fa2acb: am 6ccb72e6: am e0063faa: Merge "docs: linux requirements update" into lmp-docs automerge: e9e2707 
automerge: 9c64950

* commit '9c64950ee269eda596f894c05224b51b8be53739':
  docs: linux requirements update
 2015-01-30 02:18:32 +00:00
Scott Rowe
bed638f292 am b2788236: am 8f5714d3: am a3031211: am b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs automerge: 1b5a0fb 
automerge: 811935e

* commit '811935e51c17f116e68b01828ba2a2bf5f4ac41f':
  docs: Card View for Android TV training
 2015-01-30 02:17:00 +00:00
Scott Rowe
84d180523c am 4ca01ef2: am 2d1c5dc8: am e4249f29: am 87a1bf09: docs: b/19193358 Android TV overscan instructions: settings reversed in text automerge: 9ad282f 
automerge: ec1e8aa

* commit 'ec1e8aa6afc59a2f2f8581a333a02dcdeffada87':
  docs: b/19193358 Android TV overscan instructions: settings reversed in text
 2015-01-30 02:15:33 +00:00
Rich Slogar
9c64950ee2 am 4649dcd7: am f4fa2acb: am 6ccb72e6: am e0063faa: Merge "docs: linux requirements update" into lmp-docs automerge: e9e2707 
* commit '4649dcd7c41aa3893ff0e52c5142a7d95c678b7b':
  docs: linux requirements update
 2015-01-30 02:13:45 +00:00
Scott Rowe
811935e51c am b2788236: am 8f5714d3: am a3031211: am b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs automerge: 1b5a0fb 
* commit 'b27882361ec5b0602d55783131ba28942b318a77':
  docs: Card View for Android TV training
 2015-01-30 02:13:40 +00:00
Scott Rowe
ec1e8aa6af am 4ca01ef2: am 2d1c5dc8: am e4249f29: am 87a1bf09: docs: b/19193358 Android TV overscan instructions: settings reversed in text automerge: 9ad282f 
* commit '4ca01ef21d7eacf398989740c6985a97891111e6':
  docs: b/19193358 Android TV overscan instructions: settings reversed in text
 2015-01-30 02:13:34 +00:00
Rich Slogar
4649dcd7c4 am f4fa2acb: am 6ccb72e6: am e0063faa: Merge "docs: linux requirements update" into lmp-docs 
automerge: e9e2707

* commit 'e9e2707feffd01c39252afcdea15523c9883a7ea':
  docs: linux requirements update
 2015-01-30 02:10:53 +00:00
Scott Rowe
b27882361e am 8f5714d3: am a3031211: am b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs 
automerge: 1b5a0fb

* commit '1b5a0fb681c3e2c1aad2d8a9b5313c2bd1b93220':
  docs: Card View for Android TV training
 2015-01-30 02:09:16 +00:00
Scott Rowe
4ca01ef21d am 2d1c5dc8: am e4249f29: am 87a1bf09: docs: b/19193358 Android TV overscan instructions: settings reversed in text 
automerge: 9ad282f

* commit '9ad282fd73141685a2fc0d3474676ab10ddc4e1f':
  docs: b/19193358 Android TV overscan instructions: settings reversed in text
 2015-01-30 02:07:44 +00:00
Rich Slogar
e9e2707fef am f4fa2acb: am 6ccb72e6: am e0063faa: Merge "docs: linux requirements update" into lmp-docs 
* commit 'f4fa2acb22acdf2ddb536fd1e7e5b9df51d6a787':
  docs: linux requirements update
 2015-01-30 01:58:22 +00:00
Scott Rowe
1b5a0fb681 am 8f5714d3: am a3031211: am b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs 
* commit '8f5714d3e1f29c0ec761c3471a12d2f486bbaee3':
  docs: Card View for Android TV training
 2015-01-30 01:53:53 +00:00
Scott Rowe
9ad282fd73 am 2d1c5dc8: am e4249f29: am 87a1bf09: docs: b/19193358 Android TV overscan instructions: settings reversed in text 
* commit '2d1c5dc8ef3dfa8e4eea25197b38b654d7e8cc9d':
  docs: b/19193358 Android TV overscan instructions: settings reversed in text
 2015-01-30 01:53:48 +00:00
Rich Slogar
f4fa2acb22 am 6ccb72e6: am e0063faa: Merge "docs: linux requirements update" into lmp-docs 
* commit '6ccb72e685da6769d43545c21182ca44e039da3e':
  docs: linux requirements update
 2015-01-30 01:49:12 +00:00
Scott Rowe
8f5714d3e1 am a3031211: am b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs 
* commit 'a303121168f1e3cfe62f6836a38ba1a33f3e336d':
  docs: Card View for Android TV training
 2015-01-30 01:44:43 +00:00
Scott Rowe
2d1c5dc8ef am e4249f29: am 87a1bf09: docs: b/19193358 Android TV overscan instructions: settings reversed in text 
* commit 'e4249f29ea56f35aab1337323a0e55992ee9247f':
  docs: b/19193358 Android TV overscan instructions: settings reversed in text
 2015-01-30 01:44:39 +00:00
Rich Slogar
6ccb72e685 am e0063faa: Merge "docs: linux requirements update" into lmp-docs 
* commit 'e0063faa8707e2424a33625aaf2228540fa67e85':
  docs: linux requirements update
 2015-01-30 01:41:58 +00:00
Scott Rowe
a303121168 am b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs 
* commit 'b86c3b80db09da85b50c1809520bbf893cb83d93':
  docs: Card View for Android TV training
 2015-01-30 01:37:23 +00:00
Scott Rowe
e4249f29ea am 87a1bf09: docs: b/19193358 Android TV overscan instructions: settings reversed in text 
* commit '87a1bf097078e43dc9e7c060daf8d835afd7bf6d':
  docs: b/19193358 Android TV overscan instructions: settings reversed in text
 2015-01-30 01:37:21 +00:00
Rich Slogar
e0063faa87 Merge "docs: linux requirements update" into lmp-docs 2015-01-30 01:32:18 +00:00
Scott Rowe
b86c3b80db Merge "docs: Card View for Android TV training" into lmp-docs 2015-01-30 01:30:44 +00:00
Alan Viverette
3e2ec1cc9c Avoid bug in LinearLayout measurement 
Reverts to Holo-style layout where the View divider masks the bug.
Uses a 0-height divider to avoid visual changes.

Bug: 19201079
Change-Id: Ib9e701815c57b23d5ba7173f8de553e90e27ed11
 2015-01-30 01:30:23 +00:00