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

52187 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philip Milne
7fd9487569 Fix for baseline alignment in LinearLayout compatibiity mode. 
Change-Id: Iaa194537c1bc493172fab89624279fe5cbfa1f70
 2011-06-09 09:54:01 -07:00
Jesse Wilson
061136c8d8 Merge "Use external/mockwebserver in frameworks/base" 2011-06-07 18:49:32 -07:00
Chia-chi Yeh
5bc7c93ca7 Merge "Do not register the callbacks in the constructor." 2011-06-07 18:18:56 -07:00
Adam Powell
0e9e03f554 resolved conflicts for merge of a7d01a75 to master 
Change-Id: Ib6a7bbca7711cb5e35085868c4b9b5cbb9b526a4
 2011-06-07 18:16:00 -07:00
Wink Saville
2b2c31f603 am 7f13d0ed: am c368831d: Merge "Preferred network discrepancy after rild is restarted." into honeycomb-LTE 
* commit '7f13d0ed408c3ddce5b061c4370d99ba15d027b7':
  Preferred network discrepancy after rild is restarted.
 2011-06-07 17:54:25 -07:00
Robert Greenwalt
7579081297 am 31ced5c1: am 350b7829: Merge "Fix NPE in the statusbar." into honeycomb-LTE 
* commit '31ced5c140cae9b3ad90066a540346acd821a3c9':
  Fix NPE in the statusbar.
 2011-06-07 17:54:17 -07:00
Jaikumar Ganesh
376d9b87af am 6aa152a1: (-s ours) am c8410017: (-s ours) am 1b755dea: Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread 
* commit '6aa152a1df3f77b5838a62194fc196e04d8a5c6a':
  Remove discoverable timeout handler. DO NOT MERGE
 2011-06-07 17:53:41 -07:00
Jeff Brown
cb0c55ed37 am e046555b: am fd324486: am 5cb05eea: Merge "Fix build." into honeycomb-mr2 
* commit 'e046555b4d92179327d12d888be967fff5c027ca':
  Fix build.
 2011-06-07 17:52:53 -07:00
Jeff Brown
72c7362080 am 61220e88: am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2 
* commit '61220e880ac4d9d76b7fd50744439e68e929c697':
  Revert velocity damping. Bug: 4364920
 2011-06-07 17:52:30 -07:00
Jeff Brown
051e8f2bfa am 55cc25c1: am 797dc698: am b92dcf9c: Merge "Simplify spot tracking logic. Bug: 4124987" into honeycomb-mr2 
* commit '55cc25c12c45e8ffb65d2275cc0b6941b68db9df':
  Simplify spot tracking logic. Bug: 4124987
 2011-06-07 17:52:22 -07:00
Jeff Brown
774ed9d953 resolved conflicts for merge of 8b2c0014 to master 
Change-Id: I33a5a2949dc6c2d09e8196ba8c7128caa7ac2361
 2011-06-07 17:48:39 -07:00
Irfan Sheriff
f596955372 am 5e4d0206: am b400184a: Merge "Handle AsyncChannel disconnect in WifiService" into honeycomb-LTE 
* commit '5e4d0206486378ffc7d2992750e439d54df15147':
  Handle AsyncChannel disconnect in WifiService
 2011-06-07 17:19:02 -07:00
Jeff Brown
48076da85c am c3709f25: am 277bfd7c: am c1830a77: Merge "Improve browser scrolling when using the mouse wheel." into honeycomb-mr2 
* commit 'c3709f2509bfc15d13a590b8342503f858ee67e2':
  Improve browser scrolling when using the mouse wheel.
 2011-06-07 17:18:48 -07:00
Dianne Hackborn
aefc94f19a am 4bd50588: am fc3fa5dc: am 1b405592: Merge "Fix issue #4539687: At least one compatibility-mode app (Androminion)..." into honeycomb-mr2 
* commit '4bd505883df3d8ca7583d854f1c71302c615519d':
  Fix issue #4539687: At least one compatibility-mode app (Androminion)...
 2011-06-07 17:18:16 -07:00
Xavier Ducrohet
f18e311ee5 am abc83871: am f6e47999: am 2a6dc7f1: Merge "Import the Layoutlib from hc-mr1." into honeycomb-mr2 
* commit 'abc838716816107754ab0479242d03807ce79fc2':
  Import the Layoutlib from hc-mr1.
 2011-06-07 17:17:11 -07:00
