Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
76,785 Commits 3 Branches 0 Tags
88dcbda03bfef2928b7100a575cbe7bdcf6b1727
Commit Graph

22601 Commits

Author SHA1 Message Date
Matthew Xie
88dcbda03b am 87d7c1d7: am ac8a61b6: Merge "When turning off, broadcast STATE_OFF in the last HotOff state" into jb-dev 
* commit '87d7c1d740c93147a762595fd7e415dbebfb182f':
  When turning off, broadcast STATE_OFF in the last HotOff state
 2012-05-08 11:33:35 -07:00
Robert Greenwalt
1fee5ef1aa am d760beb7: am 2321301f: Merge "Bring up the ethernet interface when detected" into jb-dev 
* commit 'd760beb735538d61d78584722352a888629b670a':
  Bring up the ethernet interface when detected
 2012-05-08 11:32:41 -07:00
Philip Milne
3ed259a43c am 2a52d26c: am 7bb66c9c: Hide optical bounds feature for JB. 
* commit '2a52d26c0b917de8b1e4d20ebad87b9b3825f6ca':
  Hide optical bounds feature for JB.
 2012-05-08 11:32:06 -07:00
Amith Yamasani
988b832b34 am 503b2e5a: am 44e3f88f: Merge "Javadoc improvements in SearchView per API review." into jb-dev 
* commit '503b2e5ae1b83e5595b47a8d376db6b89b059b87':
  Javadoc improvements in SearchView per API review.
 2012-05-08 11:29:57 -07:00
John Reck
2eeec7189e am 462ee95f: am a09b06ef: Merge "Remove heldMotionless disabling native scroll mode" into jb-dev 
* commit '462ee95ff0cfb01d295c0b7e34bf995a50edb313':
  Remove heldMotionless disabling native scroll mode
 2012-05-08 11:29:54 -07:00
Gilles Debunne
bb5971a78f am 8779c022: am 0caf421e: Merge "Final fix in SpannableStringBuilder." into jb-dev 
* commit '8779c022b401b2a269e058c2c27b885694b696f3':
  Final fix in SpannableStringBuilder.
 2012-05-08 11:29:49 -07:00
Matthew Xie
87d7c1d740 am ac8a61b6: Merge "When turning off, broadcast STATE_OFF in the last HotOff state" into jb-dev 
* commit 'ac8a61b6d47e737794b2aaeaf629d87e493413b8':
  When turning off, broadcast STATE_OFF in the last HotOff state
 2012-05-07 14:41:41 -07:00
Matthew Xie
ac8a61b6d4 Merge "When turning off, broadcast STATE_OFF in the last HotOff state" into jb-dev 2012-05-07 14:38:42 -07:00
Robert Greenwalt
d760beb735 am 2321301f: Merge "Bring up the ethernet interface when detected" into jb-dev 
* commit '2321301fe75f945b002372d6d35c597191564452':
  Bring up the ethernet interface when detected
 2012-05-07 13:42:53 -07:00
Robert Greenwalt
2321301fe7 Merge "Bring up the ethernet interface when detected" into jb-dev 2012-05-07 13:39:34 -07:00
Philip Milne
2a52d26c0b am 7bb66c9c: Hide optical bounds feature for JB. 
* commit '7bb66c9cae7847e3d58f412a73d54ee5d4bcaba0':
  Hide optical bounds feature for JB.
 2012-05-07 13:09:14 -07:00
Robert Greenwalt
198bc11d09 Bring up the ethernet interface when detected 
We don't get link status info if it's down.  If the device has been configured
for ethernet and we see the interface appear, we should make it active.

bug:6444395
Change-Id: Ibc233ab12942b069d7db9c0671936798c5161659
 2012-05-07 12:34:26 -07:00
Philip Milne
7bb66c9cae Hide optical bounds feature for JB. 
Change-Id: I1fe38e9c64515acd550baa930ebc0af4c139bf40
 2012-05-07 11:42:57 -07:00
Amith Yamasani
503b2e5ae1 am 44e3f88f: Merge "Javadoc improvements in SearchView per API review." into jb-dev 
* commit '44e3f88f2f80c7dfbe36c22878d129251ba13165':
  Javadoc improvements in SearchView per API review.
 2012-05-07 11:35:47 -07:00
John Reck
462ee95ff0 am a09b06ef: Merge "Remove heldMotionless disabling native scroll mode" into jb-dev 
* commit 'a09b06effff87f9c073cdc7729884adc41286fe1':
  Remove heldMotionless disabling native scroll mode
 2012-05-07 11:35:44 -07:00
