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

63484 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
5b189a071a am 852d72b2: am bd9b1528: Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0 
* commit '852d72b28e6d7d0e6372a9b544641817338002e6':
  Add cdma_rmnet4 to list of monitored interfaces
 2011-11-01 20:32:38 +00:00
Fabrice Di Meglio
3b8d33b131 Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr1 2011-11-01 13:30:24 -07:00
Robert Greenwalt
852d72b28e am bd9b1528: Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0 
* commit 'bd9b1528051a1b257768fdbc5077a2d4473b02dd':
  Add cdma_rmnet4 to list of monitored interfaces
 2011-11-01 20:29:42 +00:00
Robert Greenwalt
bd9b152805 Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0 2011-11-01 13:27:56 -07:00
Daniel Sandler
8c8b1c677d am 7775f52e: Merge "Bring timestamps back to notifications." into ics-mr1 
* commit '7775f52e4aa7703a5721378f5a1103d9486af895':
  Bring timestamps back to notifications.
 2011-11-01 20:07:23 +00:00
Daniel Sandler
7775f52e4a Merge "Bring timestamps back to notifications." into ics-mr1 2011-11-01 13:05:41 -07:00
Fabrice Di Meglio
904221a342 Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE 
- better check of ICU returned values
- default to single run if ICU is returning errors

Change-Id: I836818bda4fc72a27b2201f01023cd23c5d99ecb
 2011-11-01 12:47:51 -07:00
Jim Miller
038590191d am a67217c3: Merge "Fix 5404916: Make layout fit on 480x800 hdpi device" into ics-mr1 
* commit 'a67217c35ec43e06598b71feae63ce675fa9cac7':
  Fix 5404916: Make layout fit on 480x800 hdpi device
 2011-11-01 19:46:52 +00:00
Jim Miller
a67217c35e Merge "Fix 5404916: Make layout fit on 480x800 hdpi device" into ics-mr1 2011-11-01 12:45:11 -07:00
Fabrice Di Meglio
49fb596023 am deb15704: am 46e327ca: (-s ours) Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr0 
* commit 'deb15704e9abcfc71bb81a358ff3bb239896474d':
  Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE
 2011-11-01 19:44:41 +00:00
Fabrice Di Meglio
deb15704e9 am 46e327ca: (-s ours) Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr0 
* commit '46e327ca32a29432941ba4487077577b10243aed':
  Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE
 2011-11-01 19:42:48 +00:00
Fabrice Di Meglio
46e327ca32 Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr0 2011-11-01 12:41:04 -07:00
Irfan Sheriff
bbe77ca6be Avoid duplicate dialogs leading to NPE 
Bug: 5548268
Change-Id: I383d5dba5ed2d77c1623d03990f1139872a65e2a
 2011-11-01 12:04:57 -07:00
Robert Greenwalt
57c8ac6e13 Add cdma_rmnet4 to list of monitored interfaces 
Lets the data traffic arrows work on LTE device on 1x,
but also lets telephony monitor for hung radios on 1X.

bug:5531630
Change-Id: I9fa25a5223afaa2e37373668c899ac28a95783fa
 2011-11-01 11:51:27 -07:00
Mangesh Ghiware
e47f48a142 am 00ef15b9: Merge "Clamp initial scale between minimum and maximum values." into ics-mr1 
* commit '00ef15b98ac0579ebd5f81a1753bc18384e88b8b':
  Clamp initial scale between minimum and maximum values.
 2011-11-01 18:30:26 +00:00
Mangesh Ghiware
00ef15b98a Merge "Clamp initial scale between minimum and maximum values." into ics-mr1 2011-11-01 11:28:01 -07:00
Adam Powell
9a60c0d466 am ca4100da: Merge "Fix bug 5534667 - Action bar icons need more space on tablet" into ics-mr1 
* commit 'ca4100da0a0481b3b9f464bbc8842b571e8c60d5':
  Fix bug 5534667 - Action bar icons need more space on tablet
 2011-11-01 18:00:58 +00:00
Adam Powell
ca4100da0a Merge "Fix bug 5534667 - Action bar icons need more space on tablet" into ics-mr1 2011-11-01 10:58:58 -07:00
Fabrice Di Meglio
26e9ee28de Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE 
- better check of ICU returned values
- default to single run if ICU is returning errors

Change-Id: I836818bda4fc72a27b2201f01023cd23c5d99ecb
 2011-11-01 10:49:44 -07:00
