Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,424 Commits 3 Branches 0 Tags
d4c03518c575ca12dbdd0ea1bb856558ecae16bf
Commit Graph

62424 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
d4c03518c5 am 7a0390b9: am 07848843: Merge "Add DataConnection#isEmergency and use in trySetupData." into ics-mr0 
* commit '7a0390b97c0a9dfa4a32cd472a83a9f7471ba569':
  Add DataConnection#isEmergency and use in trySetupData.
 2011-10-18 13:40:20 -07:00
Wink Saville
7a0390b97c 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
07848843b2 Merge "Add DataConnection#isEmergency and use in trySetupData." into ics-mr0 2011-10-18 13:35:43 -07:00
Jim Miller
7c1d0dfd4b am 7c3a1839: am 8e6d75af: Merge "Fix 5473038: workaround for fd leak in lockscreen" into ics-mr0 
* commit '7c3a18398f8cd8977079fad34a6bfc3fdab6378e':
  Fix 5473038: workaround for fd leak in lockscreen
 2011-10-18 13:14:38 -07:00
Jim Miller
7c3a18398f 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
8e6d75affa Merge "Fix 5473038: workaround for fd leak in lockscreen" into ics-mr0 2011-10-18 13:10:24 -07:00
Jake Hamby
6b79577e10 am 977e8ec8: am f522e095: Merge "Add wrapper method to GsmAlphabet for API compatibility." into ics-mr0 
* commit '977e8ec81071a7110be3357d28d067f62abd80d6':
  Add wrapper method to GsmAlphabet for API compatibility.
 2011-10-18 12:26:17 -07:00
Jake Hamby
977e8ec810 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
f522e095e6 Merge "Add wrapper method to GsmAlphabet for API compatibility." into ics-mr0 2011-10-18 12:22:39 -07:00
Svetoslav Ganov
99e1951321 am 12ca1fa7: am 601d5817: Merge "TouchExplorer crashes if there is incative pointer while dragging." into ics-mr0 
* commit '12ca1fa78a22a9e84b69013297dc46b1c766d71b':
  TouchExplorer crashes if there is incative pointer while dragging.
 2011-10-18 11:56:54 -07:00
Michael Jurka
f6f1a31179 am 0ad8c3c8: am 6d9d17fd: Merge "Visual changes to recent apps" into ics-mr0 
* commit '0ad8c3c86e4a9c3a16e783ba6c5396ebac111d55':
  Visual changes to recent apps
 2011-10-18 11:54:42 -07:00
Svetoslav Ganov
12ca1fa78a 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
0ad8c3c86e 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
601d581730 Merge "TouchExplorer crashes if there is incative pointer while dragging." into ics-mr0 2011-10-18 11:51:29 -07:00
Michael Jurka
6d9d17fdd2 Merge "Visual changes to recent apps" into ics-mr0 2011-10-18 11:49:57 -07:00
Robert Ly
43a2e70742 am 7a236d06: am d6462ab5: Merge "docs: fix mistakes" into ics-mr0 
* commit '7a236d06a6db5c2a68379a4dd1b2429d93bb8ecf':
  docs: fix mistakes
 2011-10-18 11:36:52 -07:00
Eric Fischer
fd0cd49d74 am 6de2191a: (-s ours) am 3c44e8d2: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit '6de2191a3c61f2ac6d8742be734e2595e6eb95b1':
  Import revised translations.  DO NOT MERGE
 2011-10-18 11:34:15 -07:00
Robert Ly
7a236d06a6 am d6462ab5: Merge "docs: fix mistakes" into ics-mr0 
* commit 'd6462ab5472341f7b8ded552f2440c21baaa3873':
  docs: fix mistakes
 2011-10-18 11:33:37 -07:00
Eric Fischer
6de2191a3c 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
d6462ab547 Merge "docs: fix mistakes" into ics-mr0 2011-10-18 11:30:35 -07:00
Eric Fischer
3c44e8d22c Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-10-18 11:29:34 -07:00
Svetoslav Ganov
d8581c7a61 TouchExplorer crashes if there is incative pointer while dragging. 
The TouchExplorer was not taking into account the case with incative
pointers while dragging. If one puts a finger down and then perfroms
a dragging gestore the explorer tries to inject UP event for the end
of the gesture upon every of the two dragging pointers going up instead
only for one the first went up.

bug:5476098

Change-Id: I20d2dd7bde7e016b0678a35d14cd068d9ff37023
 2011-10-18 11:28:52 -07:00
Winson Chung
1430f19046 am b1af21d0: am 5310a731: Merge "Updating screenshot animation and behaviour. (Bug: 5333706)" into ics-mr0 
* commit 'b1af21d0a66c750134e4437a76430786bdd08066':
  Updating screenshot animation and behaviour. (Bug: 5333706)
 2011-10-18 11:22:14 -07:00
Winson Chung
b1af21d0a6 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
Robert Ly
412f90c953 docs: fix mistakes 
Change-Id: Ie1d7acf45d7c0940c60039cc7beeb134ae950085
 2011-10-18 11:18:04 -07:00
