LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,038 Commits 2 Branches 0 Tags
4e0dd447a6d0ec43c8f9ac79893da09dcb76a0cc
Commit Graph

10038 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
e03f762787 am 85241cc7: Add button to clear back stack. 
* commit '85241cc7950e60747decf21eab81a9c6b9a3e71b':
  Add button to clear back stack.
 2012-01-24 17:19:03 -08:00
Dianne Hackborn
85241cc795 Add button to clear back stack. 
Change-Id: I4f02714ec349055a486608ff0eab75a46d6ba7cd
 2012-01-24 13:39:02 -08:00
The Android Automerger
ed0f12abc9 merge in ics-release history after reset to master 2012-01-24 06:59:28 -08:00
Svetoslav Ganov
4ce026b4b1 Updating the monkey to use a dedicated UI test bridge. 
1. The MonkeySourceNetworkViews was registering a raw event
   listener for accessibility events and hence perform
   connection and cache management in similar way to an
   AccessibilityService. This is fragile and requires
   the Monkey implementor to know internal framework
   stuff. Now the functionality required by the class
   is accessed via the new UiTestAutomationBridge.

Change-Id: Idd5820e42a4b4dfc1d9eed8977ec5ccd96485daa
 2012-01-23 18:23:45 -08:00
Robert Ly
74c1836184 updating the SampleSyncAdapter sample to add stream item and photo code 
Change-Id: Ic5f16194fc0d0314d9170a8598eccc17b6a4e26c
 2012-01-23 17:58:16 -08:00
Andy McFadden
dc1c5412e5 am fb4ffd37: Merge "Use Map.Entry, not LinkedHashMap.Entry" 
* commit 'fb4ffd37de2c4cdf0af962f960076dc7ba1c12ab':
  Use Map.Entry, not LinkedHashMap.Entry
 2012-01-23 09:36:00 -08:00
Andy McFadden
fb4ffd37de Merge "Use Map.Entry, not LinkedHashMap.Entry" 2012-01-23 09:34:38 -08:00
The Android Automerger
f8708200da merge in ics-release history after reset to master 2012-01-23 06:59:36 -08:00
Robert Ly
6804eb4b3e am 9dc9cff1: am b295c347: am 3d398d72: Revert "updating the SampleSyncAdapter sample to add stream item and photo code" 
* commit '9dc9cff102391ca7b2eb8b680554e7848f20e973':
  Revert "updating the SampleSyncAdapter sample to add stream item and photo code"
 2012-01-20 16:43:19 -08:00
The Android Open Source Project
a31a63e5c7 am 04b76422: am 3407aafe: Reconcile with ics-mr1-release 
* commit '04b764227c8bcdabdd7faf82bc905422204ff187':
 2012-01-20 16:43:18 -08:00
Robert Ly
0c196f9a77 am 993c70d3: am 85755fae: am 7a98345f: updating the SampleSyncAdapter sample to add stream item and photo code 
* commit '993c70d3fad09e6827017e87abfcb286c1a964d8':
  updating the SampleSyncAdapter sample to add stream item and photo code
 2012-01-20 16:43:17 -08:00
Robert Ly
9dc9cff102 am b295c347: am 3d398d72: Revert "updating the SampleSyncAdapter sample to add stream item and photo code" 
* commit 'b295c347f44b2390f44bdbaffdd1c37ab19cc2ff':
  Revert "updating the SampleSyncAdapter sample to add stream item and photo code"
 2012-01-20 16:38:03 -08:00
The Android Open Source Project
04b764227c am 3407aafe: Reconcile with ics-mr1-release 
* commit '3407aafede66786616436dff0c448a77746f60aa':
 2012-01-20 16:37:57 -08:00
Robert Ly
993c70d3fa am 85755fae: am 7a98345f: updating the SampleSyncAdapter sample to add stream item and photo code 
* commit '85755fae3bda06e94e1d191c20c70e5344293b9a':
  updating the SampleSyncAdapter sample to add stream item and photo code
 2012-01-20 16:37:56 -08:00
The Android Open Source Project
f25db23f45 am a91b32c1: am 113986be: Reconcile with ics-mr1-release 
* commit 'a91b32c1d71d8cac75917d35d6263e74916806f6':
 2012-01-20 15:54:41 -08:00
