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

63794 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gilles Debunne
7ffadba5df am 1fb90497: Merge "Text blinking cursor hard to see." into ics-mr1 
* commit '1fb90497b73b1560c55f1cb73cd394c3b8714212':
  Text blinking cursor hard to see.
 2011-12-12 15:54:38 -08:00
Gilles Debunne
a1277de3c3 Merge "Prevent a memory leak in TextLine." into ics-mr1 2011-12-12 15:53:25 -08:00
Gilles Debunne
1fb90497b7 Merge "Text blinking cursor hard to see." into ics-mr1 2011-12-12 15:52:39 -08:00
Adam Powell
bffe0be3af am 9c92fcd9: Merge "Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect" into ics-mr1 
* commit '9c92fcd91c67a98f3a767255e7d3748bca3ef751':
  Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect
 2011-12-12 15:42:22 -08:00
Adam Powell
9c92fcd91c Merge "Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect" into ics-mr1 2011-12-12 15:40:00 -08:00
Dianne Hackborn
7871badd5d SDK only: now that support lib is in SDK, we can link to it. 
Update some of the platform documentation to directly link to
relevent support lib docs.  Yay!

Also improve BroadcastReceiver documentation to more clearly
discussion security around receivers, and how the support
lib's LocalBroadcastManager can help.

Change-Id: I563c7516d5fbf91ab884c86bc411aff726249e42
 2011-12-12 15:39:50 -08:00
Raphael
b2bf2471b1 am ab8d6785: (-s ours) am 2ace3b01: Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1 
* commit 'ab8d6785dcefa5b2b66f6c042475a0f9f558dd45':
  Merge "AAPT fix printf %zd crash on Windows". Do not merge.
 2011-12-12 15:39:30 -08:00
Matthew Xie
470d057aed am 18ad6514: am ed0830c5: Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1 
* commit '18ad6514bbeb68a96c12ba1636ab8df8e3945f37':
  Move broadcastState STATE_TURNING_ON before persistSwitchSetting
 2011-12-12 15:39:27 -08:00
Eric Fischer
74bc6075e1 am f3ea0231: (-s ours) am 386f2084: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit 'f3ea02319fc8d1f882ef7f392c245e197ab858de':
  Import revised translations.  DO NOT MERGE
 2011-12-12 15:39:23 -08:00
The Android Open Source Project
8ca8f5ed12 am 40375099: Reconcile with ics-mr1-release 
* commit '40375099d10139b6c96c1db8b8295874d60c712e':
 2011-12-12 15:39:19 -08:00
The Android Open Source Project
b34027bb2f am f14dc291: Merge from ics-mr1 
* commit 'f14dc29104340f8ccf9d42aef8dba2cc23f7f5e1':
  Fix drm enumeration order, resolves failure to play forward lock ringtones
 2011-12-12 15:39:17 -08:00
Irfan Sheriff
afb847a469 Merge "Clean up synchronization" 2011-12-12 15:35:25 -08:00
Justin Ho
ee8005e6ec am df83cfc9: am 1cec30a1: Merge "Quick settings icons updated to match ics style on tablet" into ics-mr1 
* commit 'df83cfc95c1b909ffcfc31f3dd30262a49cffced':
  Quick settings icons updated to match ics style on tablet
 2011-12-12 15:30:36 -08:00
Jeff Tinker
a6e549455a am dc44e06e: am ef664f62: Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1 
* commit 'dc44e06ef305be8de060af69a468e003e231ba05':
  Fix drm flag setting missed in false drm recognition fix.
 2011-12-12 15:30:16 -08:00
Joe Fernandez
3f6efeaad7 am a4f49ac5: am 4b3227de: am 89c3bc38: Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0 
* commit 'a4f49ac5284d7ab97e56e318523652f35d9de0d6':
  docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6
 2011-12-12 15:30:14 -08:00
Gilles Debunne
0288c6c562 am f107abec: am caf4ead3: Merge "Blinking cursor in Talk" into ics-mr1 
* commit 'f107abec56811dea1ae81c6abc78a68e433c1080':
  Blinking cursor in Talk
 2011-12-12 15:30:10 -08:00
The Android Open Source Project
ac9860bb73 am 175d5d76: Reconcile with ics-mr1-release 
* commit '175d5d76b0aa9808b4214522a6fdf461109560ec':
 2011-12-12 15:29:56 -08:00
