Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,468 Commits 3 Branches 0 Tags
ebe083efadcc3648fd75c64604ecc40c9a7cefb6
Commit Graph

10605 Commits

Author SHA1 Message Date
Chet Haase
673e42fafd Fix for end events from Sequencer objects 
Change-Id: I8947d8b016b880f9f54f2bf6ab22b4e188cdb29a
 2010-08-25 17:32:27 -07:00
Mathias Agopian
dcde3a8abe am a62dfe9e: am 94e939e8: Merge "Improve Sensors documentation a bit" into gingerbread 
Merge commit 'a62dfe9e49ea785c4be2173479e4472767771ce5'

* commit 'a62dfe9e49ea785c4be2173479e4472767771ce5':
  Improve Sensors documentation a bit
 2010-08-25 16:40:40 -07:00
Brad Fitzpatrick
4cbc4f1067 am 49209cbc: am d0e6598b: Merge "Start of SharedPreferences.startCommit()" into gingerbread 
Merge commit '49209cbcef37c4b20c9d0649ba284a51144b3930'

* commit '49209cbcef37c4b20c9d0649ba284a51144b3930':
  Start of SharedPreferences$Editor.startCommit()
 2010-08-25 16:40:06 -07:00
Mathias Agopian
a62dfe9e49 am 94e939e8: Merge "Improve Sensors documentation a bit" into gingerbread 
Merge commit '94e939e8794727f4f74839de23c5ac5f0d9f84b3' into gingerbread-plus-aosp

* commit '94e939e8794727f4f74839de23c5ac5f0d9f84b3':
  Improve Sensors documentation a bit
 2010-08-25 16:07:25 -07:00
Mathias Agopian
94e939e879 Merge "Improve Sensors documentation a bit" into gingerbread 2010-08-25 16:03:58 -07:00
Mike Lockwood
48114f72fd Merge "MTP: work in progress on expanded property support" 2010-08-25 15:44:03 -07:00
Mike Lockwood
828d19dd96 MTP: work in progress on expanded property support 
GetObjectPropValue and SetObjectPropValue are disabled until I figure out
why Windows doesn't like what I have done.

Change-Id: I74e945ef3ea031f6d46f4ebaa8df815da0a5c3ed
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-08-25 18:42:22 -04:00
Brad Fitzpatrick
49209cbcef am d0e6598b: Merge "Start of SharedPreferences.startCommit()" into gingerbread 
Merge commit 'd0e6598b4a32f3000247341414449a3aa4d9f7f4' into gingerbread-plus-aosp

* commit 'd0e6598b4a32f3000247341414449a3aa4d9f7f4':
  Start of SharedPreferences$Editor.startCommit()
 2010-08-25 15:19:57 -07:00
Brad Fitzpatrick
d0e6598b4a Merge "Start of SharedPreferences$Editor.startCommit()" into gingerbread 2010-08-25 15:15:30 -07:00
Romain Guy
dc9e486e0a Merge "Only destroy the GL Canvas when necessary." 2010-08-25 14:46:24 -07:00
Romain Guy
4caa4ed120 Only destroy the GL Canvas when necessary. 
Change-Id: I6caf4873b02dc4a6d7c8c91925d2447b3b0e0593
 2010-08-25 14:46:24 -07:00
Mathias Agopian
43c87e44fc Improve Sensors documentation a bit 
Change-Id: I6f4f9ebfaf1e7f461a795f717b9913e3a021e9d4
 2010-08-25 14:35:54 -07:00
Cary Clark
7462fc738f Merge "simplify cursor ring draw state; fix null check" 2010-08-25 14:03:36 -07:00
Cary Clark
1ef41605bb am d64f4a98: DO NOT MERGE fix null check 
Merge commit 'd64f4a983df4fd11795e04896d8c48852f6b1777' into gingerbread-plus-aosp

* commit 'd64f4a983df4fd11795e04896d8c48852f6b1777':
  DO NOT MERGE fix null check
 2010-08-25 13:53:05 -07:00
Cary Clark
d64f4a983d DO NOT MERGE fix null check 
Check to see if the WebChromeClient is null.

Checked into master in change 63008

Change-Id: If2ef1889ce3633c0b35c078a46bde84982dd1eb3
http://b/2945171
 2010-08-25 16:22:15 -04:00
Adam Cohen
9b073948cf Cleanup and bug fixes in StackView 
-> pushed functionality from AdapterViewAnimator to StackView
-> only modifying clipping flags as far up the view
   hierarchy as needed