Amith Yamasani
44e3f88f2f Merge "Javadoc improvements in SearchView per API review." into jb-dev 2012-05-07 11:33:16 -07:00
John Reck
a09b06efff Merge "Remove heldMotionless disabling native scroll mode" into jb-dev 2012-05-07 11:33:13 -07:00
Gilles Debunne
8779c022b4 am 0caf421e: Merge "Final fix in SpannableStringBuilder." into jb-dev 
* commit '0caf421e3aacea928f2ce0e99e101a6584127527':
  Final fix in SpannableStringBuilder.
 2012-05-07 11:22:26 -07:00
Gilles Debunne
0caf421e3a Merge "Final fix in SpannableStringBuilder." into jb-dev 2012-05-07 11:17:38 -07:00
Selim Gurun
13d736951d am 5d13e8ef: am ee00b31a: Merge "Use private key context when necessary" into jb-dev 
* commit '5d13e8ef83207e076f3a38cf713706e9975562ec':
  Use private key context when necessary
 2012-05-07 11:01:27 -07:00
Matthew Xie
b12d6bc3a5 When turning off, broadcast STATE_OFF in the last HotOff state 
This is because we do HotOff -> PowerOff -> HotOff for USER_TURN_OFF
Donot do poweroff for perprocess turn off.
Add small time delays for calls into stack to reset dbus timing.
bug 6438556

Change-Id: Iae8bdd24e41824ed4bc34aca96d082f9284f169c
 2012-05-07 11:01:23 -07:00
Selim Gurun
5d13e8ef83 am ee00b31a: Merge "Use private key context when necessary" into jb-dev 
* commit 'ee00b31a54cc186cb53fe30d7834361791baab20':
  Use private key context when necessary
 2012-05-07 10:56:48 -07:00
Selim Gurun
ee00b31a54 Merge "Use private key context when necessary" into jb-dev 2012-05-07 10:54:24 -07:00
Daisuke Miyakawa
d79cad4c8b am 12ec18bd: am cacba459: Merge "Use callable-filter capability when updating call log" into jb-dev 
* commit '12ec18bdb081ea7a030634191b10d8222f474fde':
  Use callable-filter capability when updating call log
 2012-05-07 10:51:38 -07:00
Daisuke Miyakawa
12ec18bdb0 am cacba459: Merge "Use callable-filter capability when updating call log" into jb-dev 
* commit 'cacba4599381e7bebbe7aa9e450e3b5baf5fd425':
  Use callable-filter capability when updating call log
 2012-05-07 10:48:28 -07:00
Daisuke Miyakawa
cacba45993 Merge "Use callable-filter capability when updating call log" into jb-dev 2012-05-07 10:46:26 -07:00
Romain Guy
c0496ffd0e am 9929b59a: am 9d7bbcb8: Merge "Log more frame data when profiling GL apps" into jb-dev 
* commit '9929b59ac5d0c5b0ab400d9d8edf4163ca4c557d':
  Log more frame data when profiling GL apps
 2012-05-07 10:28:44 -07:00
Romain Guy
9929b59ac5 am 9d7bbcb8: Merge "Log more frame data when profiling GL apps" into jb-dev 
* commit '9d7bbcb89a3f14331c55ed2bbdcf768a4aa91cc1':
  Log more frame data when profiling GL apps
 2012-05-07 10:25:43 -07:00
Romain Guy
9d7bbcb89a Merge "Log more frame data when profiling GL apps" into jb-dev 2012-05-07 10:23:14 -07:00
Romain Guy
a21f877434 Log more frame data when profiling GL apps 
Change-Id: Ib7377c22a2258aa6510677d80df34bb7e73dc714
 2012-05-07 10:20:52 -07:00
John Reck
4a05c13c0e am 079623be: am ff0e8cd8: Merge "Drain any pending touch events immediately if possible" into jb-dev 
* commit '079623bedf393f8ae14ba077d147b16024152aef':
  Drain any pending touch events immediately if possible
 2012-05-07 10:11:09 -07:00
John Reck
079623bedf am ff0e8cd8: Merge "Drain any pending touch events immediately if possible" into jb-dev 
* commit 'ff0e8cd8b60aa8372b06edecb2e754b0905c4d31':
  Drain any pending touch events immediately if possible
 2012-05-07 10:07:33 -07:00
John Reck
ff0e8cd8b6 Merge "Drain any pending touch events immediately if possible" into jb-dev 2012-05-07 10:05:00 -07:00
Jason Simmons
7a53510787 am 1903a732: Merge "Avoid calling BluetoothSocket.destroyNative twice" into ics-aah 
* commit '1903a73248af260f4cbb5a9c65664f22c7f51c41':
  Avoid calling BluetoothSocket.destroyNative twice
 2012-05-07 09:14:57 -07:00
