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

52554 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
a6a4a9ed46 am f6c82067: fix a surface leak introduced by a failed merge (DO NOT MERGE) 
* commit 'f6c8206735e7e078461e5f2aef6e1a1446fdd075':
  fix a surface leak introduced by a failed merge (DO NOT MERGE)
 2011-06-07 14:58:02 -07:00
Mathias Agopian
f6c8206735 fix a surface leak introduced by a failed merge (DO NOT MERGE) 
Bug: 4558502
Change-Id: Ibf889d03caa806c34603ad45f135b78c3851f55c
 2011-06-07 14:52:22 -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
Daniel Sandler
56e6dbd8b1 DO NOT MERGE. Experimental compatibility mode UI. 
♫ Just another button, for you and me, in the status bar. ♫

(cherry picked from commit 45c0401a0647a5fdc5f37168463c14ad57c5644b)

Change-Id: Ib35d136deadf16f693003b61ea6cfee411f4aa3d
 2011-06-07 14:11:09 -07:00
Irfan Sheriff
92593dc49b am 84db79bb: Merge "Clear IP configuration on lost network" into honeycomb-LTE 
* commit '84db79bb65bce5c1fd8a6e033cb7e4db4c04f9b1':
  Clear IP configuration on lost network
 2011-06-07 13:44:40 -07:00
Irfan Sheriff
84db79bb65 Merge "Clear IP configuration on lost network" into honeycomb-LTE 2011-06-07 13:40:38 -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
Andreas Huber
752a5b3df5 am 8e973729: (-s ours) am 8050a02b: DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls. 
* commit '8e97372913c9236ffdee175c6da99dc00c22b3e1':
  DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.
 2011-06-07 13:23:54 -07:00
Martijn Coenen
4c5f2a9dd2 am ed1c8d7d: am 0aa1017f: Prevent allocation overflows by corrupt NDEF records. 
* commit 'ed1c8d7dc09996351db711be7d2acf0ff4715c2d':
  Prevent allocation overflows by corrupt NDEF records.
 2011-06-07 13:23:11 -07:00
Christopher Tate
3f6c77b7ca Fix embedded spaces in tar stream EVEN HARDER 
Change-Id: I97ac586ff3541a05d73e1e53f680517c15e6c662
 2011-06-07 13:17:17 -07:00
John Wang
1f8665895f am 71030e53: Merge "Add SIM PUK unlockscreen." into honeycomb-LTE 
* commit '71030e536522449f34dc584fda94f34e7be6ee19':
  Add SIM PUK unlockscreen.
 2011-06-07 13:16:09 -07:00
Robert Greenwalt
e139167c91 am 5df69fad: resolved conflicts for merge of 8de47a2f to honeycomb-LTE 
* commit '5df69fad6e5021d2862bff0553a510f8d6729fbd':
  Reveal some network constants.
 2011-06-07 13:12:29 -07:00
John Wang
71030e5365 Merge "Add SIM PUK unlockscreen." into honeycomb-LTE 2011-06-07 12:56:49 -07:00
Robert Greenwalt
5df69fad6e resolved conflicts for merge of 8de47a2f to honeycomb-LTE 
Change-Id: I8193235a4c7e574635e17b2eb05bb5420a3c6749
 2011-06-07 12:45:41 -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
Irfan Sheriff
0c13d47939 Clear IP configuration on lost network 
Bug: 4391449
Change-Id: I574128083a5612f13fcccaf5ed091eae114b7943
 2011-06-07 12:29:59 -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
Robert Greenwalt
8de47a2f25 Merge "Reveal some network constants." into honeycomb-mr2 2011-06-07 12:00:37 -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
Eino-Ville Talvala
32a972c693 Updates to Camera API documentation. 
Change-Id: I716a36becce436f57ea62fcfecd9021eb29b76ea
 2011-06-07 10:34:56 -07:00
John Wang
0f7b3f8ba5 Add SIM PUK unlockscreen. 
Puk unlockscreen is implemented as SimPukUnlockScreen.

Added config_enable_puk_unlock_screen to control the display of puk unlock screen.

Using config_voice_capable to control the display of emergency call button.

bug:4384956

Change-Id: I2b8256b4ecdf3d4f1e85c4e868fac1810cfd29be
 2011-06-07 10:12:38 -07:00
Adam Powell
a476813dcc Make Theme.Holo.Light.NoActionBar and 
Theme.Holo.Light.NoActionBar.Fullscreen public.

Change-Id: I623b5908b080e8703b825707a024fa922cd954ab
 2011-06-07 10:11:59 -07:00
Jaikumar Ganesh
6aa152a1df am c8410017: (-s ours) am 1b755dea: Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread 
* commit 'c8410017502dacff43ecd3e0926049b99fc186a8':
  Remove discoverable timeout handler. DO NOT MERGE
 2011-06-07 10:01:28 -07:00
Narayan Kamath
8d1fc2403b Fix the threading behaviour of TTS audio requests. 
All audio is played back on a separate thread.

Change-Id: I2bbb7b3140f6a04ef705cadb2bd1ae88951e3c48
 2011-06-07 16:27:18 +01:00
Wu-cheng Li
a4a48a484f Merge "Improve android.hardware.Camera.Area javadoc." 2011-06-07 04:05:35 -07:00
Wu-cheng Li
bde61a5731 Improve android.hardware.Camera.Area javadoc. 
bug:4553469
Change-Id: Iae88af354fee4925cb7978572c27f6dd5595ca59
 2011-06-07 19:00:03 +08:00
Xia Wang
4da7b10c45 Merge "Add OpenGl benchmark tests: display images with different texture in each mesh." 2011-06-06 22:00:31 -07:00
Jeff Brown
e046555b4d am fd324486: am 5cb05eea: Merge "Fix build." into honeycomb-mr2 
* commit 'fd3244868dec40707039cd616dd37ada41774547':
  Fix build.
 2011-06-06 21:11:44 -07:00
Jeff Brown
fd3244868d am 5cb05eea: Merge "Fix build." into honeycomb-mr2 
* commit '5cb05eea289559b30cf4f84130cb6afba0921638':
  Fix build.
 2011-06-06 21:08:25 -07:00
Jeff Brown
5cb05eea28 Merge "Fix build." into honeycomb-mr2 2011-06-06 21:06:30 -07:00