Dianne Hackborn
88175571f2 am f136aa34: Merge "Various performance and other work." into ics-mr1 
* commit 'f136aa341abaaf7fd6f7632d41a30b2989d93985':
  Various performance and other work.
 2011-11-01 17:44:04 +00:00
Dianne Hackborn
f136aa341a Merge "Various performance and other work." into ics-mr1 2011-11-01 10:42:54 -07:00
Peter Ng
d2ff672844 am 374e23bd: Merge "spinner focused states pumped up" into ics-mr1 
* commit '374e23bd11c42e7e472d2490a3dfddb7df198a66':
  spinner focused states pumped up
 2011-11-01 17:31:43 +00:00
Peter Ng
374e23bd11 Merge "spinner focused states pumped up" into ics-mr1 2011-11-01 10:29:25 -07:00
The Android Open Source Project
a31ccdb380 am a0824452: am 9eb4c891: Reconcile with ics-factoryrom-2-release 
* commit 'a0824452d5c511acc7d11396ff2e6423f7b03948':
  Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
 2011-11-01 17:13:58 +00:00
The Android Open Source Project
a0824452d5 am 9eb4c891: Reconcile with ics-factoryrom-2-release 
* commit '9eb4c891a3db118f2546af7593c6251f3210f3ef':
  Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
 2011-11-01 17:10:39 +00:00
The Android Open Source Project
9eb4c891a3 Reconcile with ics-factoryrom-2-release 
Change-Id: I82d01dc0c40aeeafc6b10fd1d4bf1464a2f02254
 2011-11-01 10:08:15 -07:00
Mangesh Ghiware
e9841bb45d Fix setInitialScale() to take display density into account. 
Reverted changes made to fix bug 4982074 (Book text display is limited
to about half the available screen.) The Books app sets initial scale to
100%, and since display density for Crespo is 1.5, initial scale was
actually being set to a smaller value in Device Independent Pixel units.

The correct fix is to take display density into account. This fixes bug
5477652: webview scale factor wrong on prime in reddit app.

Change-Id: Ie09172629add7fb28ca6b47d0fd8f6450c5df569
 2011-11-01 09:55:45 -07:00
Philip Milne
c96a88f4fb am 3617933b: Merge " Update to fix for bug 5393156" into ics-mr1 
* commit '3617933bee5a977a7e6c8f8f4b75e580f8bf2ebf':
  Update to fix for bug 5393156
 2011-11-01 16:32:00 +00:00
Philip Milne
3617933bee Merge " Update to fix for bug 5393156" into ics-mr1 2011-11-01 09:30:21 -07:00
Daniel Sandler
e37233038e Bring timestamps back to notifications. 
Bug: 5371747
Change-Id: I3ef52140b37b9926fc9b745e60210a6dd7a036b8
 2011-11-01 11:34:34 -04:00
The Android Automerger
44941ff03d merge in ics-mr0-release history after reset to ics-mr0 2011-11-01 06:28:37 -07:00
Jim Miller
f681cf7d79 am 22726020: am 1dce37bd: Merge "Fix 5497305: Make sure we show SIM unlock when "None" is selected" into ics-mr0 
* commit '2272602032e5051d5067a7a95c741304468a81af':
  Fix 5497305: Make sure we show SIM unlock when "None" is selected
 2011-11-01 07:52:11 +00:00
Jim Miller
2272602032 am 1dce37bd: Merge "Fix 5497305: Make sure we show SIM unlock when "None" is selected" into ics-mr0 
* commit '1dce37bd6bb9b3fe555342f9d2c52e60e10a3fea':
  Fix 5497305: Make sure we show SIM unlock when "None" is selected
 2011-11-01 07:49:46 +00:00
Jim Miller
1dce37bd6b Merge "Fix 5497305: Make sure we show SIM unlock when "None" is selected" into ics-mr0 2011-11-01 00:47:44 -07:00
Adam Powell
24340afbab Fix bug 5534667 - Action bar icons need more space on tablet 
Set a wider minimum width for the action button style on -sw600dp.

Fix an annoying bug where recycled ActionMenuItemViews would retain a
lingering pressed state, causing an unrelated button to glow briefly.

The home/up affordance should not be focusable when it is disabled.

Change-Id: Ia68f3d09f5d977f50e4e33c354d8133367187973
 2011-10-31 22:11:24 -07:00
Chih-Chung Chang
fdfbe58298 am 11ba6da4: am 4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0 
* commit '11ba6da460572b9ce9cb9dc0d5a76b710e7efdb3':
  Update camera continuous autofocus javadoc.
 2011-11-01 04:09:00 +00:00
