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

63519 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
46b9f7cc20 GenerationCache::get would return a random value instead of NULL 
Bug #5401917

This was causing a ton of random crashes in apps.

Change-Id: I9069a060824ec89115cd3bcd38beaeb9ecc4488e
 2011-12-08 18:50:27 -08:00
Joe Malin
8e94d912c6 am 556e4ca5: am 0a9005ed: Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0 
* commit '556e4ca54161be17333ec98fadc113485120a6e8':
  DOC CHANGE: Package text and Formatter javadoc
 2011-12-08 17:46:44 -08:00
Joe Malin
556e4ca541 am 0a9005ed: Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0 
* commit '0a9005ed58d3a6173e8fffbd72933f7646c6fdba':
  DOC CHANGE: Package text and Formatter javadoc
 2011-12-08 17:44:34 -08:00
Joe Malin
0a9005ed58 Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0 2011-12-08 17:42:36 -08:00
Chia-chi Yeh
fa71962fe4 am 46a4e81d: Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1 
* commit '46a4e81dbdc9a5f401b5a3c0d26dea2e42b61487':
  VPN: delete the "abort" file before starting VPN daemons.
 2011-12-08 17:24:16 -08:00
Chia-chi Yeh
46a4e81dbd Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1 2011-12-08 17:22:16 -08:00
Mangesh Ghiware
66b2ff818b Update computation of reading level scale. 
Fixes bug 5726043 (Extra double-tap needed to zoom out to overview mode
on nytimes.com on a Stingray)

Change-Id: I54dc303f4aa81ddc38c234228adc915b9f6749dc
 2011-12-08 17:11:16 -08:00
Amith Yamasani
8df9609768 Show the current stream's volume in the volume panel. 
Bug: 5409969

If the current stream being displayed is different from the
stream being adjusted, rearrange the sliders, unless multiple
sliders are being shown.

Change-Id: Ia48986c1046305d7fee7a32177d78d8ffd84a11b
 2011-12-08 17:03:54 -08:00
Chia-chi Yeh
c187273292 VPN: delete the "abort" file before starting VPN daemons. 
Bug: 5714296
Change-Id: Idba41b9f3907747a84387ea4f3e930b3a185a06e
 2011-12-08 16:51:41 -08:00
Irfan Sheriff
c34306e46e am 97ff7893: Merge "Fix wifi bring up at boot up" into ics-mr1 
* commit '97ff7893321362020211fae3c5a52b95c3ec19e1':
  Fix wifi bring up at boot up
 2011-12-08 16:01:59 -08:00
Irfan Sheriff
97ff789332 Merge "Fix wifi bring up at boot up" into ics-mr1 2011-12-08 15:59:26 -08:00
Jake Hamby
555fe79cdf am c40f70a5: Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines." into ics-mr1 
* commit 'c40f70a5cb1f24a9ea0b5b0cadea75db8fc1cdd3':
  Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines.
 2011-12-08 15:53:42 -08:00
Jake Hamby
c40f70a5cb Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines." into ics-mr1 2011-12-08 15:51:33 -08:00
Irfan Sheriff
5401f0b87b Fix wifi bring up at boot up 
Bug: 5719176
Change-Id: Iac879fc634f6ab6289b73c46931d754bc0af2f87
 2011-12-08 15:50:47 -08:00
Fabrice Di Meglio
63b068040f Merge "Clean TextLayout code and remove RTL_USE_HARFBUZZ" 2011-12-08 15:42:28 -08:00
Jake Hamby
48d50958af Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines. 
The ICS navigation guidelines state that the OK action should be to the
right of the cancel action in UI dialogs. Update the SIM PIN unlock and
SIM PUK unlock layouts to swap the OK and Cancel buttons (for soft keypad)
and the OK and Emergency Call buttons for the physical keyboard landscape
layout.

Bug: 5730977
Change-Id: Iaf565bc2b584292a34f5a72a7a763003f9149f27
 2011-12-08 15:33:32 -08:00
