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

60137 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
satok
44b7503093 Add documents for the spell checker framework and the input method subtype 
Bug: 4973788

Change-Id: I7e650f336ba1bb8949899e8b2355e6d492a2e4b2
 2011-10-18 20:28:23 +09:00
Irfan Sheriff
af333486dd 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
11116b80d8 Merge "Disconnect without CTRL-EVENT-DISCONNECTED" into ics-mr0 2011-10-17 20:31:50 -07:00
The Android Automerger
2a7880c00d merge in ics-mr0-release history after reset to ics-mr0 2011-10-17 20:08:56 -07:00
Eric Laurent
46c8f1535a 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
c0a87dc10c Merge "Fix issue 5462427: Volume should never be 0 ..." into ics-mr0 2011-10-17 19:48:31 -07:00
Chih-Chung Chang
21ad1d1cb0 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
a84e37f37c 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
499e252245 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
Dave Burke
6f13adb22a Merge "Don't hold onto the lock while reconnecting to the server" into ics-mr0 2011-10-17 18:35:11 -07:00
Jim Miller
138f6fa439 am 9a7e4ce7: Merge "Fix 5466678: use new setSystemUiVisibility() API to enable clock in statusbar" into ics-mr0 
* commit '9a7e4ce72a1f97832e71386ad023439ed9b179bd':
  Fix 5466678: use new setSystemUiVisibility() API to enable clock in statusbar
 2011-10-17 18:06:08 -07:00
Jim Miller
9a7e4ce72a Merge "Fix 5466678: use new setSystemUiVisibility() API to enable clock in statusbar" into ics-mr0 2011-10-17 18:03:38 -07:00
John Reck
08eaa9de76 am 7788c51d: Merge "Fix onFirstLayout path for saved pages" into ics-mr0 
* commit '7788c51d82963a8645655675c675424db694ad85':
  Fix onFirstLayout path for saved pages
 2011-10-17 17:50:39 -07:00
John Reck
7788c51d82 Merge "Fix onFirstLayout path for saved pages" into ics-mr0 2011-10-17 17:48:58 -07:00
Peter Ng
e119e1d6a4 am f129988a: Merge "Bullet points updated and permission colors are not orange" into ics-mr0 
* commit 'f129988a1aa8a210dc125b0f427d848a2aeb8bb2':
  Bullet points updated and permission colors are not orange
 2011-10-17 17:26:10 -07:00
Peter Ng
f129988a1a Merge "Bullet points updated and permission colors are not orange" into ics-mr0 2011-10-17 17:24:32 -07:00
Justin Ho
9667c282a4 am e95a1190: Merge "Update unlock halo asset" into ics-mr0 
* commit 'e95a1190ff9e15ac0924cd7f294cf6a486e3119f':
  Update unlock halo asset
 2011-10-17 17:23:15 -07:00
Justin Ho
5eb1477a94 am 0f86772a: Merge "Update text select handles" into ics-mr0 
* commit '0f86772ad7837a1b084bba7f8180f267e958a9b2':
  Update text select handles
 2011-10-17 17:23:14 -07:00
Justin Ho
ea9433a3d4 am c598fcf4: Merge "Update stat_sys icons with different resize method" into ics-mr0 
* commit 'c598fcf4d24357628c56888440b39a130a36824a':
  Update stat_sys icons with different resize method
 2011-10-17 17:23:12 -07:00
Justin Ho
b089bc9122 am 49317b77: Merge "Update spinner assets" into ics-mr0 
* commit '49317b77fddd03ed8a5bed520aefc248edfb9e14':
  Update spinner assets
 2011-10-17 17:23:10 -07:00
Justin Ho
6e3d3f1b6f am 0c7020dd: Merge "Update scrubber assets" into ics-mr0 
* commit '0c7020dd524a8354ea11ffa2228ac6a930e5114b':
  Update scrubber assets
 2011-10-17 17:23:09 -07:00
Justin Ho
202d4a0c21 am d864a503: Merge "Update rating stars" into ics-mr0 
* commit 'd864a503c0ea201c12266ca2dc4da1ccc2d66e0b':
  Update rating stars
 2011-10-17 17:23:06 -07:00
Justin Ho
6dd8c7ccb4 am 488eddca: Merge "Update lockscreen assets" into ics-mr0 
* commit '488eddca0f1b2fd824de52e0f38c90b2d129d3b0':
  Update lockscreen assets
 2011-10-17 17:23:05 -07:00
Justin Ho
986c231b4a am e93f09d6: Merge "Update lockscreen assets" into ics-mr0 
* commit 'e93f09d66853f568eb253b458bd2cad2a34cb79a':
  Update lockscreen assets
 2011-10-17 17:23:04 -07:00
Justin Ho
3133e9ae99 am 2076de1b: Merge "Update fastscroll assets" into ics-mr0 
* commit '2076de1b43bfff65635bd314bbaae0400afd091c':
  Update fastscroll assets
 2011-10-17 17:23:02 -07:00
Justin Ho
40e565387c am 8ffa1371: Merge "Update checkboxes" into ics-mr0 
* commit '8ffa1371616eb8096e8063bdff3fef75f74efbc5':
  Update checkboxes
 2011-10-17 17:23:01 -07:00