Commit Graph

26851 Commits

Author SHA1 Message Date
Eric Fischer
0244aa5653 am 14541aa9: am 4c3b788e: Merge "Update large screen translations." into honeycomb
* commit '14541aa94ced88637bd48c7f138fcac042e5c8d9':
  Update large screen translations.
2011-01-14 14:06:16 -08:00
Eric Fischer
7eae809fc6 am 4c3b788e: Merge "Update large screen translations." into honeycomb
* commit '4c3b788ec408cfc5683fbe8d2976dd3fc2b13609':
  Update large screen translations.
2011-01-14 14:04:01 -08:00
Eric Fischer
f6afa325e0 Merge "Update large screen translations." into honeycomb 2011-01-14 14:01:03 -08:00
Adam Powell
af60097a2d am 7143ae39: am 94613752: Merge "Rework action bar menus." into honeycomb
* commit '7143ae39d60f385cddf18ae0cd3881127598bbf9':
  Rework action bar menus.
2011-01-14 14:00:00 -08:00
Adam Powell
710eda1a15 am 94613752: Merge "Rework action bar menus." into honeycomb
* commit '946137520d67d3c18ceaba058e622f24b7fbf04d':
  Rework action bar menus.
2011-01-14 13:57:56 -08:00
Adam Powell
0735e419a0 Merge "Rework action bar menus." into honeycomb 2011-01-14 13:56:29 -08:00
Scott Main
614232f774 Merge "docs: Rewrite of App Fundamentals.. Part 2. This introduces three new docs:" 2011-01-14 13:24:02 -08:00
Marco Nelissen
df89226182 am ae0c56c7: am 3506d885: Merge "Fix issue with notification layouts." into honeycomb
* commit 'ae0c56c7367130db02594501238b51d61841de61':
  Fix issue with notification layouts.
2011-01-14 13:22:27 -08:00
Marco Nelissen
1e68511cb3 am 3506d885: Merge "Fix issue with notification layouts." into honeycomb
* commit '3506d885b850a3d3e2c218f427ccc5dae6d205d7':
  Fix issue with notification layouts.
2011-01-14 13:20:13 -08:00
Marco Nelissen
f269c23919 Merge "Fix issue with notification layouts." into honeycomb 2011-01-14 13:17:56 -08:00
Kenny Root
a9ac7b8b92 am c956472a: (-s ours) am b220d62b: (-s ours) am ea6bf362: Deep clone settings for system package update DO NOT MERGE
* commit 'c956472aa63a28269f68aedcdba22d640910a6af':
  Deep clone settings for system package update DO NOT MERGE
2011-01-14 13:13:06 -08:00
Jeff Brown
4800da5aea am 9781071a: am e76820bf: Merge "Use holo style mouse pointer." into honeycomb
* commit '9781071ae704c9370901e248f1f5bc79fcefc3c7':
  Use holo style mouse pointer.
2011-01-14 13:13:03 -08:00
Huahui Wu
b79bcb7666 am ee2d8cd5: am cbe397f2: Merge "b/3348192 re-enable snap scrolling mode." into honeycomb
* commit 'ee2d8cd5bc50589229b469b80b2724836d83e6eb':
  b/3348192 re-enable snap scrolling mode.
2011-01-14 13:12:59 -08:00
Kenny Root
2513b082b7 am 014ef618: am bd392c53: Check for null in PackageSetting constructor
* commit '014ef61842dd877b60cb16d433ecff9165944fd8':
  Check for null in PackageSetting constructor
2011-01-14 13:12:54 -08:00
Kenny Root
afb7c63cf5 am b220d62b: (-s ours) am ea6bf362: Deep clone settings for system package update DO NOT MERGE
* commit 'b220d62bf3032c5c8b2a36a00cd6e6d6b63c7db5':
  Deep clone settings for system package update DO NOT MERGE
2011-01-14 13:07:56 -08:00
Kenny Root
d37b574931 am ea6bf362: Deep clone settings for system package update DO NOT MERGE
* commit 'ea6bf3628140283df24f2652b686d083b0d31ed9':
  Deep clone settings for system package update DO NOT MERGE
2011-01-14 13:05:53 -08:00
Jeff Brown
26539dba41 am e76820bf: Merge "Use holo style mouse pointer." into honeycomb
* commit 'e76820bf413364898493f86ca6027b28d3caed2b':
  Use holo style mouse pointer.
