ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
40,106 Commits 2 Branches 0 Tags 54 MiB
d7967f79b3
Commit Graph

40106 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
16346b60da am f13313a0: Merge "Fix 5452698: fix broken logic in reportFailedAttempt() in lockscreen" into ics-mr0 
* commit 'f13313a073ad3f3c4e91baa4adbfdec66395065e':
  Fix 5452698: fix broken logic in reportFailedAttempt() in lockscreen
 2011-10-18 15:12:02 -07:00
Jim Miller
d0c7378baa Merge "Fix 5452698: fix broken logic in reportFailedAttempt() in lockscreen" into ics-mr0 2011-10-18 15:10:04 -07:00
Joe Fernandez
24c7d2b9f1 am 3f70aa78: Merge "docs: Camera JavaDoc - added xref to Camera DevGuide" into ics-mr0 
* commit '3f70aa783cca9f4c331c2a1b390bb7bebc6e248c':
  docs: Camera JavaDoc - added xref to Camera DevGuide
 2011-10-18 15:03:23 -07:00
Joe Fernandez
8035a00cf1 Merge "docs: Camera JavaDoc - added xref to Camera DevGuide" into ics-mr0 2011-10-18 15:02:00 -07:00
Fred Quintana
598e29e40b am 6d076a42: Merge "fix bug where the instance saving of the ChooseTypeAndAccountActivity would only work in the case where onSaveInstanceState was called." into ics-mr0 
* commit '6d076a425ab10441996ebe194b0c181d16912ece':
  fix bug where the instance saving of the ChooseTypeAndAccountActivity would only work in the case where onSaveInstanceState was called.
 2011-10-18 14:45:35 -07:00
Fred Quintana
eedc890d55 Merge "fix bug where the instance saving of the ChooseTypeAndAccountActivity would only work in the case where onSaveInstanceState was called." into ics-mr0 2011-10-18 14:43:06 -07:00
Dianne Hackborn
28cf9f4125 am 535f6eac: Merge "Fix issue #5461497: Landed on Welcome screen after a tap on \'Next\' in Screen 500" into ics-mr0 
* commit '535f6eacb9bd508caac463a12ab69be1cd58c5a5':
  Fix issue #5461497: Landed on Welcome screen after a tap on 'Next' in Screen 500
 2011-10-18 14:36:31 -07:00
Dianne Hackborn
80ce665ba2 Merge "Fix issue #5461497: Landed on Welcome screen after a tap on 'Next' in Screen 500" into ics-mr0 2011-10-18 14:34:08 -07:00
Michael Chan
488165e8c0 Merge "Update comment on required fields for an event" 2011-10-18 14:33:10 -07:00
Robert Greenwalt
e140f650c8 am dd466152: Merge "Initialize Hipri correctly." into ics-mr0 
* commit 'dd466152dd1b88f7b5bd73c47715eb84b76e6dab':
  Initialize Hipri correctly.
 2011-10-18 14:31:47 -07:00
Robert Greenwalt
eddfdbc51b Merge "Initialize Hipri correctly." into ics-mr0 2011-10-18 14:29:50 -07:00
Chet Haase
1ecfabbe5a am 87bc53de: Merge "Make notification panel delete-all animation smoother" into ics-mr0 
* commit '87bc53de2adf479ad5a5e226bf3d8fd31af6dc21':
  Make notification panel delete-all animation smoother
 2011-10-18 13:46:45 -07:00
Chet Haase
069dff2f53 Merge "Make notification panel delete-all animation smoother" into ics-mr0 2011-10-18 13:45:00 -07:00
Wink Saville
58da67c033 am 07848843: Merge "Add DataConnection#isEmergency and use in trySetupData." into ics-mr0 
* commit '07848843b23e10e4728fa779cc79fc38a341cf6b':
  Add DataConnection#isEmergency and use in trySetupData.
 2011-10-18 13:38:09 -07:00
