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

99991 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
34774d312a am ea2f8029: (-s ours) Import translations. DO NOT MERGE 
# Via Baligh Uddin
* commit 'ea2f802928297c199c7b94dbbba867a8544e14ac':
  Import translations. DO NOT MERGE
 2013-02-11 11:25:58 -08:00
Baligh Uddin
13b60bb364 Import translations. DO NOT MERGE 
Change-Id: I06ad3a3528b8378d6f0aa0b596a2dee9551c06f9
Auto-generated-cl: translation import
 2013-02-11 08:14:12 -08:00
Baligh Uddin
ea2f802928 Import translations. DO NOT MERGE 
Change-Id: I5d6b97a7078b930416335dcf016bc820e1f09845
Auto-generated-cl: translation import
 2013-02-11 08:12:48 -08:00
Adam Powell
5995f9ed75 am 9d1d88ac: Merge "Fix setting action bar backgrounds after layout" 
# Via Adam Powell (1) and Android (Google) Code Review (1)
* commit '9d1d88acaaaf525bb6be49e6b7e2f3dc7992f76c':
  Fix setting action bar backgrounds after layout
 2013-02-08 18:49:44 -08:00
Adam Powell
9d1d88acaa Merge "Fix setting action bar backgrounds after layout" 2013-02-09 02:38:01 +00:00
Adam Powell
e8c8ae401b Fix setting action bar backgrounds after layout 
Fix a bug that would prevent the drawable bounds from being set
correctly for action bar containers.

Change-Id: I396aa40e3d8f6e3b47bcd438e1f26bbfc7b20a7f
 2013-02-08 18:07:19 -08:00
Dianne Hackborn
9f04721d28 am e2dce85c: Merge "Fix issue #8133857: Tracking ANR in Gallery" 
# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit 'e2dce85c63436513079f7df9f9be5e515e4956fb':
  Fix issue #8133857: Tracking ANR in Gallery
 2013-02-08 17:23:41 -08:00
Jeff Brown
5acea91116 am 39938752: Fix build break due to merge. 
# Via Jeff Brown
* commit '39938752b368ae282b821a43efbc568c925ecc34':
  Fix build break due to merge.
 2013-02-08 17:20:13 -08:00
