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

94026 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Christopher Tate
73c2aee40a Make immersive mode public & imply update locking 
Activity.setImmersive(boolean) / android:immersive="bool" are now public.
In addition, if the foreground activity is immersive then an update lock
will be held on its behalf.  This lets applications such as movie players
suppress the display of intrusive notifications, OTA-availability dialogs,
and the like while they are displaying content that ought not to be
rudely interrupted.

The update lock aspect of this mode is *advisory*, not binding -- the
update mechanism is not actually constrained; it simply uses this information
in deciding whether/when to prompt the user.  It's more a guideline than
a rule.

Bug 7681380

Change-Id: I3c412a84cbf3933e3bf0168f2c71c54a86e4b7e5
 2012-12-10 18:40:57 -08:00
Mita Yun
81f82d29ed am aa8dc2ee: Removed mCallbackLooper from WallpaperService 
* commit 'aa8dc2ee18c15a5c7fb897d2f41116950fd30fe6':
  Removed mCallbackLooper from WallpaperService
 2012-12-10 18:36:01 -08:00
Mita Yun
aa8dc2ee18 Removed mCallbackLooper from WallpaperService 
Change-Id: Icb060a9225dbe7e848bbe80e6a9ab28fcfb59969
 2012-12-10 18:32:03 -08:00
Wink Saville
8c0e3c232a am 74199056: Merge "Add config_speed_up_audio_on_mt_calls option" 
* commit '7419905676db3cecb011d7e63a0eb64421e02b55':
  Add config_speed_up_audio_on_mt_calls option
 2012-12-10 18:11:34 -08:00
Alex Yakavenka
176c7a2b72 am 4d56777e: am 32b424f7: Add config_speed_up_audio_on_mt_calls option 
* commit '4d56777e678ab17379ec54a0875a14299817da8e':
  Add config_speed_up_audio_on_mt_calls option
 2012-12-10 17:08:58 -08:00
Alex Yakavenka
4d56777e67 am 32b424f7: Add config_speed_up_audio_on_mt_calls option 
* commit '32b424f7240580e3948f44559050262e18de99d8':
  Add config_speed_up_audio_on_mt_calls option
 2012-12-10 17:06:44 -08:00
Wink Saville
7419905676 Merge "Add config_speed_up_audio_on_mt_calls option" 2012-12-10 17:03:46 -08:00
Alex Yakavenka
32b424f724 Add config_speed_up_audio_on_mt_calls option 
Bug: 7612431
Change-Id: Ia2758f81b78a2576df8dd23c700dba3eaaef8efc
 2012-12-10 15:47:35 -08:00
Mita Yun
ebcbfb3fc7 am a98cd512: Merge "Use asynchronous messages for input method events." into jb-mr1-aah-dev 
* commit 'a98cd5122be643a51f563d02069e8f9409d44394':
  Use asynchronous messages for input method events.
 2012-12-10 15:35:05 -08:00
The Android Open Source Project
a41474d45c Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I2d8ac7dc080c9f3c400d4a7bde4df1dd892ffba4
 2012-12-10 15:19:31 -08:00
John Spurlock
bbdb062d98 Fallback to default dream if the current dream is removed. 
To minimize fix size, return only valid dreams from the service api.

Settings will "just work" with no changes.

Bug:7699398
Change-Id: I3eb88237a8ccc421fdb68d1de19820614b13d7b8
 2012-12-10 18:15:07 -05:00
Wink Saville
879723dd2d am e22217c2: Merge "Telephony: Use IccUtils from uicc package" 
* commit 'e22217c2787b0f4967b357d080d49a7f095b2db9':
  Telephony: Use IccUtils from uicc package
 2012-12-10 14:48:21 -08:00
Mita Yun
a98cd5122b Merge "Use asynchronous messages for input method events." into jb-mr1-aah-dev 2012-12-10 14:37:38 -08:00
Wink Saville
e22217c278 Merge "Telephony: Use IccUtils from uicc package" 2012-12-10 14:13:18 -08:00
The Android Automerger
7406c32d42 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-10 13:06:04 -08:00
Adam Powell
a52b4792d1 am d692c2c6: Merge "Fix EventLog string class problem in onOptionMenuSelected" 
* commit 'd692c2c6856072a3ec8bec4550466d15a9fef8d7':
  Fix EventLog string class problem in onOptionMenuSelected
 2012-12-10 11:41:29 -08:00
Quddus Chong
81f91ce997 am ecacbd26: am 8642f406: am 9d7578c7: docs: Edit fixes for IABv3 docs. 
* commit 'ecacbd266a7bfe52610066ec44439977cc067a98':
  docs: Edit fixes for IABv3 docs.
 2012-12-10 11:36:56 -08:00
Quddus Chong
ecacbd266a am 8642f406: am 9d7578c7: docs: Edit fixes for IABv3 docs. 
* commit '8642f406dcfa23836903540c7ecb0895e1e7ac4d':
  docs: Edit fixes for IABv3 docs.
 2012-12-10 11:34:56 -08:00
Quddus Chong
8642f406dc am 9d7578c7: docs: Edit fixes for IABv3 docs. 
* commit '9d7578c73afa69272dcf9476ae3eefc2b59d6778':
  docs: Edit fixes for IABv3 docs.
 2012-12-10 11:32:58 -08:00
Quddus Chong
9d7578c73a docs: Edit fixes for IABv3 docs. 
Change-Id: I20228491c90d05a39ce44f80aa1a065ce60c31e3
 2012-12-10 11:17:48 -08:00
Adam Powell
d692c2c685 Merge "Fix EventLog string class problem in onOptionMenuSelected" 2012-12-10 11:09:32 -08:00
Alex Yakavenka
5d35fcfc32 Telephony: Use IccUtils from uicc package 
Change-Id: I80204a2f3dc57cac875abeab390bb9db7a636ff7
 2012-12-10 10:35:08 -08:00