Fabrice Di Meglio
b02d0ca555 Clean TextLayout code and remove RTL_USE_HARFBUZZ 
- remove dependencies on ICU
- use TextLayouCache
- remove RTL_USE_HARFBUZZ define (we *are* using Harfbuzz now)
- also fix compilation warning

Change-Id: I022e11703438d07032e49e42724184f6bf16653e
 2011-12-08 15:16:17 -08:00
Andreas Huber
ebfce84f7f am 68f592a8: Merge "Don\'t perform RTSP seeks right away but queue them for 200ms" into ics-mr1 
* commit '68f592a8210af27df4339089bbee47fb602cae6a':
  Don't perform RTSP seeks right away but queue them for 200ms
 2011-12-08 13:35:53 -08:00
Andreas Huber
aa82c39bdb am 0ba9380a: Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1 
* commit '0ba9380a337d5e2eae9fd9e4eb8039403ed3815b':
  Fix Bitreader "putBits" implementation, make sure we emulate timestamps
 2011-12-08 13:35:51 -08:00
Andreas Huber
68f592a821 Merge "Don't perform RTSP seeks right away but queue them for 200ms" into ics-mr1 2011-12-08 13:33:16 -08:00
Andreas Huber
0ba9380a33 Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1 2011-12-08 13:33:06 -08:00
Andreas Huber
21902a8a48 Don't perform RTSP seeks right away but queue them for 200ms 
and only execute the last one.

Change-Id: I9ab342396ec9c9c03624a4b0306d1e180ceca000
related-to-bug: 5732960
 2011-12-08 13:04:50 -08:00
Svetoslav Ganov
33a3b2cecf am 48b428fb: Merge "NumberPicker getting stuck if scroll wheel not wrapable." into ics-mr1 
* commit '48b428fb1369a787a15fa6d8ebf10f8b31937a8b':
  NumberPicker getting stuck if scroll wheel not wrapable.
 2011-12-08 12:30:14 -08:00
Svetoslav Ganov
48b428fb13 Merge "NumberPicker getting stuck if scroll wheel not wrapable." into ics-mr1 2011-12-08 12:28:11 -08:00
Andreas Huber
f6ae711450 Fix Bitreader "putBits" implementation, make sure we emulate timestamps 
if we don't receive npt time mapping from the rtsp server (i.e. live stream)

Change-Id: I5147d665bd90c9a303ad6ffdafbf770f930f917c
related-to-bug: 5660357
 2011-12-08 12:27:47 -08:00
Irfan Sheriff
a3c7c35873 am 583fdf00: Merge "Handle emergency call back mode correctly" into ics-mr1 
* commit '583fdf0068ac46fb384a5aa2b193faf743f8221c':
  Handle emergency call back mode correctly
 2011-12-08 12:23:03 -08:00
Irfan Sheriff
583fdf0068 Merge "Handle emergency call back mode correctly" into ics-mr1 2011-12-08 12:21:20 -08:00
Gilles Debunne
b25d417fce am aa4a5713: Merge "Make the Next key navigate between TextViews" into ics-mr1 
* commit 'aa4a5713aab73cf7c9486cd587a0d986a8daf7e3':
  Make the Next key navigate between TextViews
 2011-12-08 11:58:33 -08:00
Gilles Debunne
5371a165b5 am 0e7b8020: Merge "Limit created string size in Spell Checker" into ics-mr1 
* commit '0e7b8020fd8607957844f7d67e8aaa6dc2ef816f':
  Limit created string size in Spell Checker
 2011-12-08 11:58:31 -08:00
Gilles Debunne
aa4a5713aa Merge "Make the Next key navigate between TextViews" into ics-mr1 2011-12-08 11:57:06 -08:00
Gilles Debunne
0e7b8020fd Merge "Limit created string size in Spell Checker" into ics-mr1 2011-12-08 11:56:28 -08:00
Irfan Sheriff
4494c90616 Handle emergency call back mode correctly 
Bug: 5726996
Change-Id: I5815dd402bd73c530b9ba6d545d8956064949aa2
 2011-12-08 11:31:52 -08:00
