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

10623 Commits

Author SHA1 Message Date
Dianne Hackborn
5fcfa52d60 am efd05ea6: am 0a7f5fc4: Merge "Fix issue #2951784: Launcher crashes on startup" into gingerbread 
Merge commit 'efd05ea69a53d73d2dacacd74f6a420cac8ef97b'

* commit 'efd05ea69a53d73d2dacacd74f6a420cac8ef97b':
  Fix issue #2951784: Launcher crashes on startup
 2010-08-26 13:15:21 -07:00
Shimeng (Simon) Wang
b79c271857 Merge "Restore zoom level when browser is restored." 2010-08-26 11:05:48 -07:00
Shimeng (Simon) Wang
4ae1f6f2ae Restore zoom level when browser is restored. 
issue: 2950667
Change-Id: If335813eed6311d3d01354147bd62f90ffbdacfb
 2010-08-26 10:58:38 -07:00
Dianne Hackborn
efd05ea69a am 0a7f5fc4: Merge "Fix issue #2951784: Launcher crashes on startup" into gingerbread 
Merge commit '0a7f5fc474182c58b478d8f9017209dcf8d0ca0b' into gingerbread-plus-aosp

* commit '0a7f5fc474182c58b478d8f9017209dcf8d0ca0b':
  Fix issue #2951784: Launcher crashes on startup
 2010-08-26 10:50:11 -07:00
Dianne Hackborn
0a7f5fc474 Merge "Fix issue #2951784: Launcher crashes on startup" into gingerbread 2010-08-26 10:47:48 -07:00
Dianne Hackborn
9dae48e399 Fix issue #2951784: Launcher crashes on startup 
Change-Id: I98aedacce9a7d6b8bc168f39ea5489b40dc0ec8d
 2010-08-26 10:20:01 -07:00
Robert Greenwalt
4ea54f442e Merge "resolved conflicts for merge of b998f311 to gingerbread-plus-aosp" into gingerbread-plus-aosp 2010-08-26 08:29:10 -07:00
Dianne Hackborn
c8f8497b9c resolved conflicts for merge of 66d633d2 to master 
Change-Id: I6c38d7c4d127954dfca17082215c587a3cd4a586
 2010-08-25 23:14:44 -07:00
Dianne Hackborn
66d633d208 am 3003a017: Merge "Don\'t retain global ref to last inflated context." into gingerbread 
Merge commit '3003a017d312a55e3804d6cf4a80044b1f1d7993' into gingerbread-plus-aosp

* commit '3003a017d312a55e3804d6cf4a80044b1f1d7993':
  Don't retain global ref to last inflated context.
 2010-08-25 22:02:18 -07:00
Dianne Hackborn
3003a017d3 Merge "Don't retain global ref to last inflated context." into gingerbread 2010-08-25 22:00:28 -07:00
Dianne Hackborn
7e269644fc Don't retain global ref to last inflated context. 
Also rework URI permission granting to support upcoming
clipboard use.

Change-Id: I9842920350955531c5a511c2ecc5215e8c783343
 2010-08-25 21:50:54 -07:00
Robert Greenwalt
b21b62327c resolved conflicts for merge of b998f311 to gingerbread-plus-aosp 
Change-Id: I7ceb0b624e78d85542d1c36bfabeb5dc31961505
 2010-08-25 17:48:47 -07:00
Konstantin Lopyrev
261d509270 am 5a54e980: am 6947cc59: Merge "Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared." into gingerbread 
Merge commit '5a54e98022d640900f94102c077d8dff447f3c76'

* commit '5a54e98022d640900f94102c077d8dff447f3c76':
  Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared.
 2010-08-25 17:41:02 -07:00
Konstantin Lopyrev
5a54e98022 am 6947cc59: Merge "Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared." into gingerbread 
Merge commit '6947cc594276df899a0c4662224455f40846bd0a' into gingerbread-plus-aosp

* commit '6947cc594276df899a0c4662224455f40846bd0a':
  Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared.
 2010-08-25 17:37:45 -07:00
Konstantin Lopyrev
6947cc5942 Merge "Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared." into gingerbread 2010-08-25 17:35:50 -07:00
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
Konstantin Lopyrev
43b9b48f79 Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared. 
Change-Id: Iaff6bd501a2bb3faa7a394fff740479f6a95e899
 2010-08-25 13:38:27 -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