Brian Carlstrom
c8307c885f Merge "Change KeyChain to assume PEM encoded keystore entries" 2011-06-07 15:57:29 -07:00
Frank Sposaro
34687664be Merge "Fixed typo. "a a" -> "a"" 2011-06-07 15:57:11 -07:00
Jesse Wilson
7ad00e6f5c Use external/mockwebserver in frameworks/base 
Change-Id: Ifb45671e3e7256692c74587984ee5fe1d0eca181
 2011-06-07 15:57:10 -07:00
Christopher Tate
0a251cd5ee Merge "Don't ack/nak backup redundantly at exit" 2011-06-07 15:37:08 -07:00
Christopher Tate
ec5d4a0f97 Don't ack/nak backup redundantly at exit 
Change-Id: I7293518bc2fe6c66270a7c8aea3bf0c0829754e4
 2011-06-07 15:35:45 -07:00
Brian Carlstrom
9d7faa91be Change KeyChain to assume PEM encoded keystore entries 
Summary:
- Changed KeyChain to assume PEM encoded keystore entries
- Moved convertToPem from CertInstaller for reuse with other Credentials helpers
- Added convertFromPem for use decoding keystore entries

Change-Id: I340168b88aefa458d01e81324824e2e08b1d7c4e
 2011-06-07 15:33:09 -07:00
Christopher Tate
ba4b2faa09 Merge "Fix embedded spaces in tar stream EVEN HARDER" 2011-06-07 15:20:34 -07:00
Irfan Sheriff
2391a98314 Merge "Update walled garden detection logic" 2011-06-07 15:16:00 -07:00
Irfan Sheriff
5ea65d609f Update walled garden detection logic 
DNS based techniques dont always work. Some hotspots
redirect on data fetch on IP. Use a known pattern match
on URL to detect a walled garden instead.

Also, added gservices capability to turn off the feature
or change the URL & the pattern to match

Bug: 4378442
Change-Id: I78b4208d3ea3ace20069169e7c01ed769892d94d
 2011-06-07 15:10:58 -07:00
Amith Yamasani
0df77e6d42 Merge "Volume Panel sizing for phones." 2011-06-07 14:48:50 -07:00
Fabrice Di Meglio
c46f7ffa90 Rename atribute View horizontalDirection to layoutDirection and update unit tests 
- update before/after to start/end in unit test app

Change-Id: Id7286ef5d9390540faf8ecd5f0b1c140d04bb364
 2011-06-07 14:21:31 -07:00
Yu Shan Emily Lau
fd65e00d62 Merge "Cleaned up the old test cases and test media files." 2011-06-07 13:40:04 -07:00
Daniel Sandler
18cee202a0 Merge "Experimental compatibility mode UI." 2011-06-07 13:37:08 -07:00
Christopher Tate
3f6c77b7ca Fix embedded spaces in tar stream EVEN HARDER 
Change-Id: I97ac586ff3541a05d73e1e53f680517c15e6c662
 2011-06-07 13:17:17 -07:00
Mike Lockwood
65abc4531f Merge "StorageVolume: Add allowMassStorage flag" 2011-06-07 12:44:52 -07:00
Mike Lockwood
8e8b280bd1 StorageVolume: Add allowMassStorage flag 
Change-Id: I9d19e635bb06e50068d7e4e6919322bd5bb2e00f
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-06-07 12:43:49 -07:00
Daniel Sandler
45c0401a06 Experimental compatibility mode UI. 
♫ Just another button, for you and me, in the status bar. ♫

Change-Id: I11ecac63341d4c421dbaffba931861605ebad286
 2011-06-07 15:29:07 -04:00
Christopher Tate
ffccff0864 Merge "Implement shared-storage full backup/restore" 2011-06-07 12:25:06 -07:00
Alon Albert
55f18e1832 Merge "Add columns: Events.lastSynced: flag marking this as a duplicate of the lastSynced sate of the event Events.sync_data7: General purpose sync column (will be used for editUrl in Google Sync Adapter) Calendars.canPartiallyUpdate: Flag indicating sync adapter can perform partial updates." 2011-06-07 12:16:28 -07:00
Christopher Tate
b0628bfd5a Implement shared-storage full backup/restore 
Every available shared-storage volume is backed up, tagged with its
ordinal in the set of mounted shared volumes.  This is an approximation
of "internal + the external card".  This lets us restore things to the
same volume [or "equivalent" volume, in the case of a cross-model
restore] as they originated on.

Also fixed a bug in the handling of files/dirs with spaces in
their names.