2011-01-14 13:05:11 -08:00
Huahui Wu
f221b2afd3 am cbe397f2: Merge "b/3348192 re-enable snap scrolling mode." into honeycomb
* commit 'cbe397f243c4f1706cf7bbd9fcd07c1c13ccb097':
  b/3348192 re-enable snap scrolling mode.
2011-01-14 13:05:04 -08:00
Jeff Brown
bfcf601262 Merge "Use holo style mouse pointer." into honeycomb 2011-01-14 13:03:54 -08:00
Huahui Wu
0a9b75cd97 Merge "b/3348192 re-enable snap scrolling mode." into honeycomb 2011-01-14 13:03:23 -08:00
Kenny Root
9a6ed2747f am bd392c53: Check for null in PackageSetting constructor
* commit 'bd392c53970f4c24908668a6b28248943b31b072':
  Check for null in PackageSetting constructor
2011-01-14 13:03:02 -08:00
Brad Fitzpatrick
df3ce04026 am 9dde087d: am 1e8d23f6: Merge "Watchdog can get deadlocked on activity manager" into honeycomb
* commit '9dde087dcb94341bd2b66e186534dc44e660a2ce':
  Watchdog can get deadlocked on activity manager
2011-01-14 12:51:57 -08:00
Brad Fitzpatrick
12494fcf4b am 1e8d23f6: Merge "Watchdog can get deadlocked on activity manager" into honeycomb
* commit '1e8d23f6b03aeed45cdcf5c03121741ee9684396':
  Watchdog can get deadlocked on activity manager
2011-01-14 12:50:00 -08:00
Brad Fitzpatrick
92165cd763 Merge "Watchdog can get deadlocked on activity manager" into honeycomb 2011-01-14 12:48:08 -08:00
Kenny Root
1010ed68cc am d9fa11b4: am 312206b9: Merge "Add the {get,set}PackageObbPaths calls to API" into honeycomb
* commit 'd9fa11b446da5dbc92776518c20bab1f04e55537':
  Add the {get,set}PackageObbPaths calls to API
2011-01-14 12:46:34 -08:00
Kenny Root
a1433270c2 am 312206b9: Merge "Add the {get,set}PackageObbPaths calls to API" into honeycomb
* commit '312206b98749bbe395416634e6e82bd242b1d5f2':
  Add the {get,set}PackageObbPaths calls to API
2011-01-14 12:44:39 -08:00
Kenny Root
32c652c6bc Merge "Add the {get,set}PackageObbPaths calls to API" into honeycomb 2011-01-14 12:42:12 -08:00
Christopher Tate
29ff249a06 am e1cc00bb: am 64cb24e6: Merge "Send DRAG_STARTED notices to views that become visible during drag" into honeycomb
* commit 'e1cc00bba019bdc165d61b14fef8a72fdeed1ae5':
  Send DRAG_STARTED notices to views that become visible during drag
2011-01-14 12:40:41 -08:00
Christopher Tate
95c6f90abf am 64cb24e6: Merge "Send DRAG_STARTED notices to views that become visible during drag" into honeycomb
* commit '64cb24e686b13aabe3d28e049796c8315b011485':
  Send DRAG_STARTED notices to views that become visible during drag
2011-01-14 12:38:24 -08:00
Christopher Tate
76630daaa1 Merge "Send DRAG_STARTED notices to views that become visible during drag" into honeycomb 2011-01-14 12:36:53 -08:00
Dianne Hackborn
8e067b2c21 am f21ae269: am d922ae01: Add Holo theme for IMEs.
* commit 'f21ae26935349f45c55afa5c8e45e1f6aa880915':
  Add Holo theme for IMEs.
2011-01-14 12:35:06 -08:00
Dianne Hackborn
1a57a9f4b1 am d922ae01: Add Holo theme for IMEs.
* commit 'd922ae01ca99a2b6d39a9393f86776a1d10ebd14':
  Add Holo theme for IMEs.
2011-01-14 12:31:59 -08:00
Robert Greenwalt
96045c9511 am 7b04b1d7: am 1e02ebd2: Merge "Update network subtypes info so it is current." into honeycomb
* commit '7b04b1d7ff7a38be30794c25e893beb40616affb':
  Update network subtypes info so it is current.
2011-01-14 12:28:58 -08:00
Robert Greenwalt
20a2b025c6 am 1e02ebd2: Merge "Update network subtypes info so it is current." into honeycomb
* commit '1e02ebd225cfe629a4ab2b98f19e4e08ad97c397':
  Update network subtypes info so it is current.