Dianne Hackborn
4497b29f6f am 37e103ca: am 5370dc8f: am 2a9de021: Clean up and extend the linkify sample. 
* commit '37e103caf5f0264fb84fc25174661bf74c6c4715':
  Clean up and extend the linkify sample.
 2012-01-20 15:54:40 -08:00
The Android Open Source Project
a91b32c1d7 am 113986be: Reconcile with ics-mr1-release 
* commit '113986be4f8bc71da5d30520bb7095b70eeb72d5':
 2012-01-20 15:52:15 -08:00
Dianne Hackborn
37e103caf5 am 5370dc8f: am 2a9de021: Clean up and extend the linkify sample. 
* commit '5370dc8f0dc20a46302f823af38cb48d08de1c45':
  Clean up and extend the linkify sample.
 2012-01-20 15:52:04 -08:00
Andy McFadden
0da366d78a Use Map.Entry, not LinkedHashMap.Entry 
Map.Entry is the defined return value from entrySet().
LinkedHashMap.Entry shouldn't be used directly.

Change-Id: Ib23ceac365c85cdec6ab1688e8f8168ce882bc90
 2012-01-20 14:38:08 -08:00
Robert Ly
b295c347f4 am 3d398d72: Revert "updating the SampleSyncAdapter sample to add stream item and photo code" 
* commit '3d398d7243fece134e677480899437880a9259ed':
  Revert "updating the SampleSyncAdapter sample to add stream item and photo code"
 2012-01-20 11:13:33 -08:00
Robert Ly
ae5aac2939 am 3d398d72: Revert "updating the SampleSyncAdapter sample to add stream item and photo code" 
* commit '3d398d7243fece134e677480899437880a9259ed':
  Revert "updating the SampleSyncAdapter sample to add stream item and photo code"
 2012-01-20 11:13:31 -08:00
Robert Ly
3d398d7243 Revert "updating the SampleSyncAdapter sample to add stream item and photo code" 
This reverts commit 7a98345fc5
 2012-01-20 11:07:10 -08:00
The Android Open Source Project
3407aafede Reconcile with ics-mr1-release 
Change-Id: I125a7243c23acb8c9268fcdab4ad953df8532844
 2012-01-20 10:25:24 -08:00
Robert Ly
85755fae3b am 7a98345f: updating the SampleSyncAdapter sample to add stream item and photo code 
* commit '7a98345fc5229a23b4490713991f78170374dd11':
  updating the SampleSyncAdapter sample to add stream item and photo code
 2012-01-20 10:21:38 -08:00
Robert Ly
8b61858ba3 am 7a98345f: updating the SampleSyncAdapter sample to add stream item and photo code 
* commit '7a98345fc5229a23b4490713991f78170374dd11':
  updating the SampleSyncAdapter sample to add stream item and photo code
 2012-01-20 10:20:37 -08:00
The Android Automerger
deda7c815c merge in ics-mr1-release history after reset to ics-mr1 2012-01-19 16:28:01 -08:00
Robert Ly
7a98345fc5 updating the SampleSyncAdapter sample to add stream item and photo code 
Change-Id: I6d44ea3f912a3d1e52695bda785c81ff527160d5
 2012-01-19 14:51:23 -08:00
The Android Open Source Project
113986be4f Reconcile with ics-mr1-release 
Change-Id: I169da9f82d60659a6a8a4969571e46c65a12e23d
 2012-01-19 13:06:34 -08:00
Dianne Hackborn
5370dc8f0d am 2a9de021: Clean up and extend the linkify sample. 
* commit '2a9de0211d7f8c5cb6f4dfb3d0eb5baddb355f2f':
  Clean up and extend the linkify sample.
 2012-01-19 10:12:54 -08:00
Dianne Hackborn
517329c2e9 am 2a9de021: Clean up and extend the linkify sample. 
* commit '2a9de0211d7f8c5cb6f4dfb3d0eb5baddb355f2f':
  Clean up and extend the linkify sample.
 2012-01-19 10:12:50 -08:00
Brett Chabot
fb11862390 Merge "Increase default runtest -j to 16." into ics-aah 2012-01-17 16:25:52 -08:00
Brett Chabot
12db436d22 Increase default runtest -j to 16. 
Change-Id: I4f98a630a7ad75557e462a122b83dd3c36cf6ab6
 2012-01-17 16:04:53 -08:00
