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

100202 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
826983368f Import translations. DO NOT MERGE 
Change-Id: I8fc81238feb8efe49902b3020c96dc7f1a84665c
Auto-generated-cl: translation import
 2013-02-13 08:44:42 -08:00
Chet Haase
a274006928 am f0bb8000: Merge "Fix getHitRect() to return correct rect for transformed child" 
# Via Android (Google) Code Review (1) and Chet Haase (1)
* commit 'f0bb8000a3a30cf389f91b70f6954b7397437b7e':
  Fix getHitRect() to return correct rect for transformed child
 2013-02-13 07:32:18 -08:00
Chet Haase
f0bb8000a3 Merge "Fix getHitRect() to return correct rect for transformed child" 2013-02-13 15:29:36 +00:00
Joe Fernandez
9851a71708 am 502a15ff: am c698a855: am d1c9d6e8: am 3b8381e1: am 7bb37c87: am 0480d5d8: Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev 
# Via Android Git Automerger (5) and others
* commit '502a15ffe83608636a83721214bf06bba60242bf':
  docs: Android SDK 21.1.0 Release Notes
 2013-02-13 07:26:25 -08:00
Joe Fernandez
502a15ffe8 am c698a855: am d1c9d6e8: am 3b8381e1: am 7bb37c87: am 0480d5d8: Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev 
# Via Android Git Automerger (4) and others
* commit 'c698a855d27520bac00677f78136b48e617ba333':
  docs: Android SDK 21.1.0 Release Notes
 2013-02-13 07:23:26 -08:00
Joe Fernandez
c698a855d2 am d1c9d6e8: am 3b8381e1: am 7bb37c87: am 0480d5d8: Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit 'd1c9d6e84969ee36f8a3b74515bae715727866a1':
  docs: Android SDK 21.1.0 Release Notes
 2013-02-13 07:21:08 -08:00
Joe Fernandez
d1c9d6e849 am 3b8381e1: am 7bb37c87: am 0480d5d8: Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev 
# Via Android Git Automerger (2) and others
* commit '3b8381e1ed71258957718b8cc8dca46ee587c0fe':
  docs: Android SDK 21.1.0 Release Notes
 2013-02-13 07:18:49 -08:00
Joe Fernandez
3b8381e1ed am 7bb37c87: am 0480d5d8: Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and others
* commit '7bb37c8748b6c7e36a18b7e55cc0b8af65b45099':
  docs: Android SDK 21.1.0 Release Notes
 2013-02-13 07:16:16 -08:00
Joe Fernandez
7bb37c8748 am 0480d5d8: Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Joe Fernandez (1)
* commit '0480d5d88c95abebb073dc1ea5a2f20d5ffdef38':
  docs: Android SDK 21.1.0 Release Notes
 2013-02-13 07:14:10 -08:00
Joe Fernandez
0480d5d88c Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev 2013-02-13 15:10:16 +00:00
Scott Main
86719293a7 am 7d9cf2b7: am 8d21b881: am 6d32f4e8: am 64aa66d1: am b861a945: am 4cb43d97: Merge "lists.js files for gms and gcm" into jb-mr1-dev 
# By Robert Ly
# Via Android Git Automerger (5) and others
* commit '7d9cf2b74236953671d20f5634f3b4234c25c6fa':
  lists.js files for gms and gcm
 2013-02-12 18:36:50 -08:00
Scott Main
7d9cf2b742 am 8d21b881: am 6d32f4e8: am 64aa66d1: am b861a945: am 4cb43d97: Merge "lists.js files for gms and gcm" into jb-mr1-dev 
# By Robert Ly
# Via Android Git Automerger (4) and others
* commit '8d21b8811cddd716411390f48f918c80b286e412':
  lists.js files for gms and gcm
 2013-02-12 18:34:50 -08:00
Scott Main
8d21b8811c am 6d32f4e8: am 64aa66d1: am b861a945: am 4cb43d97: Merge "lists.js files for gms and gcm" into jb-mr1-dev 
# By Robert Ly
# Via Android Git Automerger (3) and others
* commit '6d32f4e86e0fa67561c26582b9a25581744212f1':
  lists.js files for gms and gcm
 2013-02-12 18:32:33 -08:00
Scott Main
6d32f4e86e am 64aa66d1: am b861a945: am 4cb43d97: Merge "lists.js files for gms and gcm" into jb-mr1-dev 
# By Robert Ly
# Via Android Git Automerger (2) and others
* commit '64aa66d126b2c382ccbcc50e8690e75175074168':
  lists.js files for gms and gcm
 2013-02-12 18:31:08 -08:00
Scott Main
64aa66d126 am b861a945: am 4cb43d97: Merge "lists.js files for gms and gcm" into jb-mr1-dev 
# By Robert Ly
# Via Android (Google) Code Review (1) and others
* commit 'b861a9455ce8018b859d8b670e58324d79d9fd3a':
  lists.js files for gms and gcm
 2013-02-12 18:30:05 -08:00