Dianne Hackborn
e2dce85c63 Merge "Fix issue #8133857: Tracking ANR in Gallery" 2013-02-09 01:18:37 +00:00
Dianne Hackborn
50707cc820 Fix issue #8133857: Tracking ANR in Gallery 
Reworking the locking in resources so that we never hold the
state lock while calling in to potential long running operations.
This means the mTmpValue can no longer be final (since we need
to use it while the lock isn't held), so a new field needs to
be added as the lock and everything that touches mTmpValue must
deal with it being null, restoring the value in there when
possible, etc.

Change-Id: Ie5ffd0f66e5f2d0e869a62d72e7a55b1c74fe872
 2013-02-08 17:18:03 -08:00
Jeff Brown
39938752b3 Fix build break due to merge. 
Change-Id: I08c39690ee9de825ff51afc7d102ee622af6ba13
 2013-02-08 17:16:31 -08:00
Jeff Brown
ee9770339c am eaf2ec0c: am 4fd60792: am 5262a108: Merge "Complete documentation of whereArgs (Issue #43061)" 
# By Tim Roes
# Via Android Git Automerger (2) and others
* commit 'eaf2ec0c6a50f9e24d36f6d1fac9c2e6543fc5f2':
  Complete documentation of whereArgs (Issue #43061)
 2013-02-08 17:06:20 -08:00
Jeff Brown
049bd85fd8 am d5c921f2: am 64f4de03: am fa49a6b1: Merge "frameworks/base: Added English UK keyboard layout for physical keyboards" 
# By HeyRatFans
# Via Android Git Automerger (2) and others
* commit 'd5c921f2cf3bc5a33d4d3b650b220cafbdfb6813':
  frameworks/base: Added English UK keyboard layout for physical keyboards
 2013-02-08 17:06:17 -08:00
Jeff Brown
eaf2ec0c6a am 4fd60792: am 5262a108: Merge "Complete documentation of whereArgs (Issue #43061)" 
# By Tim Roes
# Via Android Git Automerger (1) and others
* commit '4fd60792473711a10dc9b27faa1a35efe9e4d6a0':
  Complete documentation of whereArgs (Issue #43061)
 2013-02-08 17:03:42 -08:00
Jeff Brown
d5c921f2cf am 64f4de03: am fa49a6b1: Merge "frameworks/base: Added English UK keyboard layout for physical keyboards" 
# By HeyRatFans
# Via Android Git Automerger (1) and others
* commit '64f4de03037b279e389ca20297e9d5086f49564c':
  frameworks/base: Added English UK keyboard layout for physical keyboards
 2013-02-08 17:03:38 -08:00
Jeff Brown
4fd6079247 am 5262a108: Merge "Complete documentation of whereArgs (Issue #43061)" 
# By Tim Roes
# Via Gerrit Code Review (1) and Tim Roes (1)
* commit '5262a1082663610a888d1145fd9676f7db41d397':
  Complete documentation of whereArgs (Issue #43061)
 2013-02-08 16:58:14 -08:00
Jeff Brown
64f4de0303 am fa49a6b1: Merge "frameworks/base: Added English UK keyboard layout for physical keyboards" 
# By HeyRatFans
# Via Gerrit Code Review (1) and Matt Beale (1)
* commit 'fa49a6b13ebf496ea01d5981f69084596d06d464':
  frameworks/base: Added English UK keyboard layout for physical keyboards
 2013-02-08 16:58:09 -08:00
Jeff Brown
30020c74d6 am e624e0c7: am 110fe9b3: am fe1f3a1b: Merge "Fix ViewRootImpl to find missing focus using D-pad." 
# By Ki-Hwan Lee
# Via Android Git Automerger (2) and others
* commit 'e624e0c70409773df6c3eb274852f9dd7961f025':
  Fix ViewRootImpl to find missing focus using D-pad.
 2013-02-08 15:58:10 -08:00
Jeff Brown
e624e0c704 am 110fe9b3: am fe1f3a1b: Merge "Fix ViewRootImpl to find missing focus using D-pad." 
# By Ki-Hwan Lee
# Via Android Git Automerger (1) and others
* commit '110fe9b303be527c30a8af95b6fb7afac12968b5':
  Fix ViewRootImpl to find missing focus using D-pad.
 2013-02-08 15:56:04 -08:00
Jeff Brown
5262a10826 Merge "Complete documentation of whereArgs (Issue #43061)" 2013-02-08 23:49:51 +00:00
Jeff Brown
110fe9b303 am fe1f3a1b: Merge "Fix ViewRootImpl to find missing focus using D-pad." 
# By Ki-Hwan Lee
# Via Gerrit Code Review (1) and Ki-Hwan Lee (1)
* commit 'fe1f3a1beff9f73f6a04bcc35239038a21bc38ff':
  Fix ViewRootImpl to find missing focus using D-pad.
 2013-02-08 15:49:46 -08:00
Jeff Brown
fa49a6b13e Merge "frameworks/base: Added English UK keyboard layout for physical keyboards" 2013-02-08 23:49:11 +00:00
The Android Open Source Project
f650c840d0 am 970b8b3f: (-s ours) am 4b71a472: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
# Via The Android Automerger (2) and others
* commit '970b8b3fa98f67961a9afdaa63899f8df074db1a':
 2013-02-08 15:48:08 -08:00
The Android Open Source Project
970b8b3fa9 am 4b71a472: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
# Via The Android Automerger (2) and The Android Open Source Project (1)
* commit '4b71a472c0f254606e93b8f9f86f7df0e6dba522':
 2013-02-08 15:45:50 -08:00
The Android Open Source Project
4b71a472c0 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I728b304c185d7f0406b6d45334c10263bd38d769
 2013-02-08 15:40:41 -08:00
Jeff Brown
fe1f3a1bef Merge "Fix ViewRootImpl to find missing focus using D-pad." 2013-02-08 23:29:11 +00:00
Romain Guy
bb40221568 am 97dcc20e: Merge "Deprecate useless BitmapDrawable constructor Bug #2590549" 
# Via Android (Google) Code Review (1) and Romain Guy (1)
* commit '97dcc20e6d6fcce712ab1101bfe03c74aa2b6682':
  Deprecate useless BitmapDrawable constructor Bug #2590549
 2013-02-08 14:05:00 -08:00
Romain Guy
97dcc20e6d Merge "Deprecate useless BitmapDrawable constructor Bug #2590549" 2013-02-08 22:01:05 +00:00
Romain Guy
7ac40e3869 Deprecate useless BitmapDrawable constructor 
Bug #2590549

Change-Id: Icb45bf2d9836c43ed0825105f64d7b98afcdcdac
 2013-02-08 14:00:15 -08:00
Romain Guy
d5edb4b318 am dad85fb7: Merge "Apply the clip rect/region to drawLines()" 
# Via Android (Google) Code Review (1) and Romain Guy (1)
* commit 'dad85fb7474c2b7e214ebc06c4cc449f26860c42':
  Apply the clip rect/region to drawLines()
 2013-02-08 13:59:39 -08:00
Romain Guy
dad85fb747 Merge "Apply the clip rect/region to drawLines()" 2013-02-08 21:57:39 +00:00
The Android Automerger
763ef60466 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-02-08 13:51:07 -08:00
Romain Guy
d71ff91dcd Apply the clip rect/region to drawLines() 
Without the check to quickReject, drawConvexPath would never
setup the clip properly.

Change-Id: I23e5b25de3383c9e9b86eea4ee7a9552f8d9efb4
 2013-02-08 13:46:40 -08:00
Dirk Dougherty
0702662082 am 6c971bfa: am b555029e: am 2e65e20c: am 9b8b4ae5: am f2d89ef9: am 64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev 
# Via Android Git Automerger (5) and others
* commit '6c971bfac3e95a0106dbdc9258656cb91ea033a8':
  Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
 2013-02-08 11:46:59 -08:00
Marco Nelissen
b35eb6b532 am 70a0327a: am 85a1ee30: am b683f354: am 69abccc3: Merge "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content" 
# By Jan Bjernler
# Via Android Git Automerger (3) and Gerrit Code Review (2)
* commit '70a0327abd80d07432cdad61fd1713a96248abb8':
  MediaStore.Audio.Media.getContentUriForPath() returns unexpected content
 2013-02-08 11:46:55 -08:00
Dirk Dougherty
6c971bfac3 am b555029e: am 2e65e20c: am 9b8b4ae5: am f2d89ef9: am 64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev 
# Via Android Git Automerger (4) and others
* commit 'b555029e411498b86efad38a1948e4cfb4f43dd1':
  Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
 2013-02-08 11:43:07 -08:00
Marco Nelissen
70a0327abd am 85a1ee30: am b683f354: am 69abccc3: Merge "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content" 
# By Jan Bjernler
# Via Android Git Automerger (2) and Gerrit Code Review (2)
* commit '85a1ee30215190b1782127a6afe323f4df4ef131':
  MediaStore.Audio.Media.getContentUriForPath() returns unexpected content
 2013-02-08 11:42:43 -08:00
Tim Murray
f24a41753f am 21c14448: Merge "Add API entry points for clipped kernels." 
# Via Android (Google) Code Review (1) and Tim Murray (1)
* commit '21c144480a95bd3dbcd0b104ba8df0ff3610c5d7':
  Add API entry points for clipped kernels.
 2013-02-08 11:32:08 -08:00
Tim Murray
21c144480a Merge "Add API entry points for clipped kernels." 2013-02-08 19:28:59 +00:00
Dirk Dougherty
b555029e41 am 2e65e20c: am 9b8b4ae5: am f2d89ef9: am 64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit '2e65e20c761f0fdee98eeefe9a8ee13c95a8b1ff':
  Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
 2013-02-08 11:21:03 -08:00
Dirk Dougherty
2e65e20c76 am 9b8b4ae5: am f2d89ef9: am 64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev 
# Via Android Git Automerger (2) and others
* commit '9b8b4ae5d7a4f5fbe242f5a2da145fd0fa88ce87':
  Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
 2013-02-08 11:17:50 -08:00
Dirk Dougherty
9b8b4ae5d7 am f2d89ef9: am 64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev 
# Via Android (Google) Code Review (1) and others
* commit 'f2d89ef9d57b096962b802608a88d3483a51d08a':
  Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
 2013-02-08 11:16:11 -08:00
Dirk Dougherty
f2d89ef9d5 am 64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Dirk Dougherty (1)
* commit '64ab8fdcb0a3015d3e6c4db0a1d66443085fd673':
  Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
 2013-02-08 11:14:23 -08:00
Dirk Dougherty
64ab8fdcb0 Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev 2013-02-08 19:10:07 +00:00
Baligh Uddin
925d87c024 Merge "Import translations. DO NOT MERGE" into master-chromium 2013-02-08 18:05:23 +00:00
Baligh Uddin
aba26edec1 am 63eb2d10: (-s ours) Import translations. DO NOT MERGE 
# Via Baligh Uddin
* commit '63eb2d1089c5bd2b10ae928e603cc588656e034e':
  Import translations. DO NOT MERGE
 2013-02-08 09:59:35 -08:00
Baligh Uddin
ca5bb2b837 Import translations. DO NOT MERGE 
Change-Id: Ia8f842319d794e6d62cd9f084ec792df819830ef
Auto-generated-cl: translation import
 2013-02-08 09:56:29 -08:00
Baligh Uddin
63eb2d1089 Import translations. DO NOT MERGE 
Change-Id: Ia60bfa7a614e309583df7273a64fdcb1f4d60633
Auto-generated-cl: translation import
 2013-02-08 09:54:56 -08:00
Marco Nelissen
85a1ee3021 am b683f354: am 69abccc3: Merge "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content" 
# By Jan Bjernler
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit 'b683f3542a123a07823b51643b1973507bfb57e2':
  MediaStore.Audio.Media.getContentUriForPath() returns unexpected content
 2013-02-08 08:44:36 -08:00
Marco Nelissen
b683f3542a am 69abccc3: Merge "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content" 
# By Jan Bjernler
# Via Gerrit Code Review
* commit '69abccc3cdacee354dec8867865a0577a4e14e63':
  MediaStore.Audio.Media.getContentUriForPath() returns unexpected content
 2013-02-08 08:41:20 -08:00