Brett Chabot
a39865a1cb Update create_test to new android_mk API. 
Change-Id: I5b95cbee02051e3e347e68f874863a7b56e2df8b
 2012-01-17 15:54:39 -08:00
The Android Automerger
726a7eb6cf merge in ics-release history after reset to master 2012-01-17 06:59:33 -08:00
Dianne Hackborn
2a9de0211d Clean up and extend the linkify sample. 
Change-Id: If9d0451af3bfcdcd8bafb325f4b7978857efab7e
 2012-01-13 14:00:01 -08:00
Fred Quintana
dd18180210 am 9ce19670: Merge "fix the layout oddness that occurrs in portrait mode" 
* commit '9ce19670b2f2537304a33abbf062c0b92dd91da0':
  fix the layout oddness that occurrs in portrait mode
 2012-01-12 18:09:03 -08:00
Fred Quintana
9ce19670b2 Merge "fix the layout oddness that occurrs in portrait mode" 2012-01-12 18:07:07 -08:00
Fred Quintana
70c13b1957 fix the layout oddness that occurrs in portrait mode 
Change-Id: I42bb7479671c99220215cfc63d56d926baece10f
 2012-01-12 16:57:38 -08:00
The Android Automerger
0b616959b3 merge in ics-release history after reset to master 2012-01-12 14:12:21 -08:00
The Android Automerger
c9011c7f3c merge in ics-mr1-release history after reset to ics-mr1 2012-01-12 14:00:47 -08:00
The Android Open Source Project
297c6a1c1a am 771d0f06: am 88f46420: Reconcile with ics-mr1-release 
* commit '771d0f06fa0dc616411fcf079ac6610589b7a059':
 2012-01-12 08:59:44 -08:00
The Android Open Source Project
771d0f06fa am 88f46420: Reconcile with ics-mr1-release 
* commit '88f4642092e394631ea6e749130fc09286265970':
 2012-01-12 08:58:05 -08:00
The Android Open Source Project
88f4642092 Reconcile with ics-mr1-release 
Change-Id: I881c64731cf66f630d0062e8b1f87bc9c3dfb5a9
 2012-01-12 08:56:08 -08:00
Jesse Hall
97c1620440 am 900f5e87: am 9b19d582: am 4f66a14d: Merge "EmuGL: handle NULL data in glBufferData" into ics-mr1 
* commit '900f5e879360898afc5599fc887b98aa012c8ce2':
  EmuGL: handle NULL data in glBufferData
 2012-01-11 17:15:50 -08:00
Xavier Ducrohet
f35fcdde38 am c7845885: am 3393b3ae: (-s ours) am a318515c: Merge "Move platform 15 sdk rev to 2. do not merge." into ics-mr1 
* commit 'c784588597a9f620bc10da3e1c02ca2a8df021f6':
  Move platform 15 sdk rev to 2. do not merge.
 2012-01-11 17:14:07 -08:00
Jesse Hall
900f5e8793 am 9b19d582: am 4f66a14d: Merge "EmuGL: handle NULL data in glBufferData" into ics-mr1 
* commit '9b19d582d94a343437aacf962b8b95b83361bc10':
  EmuGL: handle NULL data in glBufferData
 2012-01-11 17:13:42 -08:00
Jesse Hall
7eef71a24c am 4f66a14d: Merge "EmuGL: handle NULL data in glBufferData" into ics-mr1 
* commit '4f66a14d5311ee94d5a498c8e0049f6b95d4d0d6':
  EmuGL: handle NULL data in glBufferData
 2012-01-11 17:12:14 -08:00
Jesse Hall
9b19d582d9 am 4f66a14d: Merge "EmuGL: handle NULL data in glBufferData" into ics-mr1 
* commit '4f66a14d5311ee94d5a498c8e0049f6b95d4d0d6':
  EmuGL: handle NULL data in glBufferData
 2012-01-11 17:12:09 -08:00
Xavier Ducrohet
c784588597 am 3393b3ae: (-s ours) am a318515c: Merge "Move platform 15 sdk rev to 2. do not merge." into ics-mr1 
* commit '3393b3ae2b550bc47dc267e5f365f8a34c274da3':
  Move platform 15 sdk rev to 2. do not merge.
 2012-01-11 17:11:59 -08:00
Jesse Hall
4f66a14d53 Merge "EmuGL: handle NULL data in glBufferData" into ics-mr1 2012-01-11 17:10:35 -08:00