Eric Fischer
8430094cd9 am ab6b816a: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit 'ab6b816a76c77f1ecd9a0ae911026aaba062f6d1':
  Import revised translations. DO NOT MERGE
 2011-12-08 11:11:06 -08:00
Eric Fischer
ab6b816a76 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-12-08 11:09:11 -08:00
Gilles Debunne
06a8e9b1ce Make the Next key navigate between TextViews 
Bug 5718127

Fixes from changes introduced in
https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=0500b3cfda5192efc09d6d4344b0c6c785c0a815

Change-Id: I4f6d213cd744b913b053275c4a26194cd030de84
 2011-12-08 10:39:39 -08:00
Eric Fischer
24783fcfb7 Import revised translations. DO NOT MERGE 
Change-Id: I06d796d48b50c6a459b6ae8a6dad47730126a49d
 2011-12-08 10:31:25 -08:00
The Android Open Source Project
abe0ed4916 am 641a5624: Reconcile with ics-mr0-release 
* commit '641a5624075ee942b85b17646b57f65377567a06':
 2011-12-08 10:29:04 -08:00
The Android Open Source Project
641a562407 Reconcile with ics-mr0-release 
Change-Id: I2b2afc572c36ef210d81af16bd2e52cecdd94079
 2011-12-08 10:26:33 -08:00
The Android Open Source Project
54854d3117 Reconcile with ics-mr0-release ics-mr1-release 
Change-Id: Ia4cdb4ae14cd906ff06b5e92ef3baeb7394e654c
 2011-12-08 10:21:43 -08:00
Gilles Debunne
aee940df55 am a5a98a03: Merge "IOOB is Suggestions" into ics-mr1 
* commit 'a5a98a034b4d52c6bbc75e72f74f1a6ea1c61ed5':
  IOOB is Suggestions
 2011-12-08 10:01:29 -08:00
Gilles Debunne
9f4b70c725 am 89f2e8a0: Merge "Prevent NPE in SuggestionSpan" into ics-mr1 
* commit '89f2e8a099c32cdbb8409482fe91dabea5a7673e':
  Prevent NPE in SuggestionSpan
 2011-12-08 10:01:27 -08:00
Gilles Debunne
a5a98a034b Merge "IOOB is Suggestions" into ics-mr1 2011-12-08 09:59:44 -08:00
Gilles Debunne
89f2e8a099 Merge "Prevent NPE in SuggestionSpan" into ics-mr1 2011-12-08 09:59:29 -08:00
Kenny Root
c2fc52dc9c Merge "Add aapt support for implicitly-granted permissions" 2011-12-08 09:02:51 -08:00
Kenny Root
063a44e541 Add aapt support for implicitly-granted permissions 
Bug: 2363582
Bug: 2877343
Change-Id: Iff7b496fb845e45fe1be2317089a96f7d63ed223
 2011-12-08 08:46:34 -08:00
The Android Automerger
0d57c8aeb4 merge in ics-mr1-release history after reset to ics-mr1 2011-12-08 07:00:35 -08:00
Jeff Tinker
a5038d169f am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1 
* commit 'a693a4b5553584a01b8b6b3640dc0393d2d88f28':
  Fix ANRs due to Widevine DRM plugin sniff taking too long.
 2011-12-08 00:16:22 -08:00
Jeff Tinker
a693a4b555 Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1 2011-12-08 00:13:43 -08:00
Jeff Brown
03e634270d am 8e0ecbfc: Merge "Shortcut keys should be handled on down, not up." into ics-mr1 
* commit '8e0ecbfc97606ea30d0d8216fea635888f766b9d':
  Shortcut keys should be handled on down, not up.
 2011-12-07 23:31:03 -08:00
Jeff Brown
944c985b41 am e0e9fd98: Merge "Fix system hotkey handling." into ics-mr1 
* commit 'e0e9fd981ca71aeaa45c888485c11788456bd838':
  Fix system hotkey handling.
 2011-12-07 23:31:02 -08:00