Scott Main
b861a9455c am 4cb43d97: Merge "lists.js files for gms and gcm" into jb-mr1-dev 
# By Robert Ly
# Via Android (Google) Code Review (1) and Robert Ly (1)
* commit '4cb43d977bb610fc8e2789dc53334569f2aa55e8':
  lists.js files for gms and gcm
 2013-02-12 18:27:57 -08:00
Scott Main
4cb43d977b Merge "lists.js files for gms and gcm" into jb-mr1-dev 2013-02-13 02:24:57 +00:00
Robert Ly
373264b776 lists.js files for gms and gcm 
Change-Id: I786adfc966986a8e71dc2164740f2a00d60c0159
 2013-02-12 18:15:04 -08:00
Philip Milne
6f28bf1fa7 am d9050056: Merge "Fix for bug: 8184401 - GridLayout accounts for child\'s size/measurements even when a child is "GONE"" 
# Via Android (Google) Code Review (1) and Philip Milne (1)
* commit 'd9050056946132d6dc9821f77f801c584b4206a9':
  Fix for bug: 8184401 - GridLayout accounts for child's size/measurements even when a child is "GONE"
 2013-02-12 17:42:01 -08:00
Philip Milne
d905005694 Merge "Fix for bug: 8184401 - GridLayout accounts for child's size/measurements even when a child is "GONE"" 2013-02-13 01:39:06 +00:00
Fabrice Di Meglio
5889b28993 am 615ba0f7: Merge "Fix bug #8185410 BidiFormatter code should not use the Dir enum anymore" 
# Via Android (Google) Code Review (1) and Fabrice Di Meglio (1)
* commit '615ba0f73652fb008e90479be7748e04d6e225ad':
  Fix bug #8185410 BidiFormatter code should not use the Dir enum anymore
 2013-02-12 17:31:31 -08:00
Fabrice Di Meglio
615ba0f736 Merge "Fix bug #8185410 BidiFormatter code should not use the Dir enum anymore" 2013-02-13 01:28:55 +00:00
Ying Wang
9ee55ddd3e am 4c818473: Remove the unnecessary framework-res-package-target 
# Via Ying Wang
* commit '4c818473d43e0d3dcc325365221b26f48951bcdd':
  Remove the unnecessary framework-res-package-target
 2013-02-12 17:23:46 -08:00
Fabrice Di Meglio
4d1937b731 Fix bug #8185410 BidiFormatter code should not use the Dir enum anymore 
- replace Dir enum with static final int constants

Change-Id: Ibfd857e9767f14db92e50edb1681fef0d6598d99
 2013-02-12 17:22:01 -08:00
Ying Wang
4c818473d4 Remove the unnecessary framework-res-package-target 
Now the dependency should be correctly established by
framework_docs_LOCAL_JAVA_LIBRARIES.

Change-Id: I4c0ed2d3fb2855539027c7a0eb663f5747ae3ebd
 2013-02-12 17:18:44 -08:00
Wink Saville
40ec730682 am 35185a9c: Fix broken test. 
# Via Wink Saville
* commit '35185a9ccf016f1d5fbe055e89a6c4c79a247981':
  Fix broken test.
 2013-02-12 17:12:22 -08:00
Wink Saville
35185a9ccf Fix broken test. 
Change-Id: I8c5649c9b3d917cf13b94d49da44eaf510643df6
 2013-02-12 17:07:21 -08:00
Tim Murray
6b4ce305db am 43aed48f: Merge "Pass through null LaunchOption structs to standard forEach." 
# Via Android (Google) Code Review (1) and Tim Murray (1)
* commit '43aed48facaf8a177b84cf3ae580cabe48f2774a':
  Pass through null LaunchOption structs to standard forEach.
 2013-02-12 16:45:31 -08:00
Tim Murray
43aed48fac Merge "Pass through null LaunchOption structs to standard forEach." 2013-02-13 00:42:37 +00:00
Tim Murray
ba9dd06176 Pass through null LaunchOption structs to standard forEach. 
Change-Id: I4dcde6996400207c7e361ff4b7723ec7db832e80
 2013-02-12 16:23:19 -08:00
Amith Yamasani
c9c03d774e am 7f03185f: Merge "Hacks to fix lockdown" 
# By Geoffrey Borggaard
# Via Android (Google) Code Review
* commit '7f03185fbe4ac066ffa7f6e3d29b531a9c43c29f':
  Hacks to fix lockdown
 2013-02-12 16:09:33 -08:00
Craig Mautner
0c195fff67 am bea3b60e: Merge "Add AppWindowTokens to TaskList." 
# Via Android (Google) Code Review (1) and Craig Mautner (1)
* commit 'bea3b60ed1ecf1cc2a9a6b1fe550f8af7392c721':
  Add AppWindowTokens to TaskList.
 2013-02-12 16:09:30 -08:00
Dianne Hackborn
e712bcbf8b am b47e6c77: Merge "Implement issue #6646859: 4K!!!! 4K!!!! 4K!!!!" 
# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit 'b47e6c77b34da8bde5d706e5a25a413b8cc2e0ba':
  Implement issue #6646859: 4K!!!!  4K!!!!  4K!!!!
 2013-02-12 16:03:03 -08:00