James Dong
b7e0281900 am 406dd5d1: am aadbd80b: Fixed the false drm recognition. 
* commit '406dd5d1e48752177753666867403542e1f400ca':
  Fixed the false drm recognition.
 2011-12-12 15:29:46 -08:00
Adam Powell
f93bb6d8fd Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect 
Preserve the ability to call getChildVisibleRect without the view
being attached to a window.

Change-Id: I702b19fa1625c346eb22fda4a4ffb6e8f790b689
 2011-12-12 15:23:12 -08:00
Gilles Debunne
7cb77c1a0d resolved conflicts for merge of 1742f20c to master 
Change-Id: I02d84edfe8cc0b71881884ecec21f831404aa555
 2011-12-12 15:16:42 -08:00
Brian Colonna
a44f2a59a2 Changed how Face Unlock coordinates are specified 
Was using View.getLeft() and View.getTop() to specify the upper-left
corner of the Face Unlock area.  That gives coordinates relative the
view, which was fine for the phones.  For the tablet it needs
coordinates relative to the window (which still works for the phones).

Also fixed a 'bug' where h and w were swapped.  However, it wasn't
causing a problem because it was swapped in two places.

Change-Id: I86c1f68439f1dcef826cfe6b8fb56c9a4a6b8dc3
 2011-12-12 18:02:23 -05:00
Irfan Sheriff
e744cfff7c Clean up synchronization 
- Add delayed disk write in WifiConfigStore
- Remove synchronization and keep all access to config store
throught the state machine thread

Change-Id: I53768a17895e48da7b99542ac95c6c2fddbcb021
 2011-12-12 15:00:02 -08:00
Jamie Gennis
74e0fcaed1 am a1dee3f5: Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1 
* commit 'a1dee3f500eccedbf5e50d466315fb28ba812cfc':
  SurfaceTexture: fix a verbose-log compile error
 2011-12-12 14:12:33 -08:00
Jamie Gennis
a1dee3f500 Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1 2011-12-12 14:10:04 -08:00
Gilles Debunne
c3fb7a11ad Prevent a memory leak in TextLine. 
Bug 5740435

The new SpanSet cached objects should be recycled when the TextLine is
recycled to prevent a reference to their span, which may lead to the
entire activity.

Change-Id: I4469e418a228bd71eb8be1d43ed86de49baba165
 2011-12-12 14:03:40 -08:00
Robert Greenwalt
cc579b89fc Merge "Use the carrier-given dns addrs for tethering." 2011-12-12 14:02:02 -08:00
Gilles Debunne
961ebb9ab0 Text blinking cursor hard to see. 
Bug 5738416

This problem was introduced in
https://android-git.corp.google.com/g/#/c/152599