Winson Chung
5310a731ea Merge "Updating screenshot animation and behaviour. (Bug: 5333706)" into ics-mr0 2011-10-18 11:17:24 -07:00
Robert Ly
4f5afea36f am 31fc25a8: am 1ff39212: Merge "cherrypick from master - docs: nfc updates Change-Id: Iaa782911f14b11bc896ac9ef06db2c43104d1dac" into ics-mr0 
* commit '31fc25a845af88b3d1d1390d7fc07cb26416442e':
  cherrypick from master - docs: nfc updates Change-Id: Iaa782911f14b11bc896ac9ef06db2c43104d1dac
 2011-10-18 11:14:24 -07:00
Robert Ly
31fc25a845 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
1ff392128d Merge "cherrypick from master - docs: nfc updates Change-Id: Iaa782911f14b11bc896ac9ef06db2c43104d1dac" into ics-mr0 2011-10-18 11:11:05 -07:00
Eric Fischer
21a7408323 Import revised translations. DO NOT MERGE 
Change-Id: If2637d835559b2bdfc5b19d74aedf17aa660bdc7
 2011-10-18 11:06:56 -07:00
RoboErik
d1bf06eff1 am 39617b00: Merge "Update to hidden APIs" 
* commit '39617b0036d726012891086080f47237fd64a5f4':
  Update to hidden APIs
 2011-10-18 10:49:37 -07:00
RoboErik
39617b0036 Merge "Update to hidden APIs" 2011-10-18 10:47:50 -07:00
Winson Chung
a63bb84bbe Updating screenshot animation and behaviour. (Bug: 5333706) 
- Removing the second ticker text
- Adding a new animation to the status bar
- Adding a large icon to the notification

Change-Id: I8778178519fc72ffc299e8d624069b684475191d
 2011-10-18 10:46:48 -07:00
Mangesh Ghiware
cc3d27d741 am 29a15a23: am 2bd3c2f7: Merge "Fix null ptr exception in getReadingLevelScale()" into ics-mr0 
* commit '29a15a237aa9a0ee0af594fbf23cf999415f2390':
  Fix null ptr exception in getReadingLevelScale()
 2011-10-18 10:34:33 -07:00
Mangesh Ghiware
29a15a237a 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
2bd3c2f7e8 Merge "Fix null ptr exception in getReadingLevelScale()" into ics-mr0 2011-10-18 10:31:15 -07:00
Robert Greenwalt
5be7e72cf3 am 9b61778d: am dba69061: Merge "Send availability info more reliably" into ics-mr0 
* commit '9b61778d63ac41d489ecb40b385cf3f87bdee1f9':
  Send availability info more reliably
 2011-10-18 09:46:30 -07:00
Robert Greenwalt
9b61778d63 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
dba69061a6 Merge "Send availability info more reliably" into ics-mr0 2011-10-18 09:42:33 -07:00
Justin Ho
01facfc424 am 8af45445: am a548b5cb: Merge "Removing Testudo and adding Themos ringtone Bug: 5416299" into ics-mr0 
* commit '8af45445deea2ec59afd22d12855b85d015f1769':
  Removing Testudo and adding Themos ringtone Bug: 5416299
 2011-10-18 09:34:39 -07:00
Justin Ho
8af45445de 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
Mangesh Ghiware
1698d45ef8 Fix null ptr exception in getReadingLevelScale() 
Handle the case where WebView settings might be null.

Bug: 5472493
Change-Id: I6b1c2e5e5e56a517910a330ae9d40a4adc99d75a
 2011-10-18 09:32:36 -07:00
Justin Ho
a548b5cb82 Merge "Removing Testudo and adding Themos ringtone Bug: 5416299" into ics-mr0 2011-10-18 09:31:01 -07:00
satok
212c603067 am 6bfa1081: am b7ad8253: Merge "Add documents for the spell checker framework and the input method subtype" into ics-mr0 
* commit '6bfa10814e3a701fcef5e4f487f14815a155c35f':
  Add documents for the spell checker framework and the input method subtype
 2011-10-18 09:19:40 -07:00
satok
6bfa10814e 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
b7ad825335 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
8f6534fb40 am 4dbf9cdd: Reconcile with ics-mr0-release 
* commit '4dbf9cdd70e3bc09e1abf9bbef31eec12cc71d15':
 2011-10-18 07:33:57 -07:00
The Android Open Source Project
4dbf9cdd70 Reconcile with ics-mr0-release 
Change-Id: Ife215fa3762b795be28dfe472095c5e7e0b7624f
 2011-10-18 07:31:56 -07:00
Robert Greenwalt
12e24ae760 Send availability info more reliably 
We don't have a monolithic availability state, so the mAvailable variable
must go.

bug:5453318
Change-Id: I82af90907cc7a0173b74d661912f9c28ddc7dcb0
 2011-10-18 06:39:59 -07:00
The Android Automerger
4409dd5bf9 merge in ics-mr0-release history after reset to ics-mr0 2011-10-18 06:28:19 -07:00