Daniel Sandler
d4ff15ac60 am f3fda077: am fafce1f9: Merge "Add number back to legacy notifications." into jb-dev 
* commit 'f3fda0778c3deee7955f2c3caef2ac71cd9b647b':
  Add number back to legacy notifications.
 2012-05-07 06:04:38 -07:00
Daniel Sandler
f3fda0778c am fafce1f9: Merge "Add number back to legacy notifications." into jb-dev 
* commit 'fafce1f9f5b371c76cd7875a58b183093f8b517f':
  Add number back to legacy notifications.
 2012-05-07 06:01:00 -07:00
Daniel Sandler
fafce1f9f5 Merge "Add number back to legacy notifications." into jb-dev 2012-05-07 05:58:55 -07:00
satok
b1ef70457c am 0631373d: am c33208fe: Spell check the first word of the sentence 
* commit '0631373d4e1c5dd0c2cc648f41c7a08b4a07f54e':
  Spell check the first word of the sentence
 2012-05-07 04:55:05 -07:00
satok
0631373d4e am c33208fe: Spell check the first word of the sentence 
* commit 'c33208fe72662fd89b75e996dbd495237a0021d4':
  Spell check the first word of the sentence
 2012-05-07 04:50:09 -07:00
satok
c33208fe72 Spell check the first word of the sentence 
Change-Id: I7803d92de8f4ea399cef5c2d1ddf5396d59ef2cf
 2012-05-07 20:19:18 +09:00
satok
cb9309d04c am 50956b2d: Merge "DO NOT MERGE. Backport If36b8a69e7fa22e837c99d Fix the issue that the spell check doesn\'t start when the user changes the cursor position by touch" into jb-dev 
* commit '50956b2dc473126fd04341388df9f244fd22f77e':
  DO NOT MERGE. Backport If36b8a69e7fa22e837c99d Fix the issue that the spell check doesn't start when the user changes the cursor position by touch
 2012-05-07 02:35:26 -07:00
satok
8589474d26 DO NOT MERGE. Backport If36b8a69e7fa22e837c99d Fix the issue that the spell check doesn't start when the user changes the cursor position by touch 
Change-Id: I1535eae23efc42660b9d1e6dbfba6c800b0302b2
 2012-05-07 18:30:17 +09:00
satok
2bc427e436 Fix the issue that the spell check doesn't start when the user changes the cursor position by touch 
Change-Id: If36b8a69e7fa22e837c99d58c66321cb649b3c2d
 2012-05-07 18:19:04 +09:00
Romain Guy
b25ce808d5 am d5fcb10c: am 8fb62329: Merge "Increase the Message pool size" into jb-dev 
* commit 'd5fcb10c0102baf8835ddfb2cd9c85c64dc9fd45':
  Increase the Message pool size
 2012-05-06 20:16:20 -07:00
Romain Guy
d5fcb10c01 am 8fb62329: Merge "Increase the Message pool size" into jb-dev 
* commit '8fb62329fc6691002c5bb41c67c0ccc977d72adf':
  Increase the Message pool size
 2012-05-06 20:14:00 -07:00
Romain Guy
8fb62329fc Merge "Increase the Message pool size" into jb-dev 2012-05-06 20:11:30 -07:00
Daisuke Miyakawa
e23362a54d Use callable-filter capability when updating call log 
CallerInfo#phoneNumber has a formatted phone number even when contacts
database itself has an unformatted one, so just using Phone.CONTENT_URI
may not be enough to find the relevant contact.

Bug: 6291905
Change-Id: Ie6e40529eb1f9cf98de861601669dbccb718541c
 2012-05-06 19:02:51 -07:00
Dianne Hackborn
c77218e6b0 am 25fc66b8: am 7bfa1457: Merge "Finish up issue #6249094: Display permissions based on relevance to private data" into jb-dev 
* commit '25fc66b898a35796af65ec7e3eb9b1584588e063':
  Finish up issue #6249094: Display permissions based on relevance to private data
 2012-05-06 17:55:04 -07:00
Dianne Hackborn
25fc66b898 am 7bfa1457: Merge "Finish up issue #6249094: Display permissions based on relevance to private data" into jb-dev 
* commit '7bfa14570e3e43ae8595400353853acdd7cea37c':
  Finish up issue #6249094: Display permissions based on relevance to private data
 2012-05-06 17:52:23 -07:00
Dianne Hackborn
7bfa14570e Merge "Finish up issue #6249094: Display permissions based on relevance to private data" into jb-dev 2012-05-06 17:49:53 -07:00