Wink Saville
c6512c062c Merge "Add DataConnection#isEmergency and use in trySetupData." into ics-mr0 2011-10-18 13:35:43 -07:00
Jim Miller
3c1ccfe857 am 8e6d75af: Merge "Fix 5473038: workaround for fd leak in lockscreen" into ics-mr0 
* commit '8e6d75affa1a802b01aa38ad765d1ae9f998c0ab':
  Fix 5473038: workaround for fd leak in lockscreen
 2011-10-18 13:12:10 -07:00
Jim Miller
b13af61769 Merge "Fix 5473038: workaround for fd leak in lockscreen" into ics-mr0 2011-10-18 13:10:24 -07:00
Jake Hamby
d011eff135 am f522e095: Merge "Add wrapper method to GsmAlphabet for API compatibility." into ics-mr0 
* commit 'f522e095e69406a5c6039b406237e9b30781a355':
  Add wrapper method to GsmAlphabet for API compatibility.
 2011-10-18 12:24:25 -07:00
Jake Hamby
5884e9eb26 Merge "Add wrapper method to GsmAlphabet for API compatibility." into ics-mr0 2011-10-18 12:22:39 -07:00
Svetoslav Ganov
26b25e1ac3 am 601d5817: Merge "TouchExplorer crashes if there is incative pointer while dragging." into ics-mr0 
* commit '601d5817301bc79c34c30e7b606fe872b2b76c31':
  TouchExplorer crashes if there is incative pointer while dragging.
 2011-10-18 11:54:03 -07:00
Michael Jurka
3d46341b90 am 6d9d17fd: Merge "Visual changes to recent apps" into ics-mr0 
* commit '6d9d17fdd299642330dac321a9fa4099abaae220':
  Visual changes to recent apps
 2011-10-18 11:51:52 -07:00
Svetoslav Ganov
74f938195e Merge "TouchExplorer crashes if there is incative pointer while dragging." into ics-mr0 2011-10-18 11:51:29 -07:00
Michael Jurka
39667a648a Merge "Visual changes to recent apps" into ics-mr0 2011-10-18 11:49:57 -07:00
Robert Ly
698fb036b1 am d6462ab5: Merge "docs: fix mistakes" into ics-mr0 
* commit 'd6462ab5472341f7b8ded552f2440c21baaa3873':
  docs: fix mistakes
 2011-10-18 11:33:37 -07:00
Eric Fischer
a2913aa92d am 3c44e8d2: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit '3c44e8d22cf995821cc79dbe77a1b587aac7a3d7':
  Import revised translations.  DO NOT MERGE
 2011-10-18 11:31:18 -07:00
Robert Ly
b2268411c0 Merge "docs: fix mistakes" into ics-mr0 2011-10-18 11:30:35 -07:00
Eric Fischer
e43599500d Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-10-18 11:29:34 -07:00
Winson Chung
cd4d501c55 am 5310a731: Merge "Updating screenshot animation and behaviour. (Bug: 5333706)" into ics-mr0 
* commit '5310a731eab664352044781d4b107b4837ea77ac':
  Updating screenshot animation and behaviour. (Bug: 5333706)
 2011-10-18 11:19:55 -07:00
Winson Chung
eff86b1bae Merge "Updating screenshot animation and behaviour. (Bug: 5333706)" into ics-mr0 2011-10-18 11:17:24 -07:00
Robert Ly
ec21c61fe8 am 1ff39212: Merge "cherrypick from master - docs: nfc updates Change-Id: Iaa782911f14b11bc896ac9ef06db2c43104d1dac" into ics-mr0 
* commit '1ff392128dfb802fe58e90ba23ed6138b1cd1a64':
  cherrypick from master - docs: nfc updates Change-Id: Iaa782911f14b11bc896ac9ef06db2c43104d1dac
 2011-10-18 11:12:28 -07:00
Robert Ly
20920c2f07 Merge "cherrypick from master - docs: nfc updates Change-Id: Iaa782911f14b11bc896ac9ef06db2c43104d1dac" into ics-mr0 2011-10-18 11:11:05 -07:00
RoboErik
11505f4168 Merge "Update to hidden APIs" 2011-10-18 10:47:50 -07:00
Mangesh Ghiware
76c67484cd am 2bd3c2f7: Merge "Fix null ptr exception in getReadingLevelScale()" into ics-mr0 
* commit '2bd3c2f7e89eb02f2b240672631c57bc912a9575':
  Fix null ptr exception in getReadingLevelScale()
 2011-10-18 10:32:36 -07:00
