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

94192 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Malin
35ef45a7a0 am 28cb6150: am 7096a17e: am 718c7484: am f0f5efbe: Android Training: Run in a Background Service 
* commit '28cb615003b1f96f7e9e579a7859094f4598e580':
  Android Training: Run in a Background Service
 2012-12-13 16:20:25 -08:00
Joe Malin
28cb615003 am 7096a17e: am 718c7484: am f0f5efbe: Android Training: Run in a Background Service 
* commit '7096a17e953d7e126e6ac8952b38920e0ea7e7e1':
  Android Training: Run in a Background Service
 2012-12-13 16:18:19 -08:00
Joe Malin
7096a17e95 am 718c7484: am f0f5efbe: Android Training: Run in a Background Service 
* commit '718c7484cf008d45f8501ae7d0cd57b31f935934':
  Android Training: Run in a Background Service
 2012-12-13 16:16:54 -08:00
Joe Malin
718c7484cf am f0f5efbe: Android Training: Run in a Background Service 
* commit 'f0f5efbea206fd0fbac655519f3f535620ed74cc':
  Android Training: Run in a Background Service
 2012-12-13 16:15:36 -08:00
The Android Automerger
a347169a6c merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-13 15:30:50 -08:00
Joe Malin
f0f5efbea2 Android Training: Run in a Background Service 
Change-Id: I002af57c65eccd0a624e00ef4b1607469199ce6b
 2012-12-13 14:32:19 -08:00
Fabrice Di Meglio
5780e19680 am 5c0d6f99: am 9de88dad: Merge "Fix bug #7724071 ImageView drawable is not loaded correctly when changing Locale" into jb-mr1.1-dev 
* commit '5c0d6f9980ed4684cbeefc28036dd9eeac474375':
  Fix bug #7724071 ImageView drawable is not loaded correctly when changing Locale
 2012-12-13 12:33:35 -08:00
Fabrice Di Meglio
5c0d6f9980 am 9de88dad: Merge "Fix bug #7724071 ImageView drawable is not loaded correctly when changing Locale" into jb-mr1.1-dev 
* commit '9de88dad29d89ec81c5e6b0df5aa92a04c8ce781':
  Fix bug #7724071 ImageView drawable is not loaded correctly when changing Locale
 2012-12-13 12:31:17 -08:00
Fabrice Di Meglio
9de88dad29 Merge "Fix bug #7724071 ImageView drawable is not loaded correctly when changing Locale" into jb-mr1.1-dev 2012-12-13 12:28:24 -08:00
Joe Fernandez
3042da8809 am b2aa3a74: am 54091f87: am 538c8d0a: Merge "docs: NDK r8d Release Notes" into jb-mr1-dev 
* commit 'b2aa3a74754299488acdff3843763f46ca571d2e':
  docs: NDK r8d Release Notes
 2012-12-13 12:20:09 -08:00
Joe Fernandez
b2aa3a7475 am 54091f87: am 538c8d0a: Merge "docs: NDK r8d Release Notes" into jb-mr1-dev 
* commit '54091f8730850772606ab2d4b4591bb902c52b44':
  docs: NDK r8d Release Notes
 2012-12-13 12:18:00 -08:00
Joe Fernandez
1f69c3b276 am 86841bd5: am 700f9ea3: am 82703ea4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev 
* commit '86841bd5c1d537da40e076e6850a09bdc884ded5':
  docs: SDK r21.0.1 Release Notes
 2012-12-13 12:17:31 -08:00
Joe Fernandez
54091f8730 am 538c8d0a: Merge "docs: NDK r8d Release Notes" into jb-mr1-dev 
* commit '538c8d0a467187008b5e2249fdbea153d598f462':
  docs: NDK r8d Release Notes
 2012-12-13 12:15:51 -08:00
Joe Fernandez
86841bd5c1 am 700f9ea3: am 82703ea4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev 
* commit '700f9ea300f92da69800a48a2325a7f93a82e8cb':
  docs: SDK r21.0.1 Release Notes
 2012-12-13 12:15:24 -08:00