-> still need framework level solution for drawing outside bounds

ViewGroup touch dispatch temp fix
-> Touch event was being modified and not reset in some
   code paths.

Change-Id: I8135b62e2d73f239b9df407b0fa93bc434796989
 2010-08-25 13:16:14 -07:00
Brad Fitzpatrick
edf32d0131 Start of SharedPreferences$Editor.startCommit() 
No implementation yet, just the interface.

Change-Id: Idf9934b445da1fb72b79f0192218b47c0a7f5a34
 2010-08-25 13:13:36 -07:00
Cary Clark
e60cb7f914 simplify cursor ring draw state; fix null check 
Rename jni call to note that, when pressing the dpad, the
cursor ring is to shown for a short time. The old name suggested
that this was tracking whether the link was followed.

Fix an unrelated change (from gingerbread, automated
merge unlikely to succeed) to check for a null
WebChromeClient.

Requires a companion change in external/webkit

http://b/2135321 (rename jni call)
http://b/2945171 (null check)

Change-Id: I9d4a92dbba1f92da8dc8cde755a2066de59514f9
 2010-08-25 16:12:03 -04:00
Steve Block
976190d21a Merge "In ActionBarImpl, only use mActionView after we've checked that it's non-null" 2010-08-25 10:30:20 -07:00
Gilles Debunne
7e2fb17391 Merge "Fixed typo in View id documentation" 2010-08-25 10:28:50 -07:00
Jeff Hamilton
1a2b30cd73 Merge "Fix the documentation of ContentValues." 2010-08-25 08:23:24 -07:00
Jeff Hamilton
f924a513da Fix the documentation of ContentValues. 
Bug: 2172562
Change-Id: If7752b937dabc7238723787bb0aa5c348406e28b
 2010-08-25 10:19:36 -05:00
Chet Haase
71fcc470eb Merge "Change animator xml importing to use new inflater class" 2010-08-25 08:17:26 -07:00
Steve Block
08f194bc01 In ActionBarImpl, only use mActionView after we've checked that it's non-null 
See https://android-git.corp.google.com/g/#change,61251

Change-Id: Ie11f446c10c096916642a34558a350512495234e
 2010-08-25 11:56:55 +01:00
Chih-Chung Chang
9439241d35 resolved conflicts for merge of 20afae51 to master 
Change-Id: Ief637e412e4d716526de68c7761bdb8cbf436333
 2010-08-25 15:54:51 +08:00
Chih-Chung Chang
20afae5150 am 231a0005: Merge "Avoid allocating buffer every time getThumbnail is called." into gingerbread 
Merge commit '231a0005654d23284ab58a2d9ea892b995988c34' into gingerbread-plus-aosp

* commit '231a0005654d23284ab58a2d9ea892b995988c34':
  Avoid allocating buffer every time getThumbnail is called.
 2010-08-25 00:09:22 -07:00
Chih-Chung Chang
2ca36196ea Avoid allocating buffer every time getThumbnail is called. 
Change-Id: Ia088539463e26a1242064ed7e79b0b2c12d64ced
 2010-08-25 14:52:30 +08:00
Gilles Debunne
0243caff24 Fixed typo in View id documentation 
Change-Id: I2df4f0ff9dc0b229349c8accbd6ef962f1d345bb
 2010-08-24 23:08:44 -07:00
Chet Haase
d51d368f2d Change animator xml importing to use new inflater class 
Change-Id: I97225ee9868f4dcce5e4c1ba55e16414eb6c0464
 2010-08-24 19:37:19 -07:00
Dianne Hackborn
cf44040d93 resolved conflicts for merge of d3cd2596 to master 
Change-Id: I61a37a3be8b8115b225da272903ca917c33ae4a6
 2010-08-24 17:47:42 -07:00
Romain Guy
a84e02ce3c Merge "Use only one GL context per process, share chaches." 2010-08-24 17:20:20 -07:00
Romain Guy
fb8b763f76 Use only one GL context per process, share chaches. 
Change-Id: Ieabaa25338d2f4b8d4fd90e7401ad6e7452eae11
 2010-08-24 17:18:14 -07:00
Brad Fitzpatrick
7f9106fb1f am 6cf1a8bf: am b1bbe99a: Merge "Some StrictMode API changes." into gingerbread 
Merge commit '6cf1a8bfb04aead9cee5f59df4529a79c0a92dca'