Chih-Chung Chang
11ba6da460 am 4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0 
* commit '4b6353ea0265bfed52d0637abd1b17596ce25ff0':
  Update camera continuous autofocus javadoc.
 2011-11-01 04:05:45 +00:00
Chih-Chung Chang
4b6353ea02 Merge "Update camera continuous autofocus javadoc." into ics-mr0 2011-10-31 21:04:01 -07:00
John Grossman
217418962b Merge "Timesync: Improve logging and reject bad resps." into ics-aah 2011-10-31 20:06:17 -07:00
Svetoslav Ganov
1442da620c CalendarView title incorrectly updated for different languages. 
1. The formatting rule was hard-coded.

bug:5517162

Change-Id: I323bf623df3d9b7c0c173dc0f35ebfba070588b2
 2011-10-31 18:57:06 -07:00
Jamie Gennis
9d9768dbd7 BlobCache: implement cache serialization 
This change adds serialization and deserialization functionality to
BlobCache, conforming to the Flattenable interface.

Change-Id: Ibc99cb1c3d015f363d57d0713eabccec07ff975e
 2011-10-31 18:49:32 -07:00
Jamie Gennis
94c1f148bb BlobCache: remove the mutex locking 
This change removes the mutex from the BlobCache class.  The caller must
be responsible for thread synchronization in order to properly implement
the Flattenable interface, which is coming soon.  Otherwise would be the
potential for the cache contents to change between the call to the
getFlattenedSize and flatten methods.  Because the caller must do this
synchronization anyway there's no reason to also some synchronization
inside BlobCache.

Change-Id: Ie1f4f6f82b78744f46a41ce863cac0cad276a20e
 2011-10-31 18:48:31 -07:00
satok
1fd0109a11 am ff93e417: Merge "Resolve memory leak in TextServicesManagerService" into ics-mr1 
* commit 'ff93e417a217703a635d8601b835853e07233afd':
  Resolve memory leak in TextServicesManagerService
 2011-11-01 01:22:42 +00:00
Jim Miller
9fa1ada318 Fix 5497305: Make sure we show SIM unlock when "None" is selected 
Previously the code ignored SIM state when lockscreen was set to "None."
It now properly accounts for the SIM state when deciding to show.

Change-Id: I272348c1a21b57ac146910850ea3db3adef0227c
 2011-10-31 18:21:49 -07:00
satok
ff93e417a2 Merge "Resolve memory leak in TextServicesManagerService" into ics-mr1 2011-10-31 18:20:48 -07:00
Adam Powell
9e47185b1c am b1db20bd: Merge "Fix bug 5514022 - ListView should not auto-scroll selected item to top when gaining focus" into ics-mr1 
* commit 'b1db20bde5e00c8cdd1a97b07ddcc41f321d3db8':
  Fix bug 5514022 - ListView should not auto-scroll selected item to top when gaining focus
 2011-11-01 01:20:31 +00:00
Adam Powell
b1db20bde5 Merge "Fix bug 5514022 - ListView should not auto-scroll selected item to top when gaining focus" into ics-mr1 2011-10-31 18:18:33 -07:00
Svetoslav Ganov
57f3b566db Accessibility window query APIs should respect root name space. 
1. The window query API used to not-respect the root name space
   while traversing the parent relation i.e. a client was able
   to fetch the parent of a root name space node.

2. Children that are root name space were reported but their descendants
   not. Actually such children should not be reported since they are
   the root of a separate logical sub-tree. Such a tree is exposed by
   its root allowing its traversal. The accessibility APIs should be
   able to explore a virtual tree, i.e. one with a descendant which is
   root name space, only if an accessibility event from there was received.

bug:5480096

Change-Id: I4c4d805aa2f6d4edba86eda213b5239bea83eed2
 2011-10-31 18:09:28 -07:00
Stephen Hines
f780f9010e am af3a854b: am af675222: Merge "Fix potential segfault in RS watchdog." into ics-mr0 
* commit 'af3a854b549409c4ad77c686e860f97ea86706a0':
  Fix potential segfault in RS watchdog.
 2011-11-01 00:19:19 +00:00
Stephen Hines
af3a854b54 am af675222: Merge "Fix potential segfault in RS watchdog." into ics-mr0 
* commit 'af675222f6340a8a9edbe9e8635014a18521e5e0':
  Fix potential segfault in RS watchdog.
 2011-11-01 00:16:56 +00:00