2011-01-14 12:26:39 -08:00
Robert Greenwalt
22b075c949 Merge "Update network subtypes info so it is current." into honeycomb 2011-01-14 12:23:45 -08:00
Adam Powell
1b8ee4f649 am 25cb8bcd: am 2dc59d56: Merge "Fix bug 3347747 - Use a better context when fetching resources for action modes" into honeycomb
* commit '25cb8bcd19231dff29b9ec80ba94d263068465bb':
  Fix bug 3347747 - Use a better context when fetching resources for action modes
2011-01-14 12:16:45 -08:00
Adam Powell
e2e63d7b93 am 2dc59d56: Merge "Fix bug 3347747 - Use a better context when fetching resources for action modes" into honeycomb
* commit '2dc59d56cbfe90fdae745496038352fdada6ee26':
  Fix bug 3347747 - Use a better context when fetching resources for action modes
2011-01-14 12:14:24 -08:00
Adam Powell
38a5410f16 Merge "Fix bug 3347747 - Use a better context when fetching resources for action modes" into honeycomb 2011-01-14 12:12:13 -08:00
satok
38e587388f am b3b1509d: am 64fc11c3: Merge "Add input methods settings panel" into honeycomb
* commit 'b3b1509de73e61296d4fae5ee7e065915ffd4109':
  Add input methods settings panel
2011-01-14 12:07:24 -08:00
satok
162cd17358 am 64fc11c3: Merge "Add input methods settings panel" into honeycomb
* commit '64fc11c3ddefc4272a171aaab5c1291709fabe7e':
  Add input methods settings panel
2011-01-14 12:05:09 -08:00
satok
2903930bcf Merge "Add input methods settings panel" into honeycomb 2011-01-14 12:03:40 -08:00
Costin Manolache
e56c6d5409 am 660f72a0: am c6684f9e: Fix previous quick fix, LoginOptions is final.
* commit '660f72a01681833b0e1e2c23b6281946d01bfb8a':
  Fix previous quick fix, LoginOptions is final.
2011-01-14 11:32:25 -08:00
Romain Guy
f9b0e2f842 am 527d6c03: am fe5be1b0: Merge "Don\'t add clipped rects to layer regions. Bug #3350208" into honeycomb
* commit '527d6c03ab094ed956190eac26f5cd0e79b7d914':
  Don't add clipped rects to layer regions. Bug #3350208
2011-01-14 11:30:12 -08:00
Costin Manolache
307b811ee7 am c6684f9e: Fix previous quick fix, LoginOptions is final.
* commit 'c6684f9e9790e92960504e9b32f20f27003d9f37':
  Fix previous quick fix, LoginOptions is final.
2011-01-14 11:29:59 -08:00
Romain Guy
aad69cf08a am fe5be1b0: Merge "Don\'t add clipped rects to layer regions. Bug #3350208" into honeycomb
* commit 'fe5be1b04273b8f67a00ac688940299f7d502c1d':
  Don't add clipped rects to layer regions. Bug #3350208
2011-01-14 11:27:57 -08:00
Romain Guy
d9ee65e634 Merge "Don't add clipped rects to layer regions. Bug #3350208" into honeycomb 2011-01-14 11:25:56 -08:00
Mathias Agopian
f7e7d222eb am 0ff89a3f: am 010719c2: Merge "fix [3312683] Camera mirroring problem after switching from back to front camera" into honeycomb
* commit '0ff89a3faa6de369f1441b7a4ce010a21f7bfab3':
  fix [3312683] Camera mirroring problem after switching from back to front camera
2011-01-14 11:08:37 -08:00
Mathias Agopian
f637bd067e am 010719c2: Merge "fix [3312683] Camera mirroring problem after switching from back to front camera" into honeycomb
* commit '010719c2fff4ab40757984f29d7755ff7f79e3de':
  fix [3312683] Camera mirroring problem after switching from back to front camera
2011-01-14 11:05:24 -08:00
Eric Fischer
f07b5e2d55 am 6a1fbc5a: am fae55508: (-s ours) am 5a40b8ef: Merge "Add date format and map center resources for new locales." into gingerbread
* commit '6a1fbc5a304b8c08150bcb145d6051480af2c7a2':
  Add date format and map center resources for new locales.
2011-01-14 11:05:11 -08:00
Eric Fischer
66a9c0a652 am fae55508: (-s ours) am 5a40b8ef: Merge "Add date format and map center resources for new locales." into gingerbread
* commit 'fae55508d04344a97830bbf38ca02214642f7b7e':
  Add date format and map center resources for new locales.
2011-01-14 11:02:25 -08:00