* commit '6cf1a8bfb04aead9cee5f59df4529a79c0a92dca':
  Some StrictMode API changes.
 2010-08-24 16:58:27 -07:00
Gilles Debunne
925f2f9096 resolved conflicts for merge of 9765b2a0 to master 
Change-Id: Ic37a443fff0425e9d7c8395f71665d56c38d7e53
 2010-08-24 15:14:12 -07:00
Dianne Hackborn
d3cd259675 am 4af0cfad: Merge "Verify that onPause() calls its superclass." into gingerbread 
Merge commit '4af0cfad5305c8827c6235ca86e7db63b534ad68' into gingerbread-plus-aosp

* commit '4af0cfad5305c8827c6235ca86e7db63b534ad68':
  Verify that onPause() calls its superclass.
 2010-08-24 14:47:46 -07:00
Dianne Hackborn
4af0cfad53 Merge "Verify that onPause() calls its superclass." into gingerbread 2010-08-24 14:44:42 -07:00
Wink Saville
c28227d443 Merge "Allow reliable detection of a message that is in use." 2010-08-24 14:33:29 -07:00
Adam Powell
a3715c151b Merge "Disable FEATURE_ACTION_BAR on windows with incompatible feature sets." 2010-08-24 14:29:48 -07:00
Gilles Debunne
b32d0f23a8 am e2978c8d: Merge "Fix for an NPE in TextView." into gingerbread 
Merge commit 'e2978c8dcafdf20c2b49999ec423cb5f76d4a583' into gingerbread-plus-aosp

* commit 'e2978c8dcafdf20c2b49999ec423cb5f76d4a583':
  Fix for an NPE in TextView.
 2010-08-24 14:25:57 -07:00
Gilles Debunne
e2978c8dca Merge "Fix for an NPE in TextView." into gingerbread 2010-08-24 14:23:37 -07:00
Gilles Debunne
4e765e002f Fix for an NPE in TextView. 
Change-Id: I0fca8f839cd444d9b70174078063efff5be499a3
 2010-08-24 14:21:13 -07:00
Brad Fitzpatrick
6cf1a8bfb0 am b1bbe99a: Merge "Some StrictMode API changes." into gingerbread 
Merge commit 'b1bbe99aaa01f321ae94f0d5ba4505e528664cc7' into gingerbread-plus-aosp

* commit 'b1bbe99aaa01f321ae94f0d5ba4505e528664cc7':
  Some StrictMode API changes.
 2010-08-24 14:18:26 -07:00
Adam Powell
f4a6ec4e93 Disable FEATURE_ACTION_BAR on windows with incompatible feature sets. 
Change-Id: I70c860c72eb9e1f1f123764202334ab714f4f830
 2010-08-24 14:18:10 -07:00
Brad Fitzpatrick
b1bbe99aaa Merge "Some StrictMode API changes." into gingerbread 2010-08-24 14:15:30 -07:00
Daisuke Miyakawa
ff547a5949 am 88bff62c: Merge "Fix vCard so that it looks at IM correctly." into gingerbread 
Merge commit '88bff62c35e570a0c86eb55ded79d4600730226b' into gingerbread-plus-aosp

* commit '88bff62c35e570a0c86eb55ded79d4600730226b':
  Fix vCard so that it looks at IM correctly.
 2010-08-24 13:39:42 -07:00
Daisuke Miyakawa
88bff62c35 Merge "Fix vCard so that it looks at IM correctly." into gingerbread 2010-08-24 13:37:02 -07:00
Daisuke Miyakawa
4a2a2eb4cb Fix vCard so that it looks at IM correctly. 
Change-Id: I3afc01e2e5f55c254606379f353b030ea297ee36
 2010-08-24 13:33:25 -07:00
Chet Haase
49afa5bc10 Add facilities for layout transitions 
Change-Id: I5c73ce6c6ba3bc9e3b57fcfbbcab37d511db6132
 2010-08-24 13:09:20 -07:00
Brad Fitzpatrick
5107ef6825 Merge "resolved conflicts for merge of 0b7b9807 to master" 2010-08-24 12:55:43 -07:00
Brad Fitzpatrick
96fd5af681 resolved conflicts for merge of 0b7b9807 to master 
Change-Id: If60aeeb47cd06dcc76b88506688c7e4b58cf2208
 2010-08-24 12:40:13 -07:00