Joe Fernandez
538c8d0a46 Merge "docs: NDK r8d Release Notes" into jb-mr1-dev 2012-12-13 12:14:03 -08:00
Joe Fernandez
700f9ea300 am 82703ea4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev 
* commit '82703ea4e842f59bda38cfb101ebaa3a8986aae3':
  docs: SDK r21.0.1 Release Notes
 2012-12-13 12:13:16 -08:00
Joe Fernandez
82703ea4e8 Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev 2012-12-13 12:10:58 -08:00
Scott Main
2a87c9da12 am c49ffcde: am f83ab33c: am 095d6947: docs: explain that layout height/width must be used to override include layouts 
* commit 'c49ffcdee87d185c6857bdad94f7cf53f04f6a65':
  docs: explain that layout height/width must be used to override include layouts
 2012-12-13 11:38:19 -08:00
Scott Main
c49ffcdee8 am f83ab33c: am 095d6947: docs: explain that layout height/width must be used to override include layouts 
* commit 'f83ab33c57f22f040fdb6ae546a3aae39a1b2b4c':
  docs: explain that layout height/width must be used to override include layouts
 2012-12-13 11:36:23 -08:00
Scott Main
f83ab33c57 am 095d6947: docs: explain that layout height/width must be used to override include layouts 
* commit '095d69474b8d9fbe2507f6015d0ef6821af31ae0':
  docs: explain that layout height/width must be used to override include layouts
 2012-12-13 11:34:14 -08:00
Scott Main
095d69474b docs: explain that layout height/width must be used to override include layouts 
Change-Id: I7ee63f2f05b2e9a8cd424dfb2e7c9bead9d5efc6
 2012-12-13 10:59:58 -08:00
Joe Fernandez
15776a22d5 docs: SDK r21.0.1 Release Notes 
Change-Id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3
 2012-12-13 10:59:32 -08:00
Joe Fernandez
045563cf60 docs: NDK r8d Release Notes 
Change-Id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696
 2012-12-13 10:37:57 -08:00
The Android Automerger
978d1e51ac merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-12 15:06:12 -08:00
Fabrice Di Meglio
3509935919 Fix bug #7724071 ImageView drawable is not loaded correctly when changing Locale 
aapt is not generating the correct CONFIG_LAYOUTDIR bit when a Drawable has a
LTR and RTL version. It was generating instead the wrong CONFIG_SCREEN_LAYOUT bit.

This was linked to the fact that the layout direction bits are contained into the
screen layout bit.

So now make sure that we are generating the correct CONFIG_LAYOUTDIR bit.

Change-Id: If17c84d31e6c128721ed97ee6711660b131bf941
 2012-12-12 11:52:03 -08:00
Amith Yamasani
68c308607b am 73f24ae1: am 9a147340: Merge "Don\'t update global table when upgrading secondary users\' database." into jb-mr1.1-dev 
* commit '73f24ae1d9992cf70cb05bc319d12478b2c49566':
  Don't update global table when upgrading secondary users' database.
 2012-12-12 11:43:21 -08:00
Amith Yamasani
73f24ae1d9 am 9a147340: Merge "Don\'t update global table when upgrading secondary users\' database." into jb-mr1.1-dev 
* commit '9a1473406f634ea541bd1643dc70d9aae8c10e77':
  Don't update global table when upgrading secondary users' database.
 2012-12-12 11:41:14 -08:00
Amith Yamasani
9a1473406f Merge "Don't update global table when upgrading secondary users' database." into jb-mr1.1-dev 2012-12-12 11:39:18 -08:00
Baligh Uddin
cd281b7929 am 1858bfd1: am 90e41469: Import translations. DO NOT MERGE 
* commit '1858bfd1a5d951b8c14f81b11172dfed84f5d87f':
  Import translations. DO NOT MERGE
 2012-12-12 11:26:13 -08:00
Baligh Uddin
1858bfd1a5 am 90e41469: Import translations. DO NOT MERGE 
* commit '90e41469fe99e52de2144ed24d005a1b30e5f917':
  Import translations. DO NOT MERGE
 2012-12-12 11:24:00 -08:00
Baligh Uddin
47d2db689d am f1c6f1d3: Import translations. DO NOT MERGE 
* commit 'f1c6f1d3870707c4f76261219de0bb2968bf2d31':
  Import translations. DO NOT MERGE
 2012-12-12 11:22:04 -08:00
