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

94049 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Jeff Brown
d7337fb97a am 3781523b: am eaae7d97: Merge "Play a tone when wireless charging begins." into jb-mr1.1-dev 
* commit '3781523becbb2d576761c2701763ff3588294a97':
  Play a tone when wireless charging begins.
 2012-12-11 14:19:41 -08:00
Jeff Brown
3781523bec am eaae7d97: Merge "Play a tone when wireless charging begins." into jb-mr1.1-dev 
* commit 'eaae7d976a5629e064af06f0e2c10f97f1a8c462':
  Play a tone when wireless charging begins.
 2012-12-11 14:17:50 -08:00
Jeff Brown
eaae7d976a Merge "Play a tone when wireless charging begins." into jb-mr1.1-dev 2012-12-11 14:14:54 -08:00
Kenny Root
3f96d0e127 If freeCache deletes APK, give out of space error 
After DownloadManager has downloaded an application to cache to install
during low memory condition, we try to free cache to fit the new
application. The free cache function deletes older files first, but it
will also delete the downloaded application (since it's in cache) as a
last resort since installd has no context about it.

This just changes the error code returned in this case so that we'll
give something more meaningful to the user. A later fix should actually
make this more sane. For instance: know which file to avoid deleting,
not even trying to delete anything if it won't arrive at the desired
free space.

Bug: 7684538
Change-Id: Ide77320fc51a4f692ef8042cb0eafe17b5cd279d
 2012-12-11 13:35:43 -08:00
Jeff Brown
84e2756c0f Play a tone when wireless charging begins. 
Only plays a tone if the battery level is below 95% which
is the same heuristic used when determining whether to turn
the screen on.

Use new low battery and wireless charging sounds on Mako.

Bug: 7371658
Change-Id: Ia4527ec398d024ee418a4287e1fcbf0ec83bcc24
 2012-12-11 12:55:03 -08:00
John Spurlock
5ccefdd6d5 am 49cc9cb8: am 5def50da: Merge "Fallback to default dream if the current dream is removed." into jb-mr1.1-dev 
* commit '49cc9cb85376bad11611966fcdbe58dae1ab7a56':
  Fallback to default dream if the current dream is removed.
 2012-12-11 11:56:56 -08:00
The Android Open Source Project
6c0ad7a064 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I1ff629cf6a936691e18b7857c1f796a3ed55fc47
 2012-12-11 11:54:15 -08:00
John Spurlock
49cc9cb853 am 5def50da: Merge "Fallback to default dream if the current dream is removed." into jb-mr1.1-dev 
* commit '5def50da0de624abeafafe71dc72b4baf423b985':
  Fallback to default dream if the current dream is removed.
 2012-12-11 11:53:53 -08:00
John Spurlock
5def50da0d Merge "Fallback to default dream if the current dream is removed." into jb-mr1.1-dev 2012-12-11 11:51:41 -08:00
Emma Sajic
ef2277ec58 Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter 
Fix for Issue ID 18316. Make isEmpty() return false when getCount() returns a non-zero value. So that the list cannot be considered empty when a header or footer is present.

https://code.google.com/p/android/issues/detail?id=18316

Change-Id: Ib69201e9d5ef3efcbb68ea298b8cc8ca6e027246
Signed-off-by: Emma Sajic <esajic@effectivelateralsolutions.co.uk>
 2012-12-11 19:50:58 +00:00
Baligh Uddin
fca736b889 am c39adf91: am d39a0d80: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit 'c39adf91c9d99eea31d9e83fa3c905516ebbb37e':
  Import translations. DO NOT MERGE
 2012-12-10 20:23:59 -08:00
Baligh Uddin
c39adf91c9 am d39a0d80: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit 'd39a0d8041cec16429331937ec81d55f18b0db72':
  Import translations. DO NOT MERGE
 2012-12-10 20:22:17 -08:00
Baligh Uddin
8672f044ff am 73f6e3f5: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '73f6e3f583b1ff2948fd82e68a3f813750165b14':
  Import translations. DO NOT MERGE
 2012-12-10 20:20:17 -08:00
Baligh Uddin
d39a0d8041 Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 2012-12-10 20:19:06 -08:00
Baligh Uddin
73f6e3f583 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-12-10 20:17:14 -08:00
The Android Automerger
20340705bb merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-10 19:33:40 -08:00