Mangesh Ghiware
c10f4e6a0d Merge "Fix null ptr exception in getReadingLevelScale()" into ics-mr0 2011-10-18 10:31:15 -07:00
Robert Greenwalt
d7492d6646 am dba69061: Merge "Send availability info more reliably" into ics-mr0 
* commit 'dba69061a6e9c25d968819cee47ab13e5b554b9a':
  Send availability info more reliably
 2011-10-18 09:44:22 -07:00
Robert Greenwalt
286eac4d26 Merge "Send availability info more reliably" into ics-mr0 2011-10-18 09:42:33 -07:00
Justin Ho
c0f98d22e7 am a548b5cb: Merge "Removing Testudo and adding Themos ringtone Bug: 5416299" into ics-mr0 
* commit 'a548b5cb82008d2d6629ab78ba775a24bff55040':
  Removing Testudo and adding Themos ringtone Bug: 5416299
 2011-10-18 09:33:10 -07:00
Justin Ho
9bd394e596 Merge "Removing Testudo and adding Themos ringtone Bug: 5416299" into ics-mr0 2011-10-18 09:31:01 -07:00
satok
d6ee2432bd am b7ad8253: Merge "Add documents for the spell checker framework and the input method subtype" into ics-mr0 
* commit 'b7ad82533596b73ecd40f22bfe48b1b785b05068':
  Add documents for the spell checker framework and the input method subtype
 2011-10-18 09:17:31 -07:00
satok
1ec66ecde1 Merge "Add documents for the spell checker framework and the input method subtype" into ics-mr0 2011-10-18 09:15:48 -07:00
The Android Open Source Project
f7bea22320 Reconcile with ics-mr0-release 
Change-Id: Ife215fa3762b795be28dfe472095c5e7e0b7624f
 2011-10-18 07:31:56 -07:00
The Android Automerger
300bbc3b86 merge in ics-mr0-release history after reset to ics-mr0 2011-10-18 06:28:19 -07:00
Irfan Sheriff
00f04c62e3 am 11116b80: Merge "Disconnect without CTRL-EVENT-DISCONNECTED" into ics-mr0 
* commit '11116b80d88b72e14e4f6b7ad3ab312096f8eea5':
  Disconnect without CTRL-EVENT-DISCONNECTED
 2011-10-17 20:33:07 -07:00
Irfan Sheriff
a59376f762 Merge "Disconnect without CTRL-EVENT-DISCONNECTED" into ics-mr0 2011-10-17 20:31:50 -07:00
The Android Automerger
060c1527e7 merge in ics-mr0-release history after reset to ics-mr0 2011-10-17 20:08:56 -07:00
Eric Laurent
b0fa23cf7e am c0a87dc1: Merge "Fix issue 5462427: Volume should never be 0 ..." into ics-mr0 
* commit 'c0a87dc10cc74918518457e96b48f16bcc0ea2cd':
  Fix issue 5462427: Volume should never be 0 ...
 2011-10-17 19:50:36 -07:00
Eric Laurent
7e821f7624 Merge "Fix issue 5462427: Volume should never be 0 ..." into ics-mr0 2011-10-17 19:48:31 -07:00
Chih-Chung Chang
0f727e8e22 am a84e37f3: Merge "Fix 5468644: Use the proper audio stream type to play sound." into ics-mr0 
* commit 'a84e37f37c7cd21fe498a923c181d3896e055d56':
  Fix 5468644: Use the proper audio stream type to play sound.
 2011-10-17 19:42:14 -07:00
Chih-Chung Chang
14d1c00b9c Merge "Fix 5468644: Use the proper audio stream type to play sound." into ics-mr0 2011-10-17 19:40:12 -07:00
Dave Burke
039594c9d0 am 6f13adb2: Merge "Don\'t hold onto the lock while reconnecting to the server" into ics-mr0 
* commit '6f13adb22afcb47a1cd45a90eaa3c154522089d4':
  Don't hold onto the lock while reconnecting to the server
 2011-10-17 18:36:48 -07:00