Baligh Uddin
90e41469fe Import translations. DO NOT MERGE 
Change-Id: I19d85dc7580e4a4e20a89bc3d56fe8a434d8f585
Auto-generated-cl: translation import
 2012-12-12 11:14:26 -08:00
Baligh Uddin
f1c6f1d387 Import translations. DO NOT MERGE 
Change-Id: I6079f968a77282ed15f6a46b05dd2318c1c39ba2
Auto-generated-cl: translation import
 2012-12-12 11:11:44 -08:00
Jeff Sharkey
764bc0a7ae am bf8de6a3: Merge "Remove unnecessary locking for screen broadcasts." 
* commit 'bf8de6a349e19b32a1577080a9d8bb7f92b2301f':
  Remove unnecessary locking for screen broadcasts.
 2012-12-12 11:06:36 -08:00
Jeff Sharkey
bf8de6a349 Merge "Remove unnecessary locking for screen broadcasts." 2012-12-12 10:41:20 -08:00
Amith Yamasani
2d43fabaf7 Don't update global table when upgrading secondary users' database. 
Bug: 7722149
Change-Id: I0c1373cba316b924701136579083274eb6c9b1da
 2012-12-12 09:52:26 -08:00
The Android Open Source Project
e08791c831 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I3041300565b33629c8d2609a75d384b731f292ce
 2012-12-12 07:34:03 -08:00
Adam Powell
dc4beb483e am e7ec492f: Merge "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter" 
* commit 'e7ec492f13355888c90b3f08fbc66e49dda7ed24':
  Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter
 2012-12-11 19:10:45 -08:00
Adam Powell
c6f05e93dc am d22843a8: Merge "Fix regression in ListView click handling" 
* commit 'd22843a8a8d240fc09291b1b9505d62c1f0c0f8d':
  Fix regression in ListView click handling
 2012-12-11 18:02:30 -08:00
Adam Powell
e7ec492f13 Merge "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter" 2012-12-11 18:00:49 -08:00
Adam Powell
d22843a8a8 Merge "Fix regression in ListView click handling" 2012-12-11 17:57:58 -08:00
Robert Greenwalt
f6610e2d7d am 79e0e3fd: Merge "return value of String.replace() is ignored." 
* commit '79e0e3fd69ba6426da6575e0c778eff205318172':
  return value of String.replace() is ignored.
 2012-12-11 16:52:39 -08:00
Robert Greenwalt
79e0e3fd69 Merge "return value of String.replace() is ignored." 2012-12-11 16:34:35 -08:00
Christopher Tate
1de6239390 am 534de491: Merge "Make immersive mode public & imply update locking" into jb-mr1-aah-dev 
* commit '534de491e6522465a7ad12d7cba9b2f80deab364':
  Make immersive mode public & imply update locking
 2012-12-11 16:13:51 -08:00
Christopher Tate
534de491e6 Merge "Make immersive mode public & imply update locking" into jb-mr1-aah-dev 2012-12-11 16:11:00 -08:00
The Android Automerger
d33ef85086 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-11 15:56:27 -08:00
Adam Powell
847be7445e Fix regression in ListView click handling 
Regression caused by patch a607223f34

If an item click handler results in the ListView becoming detached
from the window, the performClick runnable could be executed twice.
Null out the mTouchModeReset runnable before running the click handler
so that it is not run by the detach handler.

Change-Id: I2fab60232027bb4876f9912088e0ffb9b17d308c
 2012-12-11 15:56:10 -08:00
Kenny Root
8f276515ea am ae5cc868: am 2735795f: Merge "If freeCache deletes APK, give out of space error" into jb-mr1.1-dev 
* commit 'ae5cc8687b4fde98449cbec1fd9a610557ff1b5d':
  If freeCache deletes APK, give out of space error
 2012-12-11 15:12:49 -08:00
Kenny Root
ae5cc8687b am 2735795f: Merge "If freeCache deletes APK, give out of space error" into jb-mr1.1-dev 
* commit '2735795f5aa906fbfd885dbacee1de0b41b80bf0':
  If freeCache deletes APK, give out of space error
 2012-12-11 15:10:47 -08:00
Kenny Root
2735795f5a Merge "If freeCache deletes APK, give out of space error" into jb-mr1.1-dev 2012-12-11 15:07:54 -08:00