The invalidated cursor region is no longer expanded to include the
cursor drawable (different from the handles' drawables).

Added that code back. Added a flag, since invalidateRegion is also
used to invalidate text span regions in spell check (assumes the decorated
span bounds are not bigger that text boundaries), which is fine in case
of underline.

When the cursor is moved on a single line, invalidate the whole line
(same as what was done before). This is sub-optimal, will file a bug
to fix this. The core problem is that we should invalidate the previous
and the new cursor's positions. We only have one of these.

Change-Id: I9ada9340fb52aad3d80c39efd021fd3f9ec0cc4d
 2011-12-12 13:56:04 -08:00
Glenn Kasten
e1b908f52d Delete obsolete includes 
Change-Id: I960a179a026ff8d710b43b64cb358f18ee04de16
 2011-12-12 13:40:06 -08:00
Raphael
ab8d6785dc am 2ace3b01: Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1 
* commit '2ace3b01ab9447ce9fda2f578e31c1c11f4837cb':
  Merge "AAPT fix printf %zd crash on Windows". Do not merge.
 2011-12-12 13:16:35 -08:00
Gilles Debunne
481c0a2604 am afa0a714: am df372289: Merge "Fixed SpellCheckerSessions leak in TextView" into ics-mr1 
* commit 'afa0a714acb45e90bdda3fd72b529a817a25f2d1':
  Fixed SpellCheckerSessions leak in TextView
 2011-12-12 13:15:53 -08:00
Gilles Debunne
e495cc3fd9 am e912a16b: am 316ca505: Merge "Re-use SpanSets in TextLine" into ics-mr1 
* commit 'e912a16ba2a6e913b47893bc99c9a846d7ce80a9':
  Re-use SpanSets in TextLine
 2011-12-12 13:15:46 -08:00
Joe Malin
c789b60076 am 8e94d912: am 556e4ca5: am 0a9005ed: Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0 
* commit '8e94d912c6e0fc3c6d5e992b6559a0efc20372be':
  DOC CHANGE: Package text and Formatter javadoc
 2011-12-12 13:15:36 -08:00
Chia-chi Yeh
2339fe3f8f am fa71962f: am 46a4e81d: Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1 
* commit 'fa71962fe4595f484071ac0deb23f68d44932d83':
  VPN: delete the "abort" file before starting VPN daemons.
 2011-12-12 13:15:34 -08:00
Raphael
2ace3b01ab Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1 2011-12-12 13:14:12 -08:00
Irfan Sheriff
d9dc7fe61e am c34306e4: am 97ff7893: Merge "Fix wifi bring up at boot up" into ics-mr1 
* commit 'c34306e46e0f53a9478216c2d5fd3129a3bc6f8e':
  Fix wifi bring up at boot up
 2011-12-12 12:35:12 -08:00
Jake Hamby
36b8c2e682 am 555fe79c: am c40f70a5: Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines." into ics-mr1 
* commit '555fe79cdf037e7250f04591e60ecc8cff0cb95e':
  Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines.
 2011-12-12 12:35:09 -08:00
Romain Guy
6752d0ab02 Mark color uniform fetched after fetching it 
Change-Id: I10e8027018608070a536eb8b51c7a4272e37006c
 2011-12-12 12:15:17 -08:00
Matthew Xie
18ad6514bb am ed0830c5: Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1 
* commit 'ed0830c502d7403d69abfd8247c046ac2746ac8c':
  Move broadcastState STATE_TURNING_ON before persistSwitchSetting
 2011-12-12 12:09:13 -08:00
Matthew Xie
ed0830c502 Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1 2011-12-12 12:07:39 -08:00
Romain Guy
11326aa1b9 Merge "Code cleanup" 2011-12-12 11:44:43 -08:00
Romain Guy
ee698a01bd Merge "Free up resources by deleting shaders early on" 2011-12-12 11:44:32 -08:00
Matthew Xie
2d789e58a8 Move broadcastState STATE_TURNING_ON before persistSwitchSetting 
CTS test revealed that persistSwitchSetting could take more than 1 second.
STATE_TURNING_ON intent missed the test timing. We move the broadcast
before persistSwitchSetting
bug 5740715

Change-Id: I54a0a0afc8d1c4fc28f84e6122809af2f1456ca7
 2011-12-12 11:36:18 -08:00
Eric Fischer
f3ea02319f am 386f2084: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '386f208489d85d81755b64e92a84290953accfc0':
  Import revised translations.  DO NOT MERGE
 2011-12-12 11:06:38 -08:00
Eric Fischer
386f208489 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-12-12 11:04:39 -08:00
Eric Fischer
c1e2aca598 Import revised translations. DO NOT MERGE 
Change-Id: Ia118056259f828ff913d8a9bf2bc3a8fa2c54f9c
 2011-12-12 10:59:11 -08:00
Amith Yamasani
549d5f88bf Merge "Show the current stream's volume in the volume panel." 2011-12-12 09:56:26 -08:00
Andreas Huber
2fc93533d2 Merge "Support for parsing of "folded" RTSP header values and some tweaks to the AMR assembler" 2011-12-12 08:32:28 -08:00
The Android Open Source Project
40375099d1 Reconcile with ics-mr1-release 
Change-Id: Ic9c27c987ae88da9ab333632b47837b0ff1dd6d3
 2011-12-12 07:59:17 -08:00
The Android Open Source Project
f14dc29104 Merge from ics-mr1 
Change-Id: I209499775ddf68b380d0ec801d558e1dc86ab953
 2011-12-12 07:47:43 -08:00
Ben Murdoch
2ff8cc2438 Merge "Clear the WebView picture when a new load starts." 2011-12-12 03:13:46 -08:00