Amith Yamasani
7f03185fbe Merge "Hacks to fix lockdown" 2013-02-13 00:01:47 +00:00
Geoffrey Borggaard
e45e45e37e Hacks to fix lockdown 
Change-Id: Icf715e84ac7f8bd12eabd01f35860c36a60a8caf
 2013-02-12 23:57:20 +00:00
Craig Mautner
bea3b60ed1 Merge "Add AppWindowTokens to TaskList." 2013-02-12 23:57:09 +00:00
Xavier Ducrohet
2dedf19e0f am 4f0dd02d: am 36ee5485: am 5d5c05de: am b7a4aed9: am f70b8c1c: Merge "Fix DateFormat for layoutlib." into jb-mr1.1-dev 
# Via Android Git Automerger (4) and others
* commit '4f0dd02d00107fedda0fe42978ed98855dc53b85':
  Fix DateFormat for layoutlib.
 2013-02-12 15:56:01 -08:00
Dianne Hackborn
b47e6c77b3 Merge "Implement issue #6646859: 4K!!!! 4K!!!! 4K!!!!" 2013-02-12 23:54:56 +00:00
Xavier Ducrohet
4f0dd02d00 am 36ee5485: am 5d5c05de: am b7a4aed9: am f70b8c1c: Merge "Fix DateFormat for layoutlib." into jb-mr1.1-dev 
# Via Android Git Automerger (3) and others
* commit '36ee5485b85e34008dc31e0f7bace1b2516c5db5':
  Fix DateFormat for layoutlib.
 2013-02-12 15:54:02 -08:00
Xavier Ducrohet
36ee5485b8 am 5d5c05de: am b7a4aed9: am f70b8c1c: Merge "Fix DateFormat for layoutlib." into jb-mr1.1-dev 
# Via Android Git Automerger (2) and others
* commit '5d5c05dee9911eaf8add2d4298641e60f2a113d5':
  Fix DateFormat for layoutlib.
 2013-02-12 15:52:46 -08:00
Xavier Ducrohet
5d5c05dee9 am b7a4aed9: am f70b8c1c: Merge "Fix DateFormat for layoutlib." into jb-mr1.1-dev 
# Via Android (Google) Code Review (1) and others
* commit 'b7a4aed94eb02731057fdf78eb7bafc8ececadc9':
  Fix DateFormat for layoutlib.
 2013-02-12 15:50:16 -08:00
Xavier Ducrohet
b7a4aed94e am f70b8c1c: Merge "Fix DateFormat for layoutlib." into jb-mr1.1-dev 
# Via Android (Google) Code Review (1) and Xavier Ducrohet (1)
* commit 'f70b8c1cebbf873031bc92bb6ae3be813830d300':
  Fix DateFormat for layoutlib.
 2013-02-12 15:48:07 -08:00
Xavier Ducrohet
f70b8c1ceb Merge "Fix DateFormat for layoutlib." into jb-mr1.1-dev 2013-02-12 23:44:57 +00:00
Fabrice Di Meglio
1790fdbf68 am d04892d2: Merge "Add BidiFormatter utility" 
# Via Android (Google) Code Review (1) and Fabrice Di Meglio (1)
* commit 'd04892d207d50378356feef181ac4e4eff9652d7':
  Add BidiFormatter utility
 2013-02-12 15:42:39 -08:00
Dianne Hackborn
56a2301c7a Implement issue #6646859: 4K!!!! 4K!!!! 4K!!!! 
Change-Id: Ib05a2eb6a03db50074805a437a3639a7d10684a0
 2013-02-12 15:41:49 -08:00
Jean-Baptiste Queru
06ecc8dfe2 am e6a213ff: am 2d130cee: am c5748148: Merge "Revert "makefile changes for gcm javadocs"" 
# By Robert Ly
# Via Android Git Automerger (2) and others
* commit 'e6a213ff0854a038e40f0e02ed89c3377f876e22':
  Revert "makefile changes for gcm javadocs"
 2013-02-12 15:39:09 -08:00
Fabrice Di Meglio
d04892d207 Merge "Add BidiFormatter utility" 2013-02-12 23:36:47 +00:00
Jean-Baptiste Queru
e6a213ff08 am 2d130cee: am c5748148: Merge "Revert "makefile changes for gcm javadocs"" 
# By Robert Ly
# Via Android Git Automerger (1) and others
* commit '2d130ceede3dd3af8bcc1d154fb086188c075803':
  Revert "makefile changes for gcm javadocs"
 2013-02-12 15:36:24 -08:00
Dianne Hackborn
c8f94e9f3d am 244a1f7e: Merge "App ops: media ops, set up to be callable from native code." 
# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit '244a1f7e5998bae08b480dd7b8a8e85b56c3d450':
  App ops: media ops, set up to be callable from native code.
 2013-02-12 15:30:50 -08:00
Dianne Hackborn
244a1f7e59 Merge "App ops: media ops, set up to be callable from native code." 2013-02-12 23:27:48 +00:00