Change-Id: I380019da8d0bb5b3699bd7c11eeff621a88e78c3
 2011-06-07 12:16:27 -07:00
Yu Shan Emily Lau
d1d17b1651 Cleaned up the old test cases and test media files. 
Change-Id: Icc3c04c69b11b2bb91588a8bb916baf69594e8d3
 2011-06-07 12:08:13 -07:00
Iliyan Malchev
5c54f4b3cb frameworks/base: updates for camera HAL memory management 
-- when the camera HAL allocates memory
	-- it requests is as N buffers by S bytes each
	-- it may specify a file descriptor to get mmapped; if -1, then we use ashmem
-- when issuing data and data-timestamp callbacks, the camera HAL specifies a
   buffer index
-- range checking is performed on the buffer indices
-- memory requested by a camera HAL is not incStrong'ed, and needs to be
   expliciftly released by the camera HAL (by calling the release method on the
   camera_memory_t handle)

Change-Id: I0f09603aa786c238590e7288388ab673787e6032
Signed-off-by: Iliyan Malchev <malchev@google.com>
 2011-06-07 11:43:20 -07:00
Adam Powell
a7d01a7519 am 212d15c7: am a476813d: Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public. 
* commit '212d15c746f2611339026c16e5fa1aeb7f9090b7':
  Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
 2011-06-07 11:36:32 -07:00
Adam Powell
212d15c746 am a476813d: Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public. 
* commit 'a476813dccec241632810c1cbb11bcfbf17841b0':
  Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
 2011-06-07 11:32:23 -07:00
Mike Lockwood
a8be99f8ae Merge "Add comment for deprecation of Intent.ACTION_UMS_CONNECTED and ACTION_UMS_DISCONNECTED" 2011-06-07 11:25:27 -07:00
Mike Lockwood
7e4db3767b Add comment for deprecation of Intent.ACTION_UMS_CONNECTED and ACTION_UMS_DISCONNECTED 
Change-Id: I3c42393c79424217d6b44cccef9de9e06da58193
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-06-07 11:24:29 -07:00
Mathias Agopian
16affed50e am cf3036eb: (-s ours) am c1cbf452: am 24855c09: merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE) 
* commit 'cf3036ebef2929f84bc4e34ed1e9d96eefd6a5e7':
  merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
 2011-06-07 11:15:01 -07:00
Wink Saville
7f13d0ed40 am c368831d: Merge "Preferred network discrepancy after rild is restarted." into honeycomb-LTE 
* commit 'c368831d62ce68d6c9c83d7e49e5db11c47ebd85':
  Preferred network discrepancy after rild is restarted.
 2011-06-07 11:03:25 -07:00
Mike Lockwood
98c185e694 Merge "Deprecate Intent.ACTION_UMS_CONNECTED and Intent.ACTION_UMS_DISCONNECTED" 2011-06-07 11:02:58 -07:00
Alon Albert
866f40aeda Add columns: 
Events.lastSynced: flag marking this as a duplicate of the lastSynced sate of the event
  Events.sync_data7: General purpose sync column (will be used for editUrl in Google Sync Adapter)
  Calendars.canPartiallyUpdate: Flag indicating sync adapter can perform partial updates.

Change-Id: I5c153fb9cbf43dd1def0267c2f912a59038b28c1
 2011-06-07 11:01:49 -07:00
Robert Greenwalt
31ced5c140 am 350b7829: Merge "Fix NPE in the statusbar." into honeycomb-LTE 
* commit '350b78291de725a1607395055b6d28655d9e1080':
  Fix NPE in the statusbar.
 2011-06-07 11:01:23 -07:00
Mike Lockwood
da85e524c7 Deprecate Intent.ACTION_UMS_CONNECTED and Intent.ACTION_UMS_DISCONNECTED 
Change-Id: I7261959462422cf241a46a5ada6fbd98d655db3d
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-06-07 10:59:04 -07:00
Wink Saville
c368831d62 Merge "Preferred network discrepancy after rild is restarted." into honeycomb-LTE 2011-06-07 10:58:09 -07:00
Robert Greenwalt
350b78291d Merge "Fix NPE in the statusbar." into honeycomb-LTE 2011-06-07 10:57:20 -07:00
Wink Saville
05d69edc0b Preferred network discrepancy after rild is restarted. 
If the preferred network had updated before rild restarts,
the new setting value is ignored on RIL_CONNECT event.

bug: IKXEVERESTLTE-1494
Change-Id: Iec6395187c0d749208904db857b80e28f7d92c21
 2011-06-07 10:44:43 -07:00