Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,360 Commits 3 Branches 0 Tags
2cceaaae3480254bc72708ce01ca3870e2dbe863
Commit Graph

9501 Commits

Author SHA1 Message Date
Dianne Hackborn
2cceaaae34 Fix back popping the back stack too much. 
Change-Id: I18a3d0f3546e51411771d49a68a97108e00b1cea
 2010-08-11 22:32:15 -07:00
Kenny Root
bf0cb26a1c am f5ee5358: am ac9717ab: Merge "Move OBB file reading to DefaultContainerService" into gingerbread 
Merge commit 'f5ee5358c187107b2e5a1e1fbcb5a648d793c798'

* commit 'f5ee5358c187107b2e5a1e1fbcb5a648d793c798':
  Move OBB file reading to DefaultContainerService
 2010-08-11 14:15:10 -07:00
Kenny Root
f5ee5358c1 am ac9717ab: Merge "Move OBB file reading to DefaultContainerService" into gingerbread 
Merge commit 'ac9717ab73afe0123b6dbb63c4dd2fc88143e53e' into gingerbread-plus-aosp

* commit 'ac9717ab73afe0123b6dbb63c4dd2fc88143e53e':
  Move OBB file reading to DefaultContainerService
 2010-08-11 14:10:18 -07:00
Kenny Root
a02b8b05dd Move OBB file reading to DefaultContainerService 
The system_server shouldn't touch files on the SD card. This change
moves the things that touch the SD card out to the
DefaultContainerService so that it will get killed if the SD card goes
away instead of the system_server.

Change-Id: I0aefa085be4b194768527195532ee6dddc801cfc
 2010-08-11 11:20:53 -07:00
Irfan Sheriff
9f3c5da382 Merge "Split WifiStateMachine from WifiStateTracker" 2010-08-11 07:53:51 -07:00
Patrick Scott
4668e77265 am dc1f0858: am 9902196f: Fix npe in getCacheTotalSize. 
Merge commit 'dc1f08586eadc3a3dbbdf22b520ba1065b2032f8'

* commit 'dc1f08586eadc3a3dbbdf22b520ba1065b2032f8':
  Fix npe in getCacheTotalSize.
 2010-08-11 07:21:25 -07:00
Patrick Scott
dc1f08586e am 9902196f: Fix npe in getCacheTotalSize. 
Merge commit '9902196f9885d369e37cf44084e3f04513511ab0' into gingerbread-plus-aosp

* commit '9902196f9885d369e37cf44084e3f04513511ab0':
  Fix npe in getCacheTotalSize.
 2010-08-11 07:18:27 -07:00
Patrick Scott
9902196f98 Fix npe in getCacheTotalSize. 
Bug: 2882277
Change-Id: I9319a48e0ed75561d3d04691fb288f69d11edc84
 2010-08-11 09:48:43 -04:00
Dianne Hackborn
7b6d0d99b6 am 679ac09a: am a5ae50cd: Merge "More native work." into gingerbread 
Merge commit '679ac09a5c22175354f3a04b28456b323839530e'

* commit '679ac09a5c22175354f3a04b28456b323839530e':
  More native work.
 2010-08-11 00:50:56 -07:00
Dianne Hackborn
679ac09a5c am a5ae50cd: Merge "More native work." into gingerbread 
Merge commit 'a5ae50cd838b5725c63ed485292aae4edd1a98cb' into gingerbread-plus-aosp

* commit 'a5ae50cd838b5725c63ed485292aae4edd1a98cb':
  More native work.
 2010-08-11 00:47:51 -07:00
Dianne Hackborn
08d5b8fad8 More native work. 
Implement save/restore of state, and add native APIs for
configuration information.

Change-Id: I2a3ddc2ba605db58d7c8b2b31b9215fb323f90b5
 2010-08-11 00:29:59 -07:00
Konstantin Lopyrev
12fb5a3573 am 8279c754: am 91a7f5fe: Making sure that the prefix is handled properly. 
Merge commit '8279c754d176d5c2aa23f6f7ad16fcea03278788'

* commit '8279c754d176d5c2aa23f6f7ad16fcea03278788':
  Making sure that the prefix is handled properly.
 2010-08-10 21:53:49 -07:00
Adam Powell
f98d3e3047 am e8fa85d7: am 224ab9a5: Merge "Fix public bug http://code.google.com/p/android/issues/detail?id=10067" into gingerbread 
Merge commit 'e8fa85d7a1a75d6894a75b1c25abf99bbff50085'

* commit 'e8fa85d7a1a75d6894a75b1c25abf99bbff50085':
  Fix public bug http://code.google.com/p/android/issues/detail?id=10067
 2010-08-10 21:53:40 -07:00
Konstantin Lopyrev
ecb1d5ded9 resolved conflicts for merge of f00ee0f7 to master 
Change-Id: I13b968bde37fad8fffdaa9bb94a0f1da9b2e6e0c
 2010-08-10 21:47:34 -07:00
Konstantin Lopyrev
8279c754d1 am 91a7f5fe: Making sure that the prefix is handled properly. 
Merge commit '91a7f5fef8a9fc496acef23f513cb48139e8dff5' into gingerbread-plus-aosp

* commit '91a7f5fef8a9fc496acef23f513cb48139e8dff5':
  Making sure that the prefix is handled properly.
 2010-08-10 19:02:51 -07:00
Konstantin Lopyrev
91a7f5fef8 Making sure that the prefix is handled properly. 
Change-Id: Ic50327b1ed4d6b54753b5b3887508a53cd7a3497
 2010-08-10 18:54:54 -07:00
Adam Powell
e8fa85d7a1 am 224ab9a5: Merge "Fix public bug http://code.google.com/p/android/issues/detail?id=10067" into gingerbread 
Merge commit '224ab9a5c6f7ae70fe55bf3d5604cbdf883baee7' into gingerbread-plus-aosp

* commit '224ab9a5c6f7ae70fe55bf3d5604cbdf883baee7':
  Fix public bug http://code.google.com/p/android/issues/detail?id=10067
 2010-08-10 17:54:58 -07:00
Konstantin Lopyrev
f00ee0f762 am f39d5987: Merge "Categorizing exported view properties." into gingerbread 
Merge commit 'f39d5987b977fdff8c34a2ddabaec31d1e909db3' into gingerbread-plus-aosp

* commit 'f39d5987b977fdff8c34a2ddabaec31d1e909db3':
  Categorizing exported view properties.
 2010-08-10 17:52:32 -07:00
Adam Powell
224ab9a5c6 Merge "Fix public bug http://code.google.com/p/android/issues/detail?id=10067" into gingerbread 2010-08-10 17:52:15 -07:00
Adam Powell
9bccdb7d5c Fix public bug http://code.google.com/p/android/issues/detail?id=10067 
Change-Id: I7b7a9a32e82fc7541beabe286b20b01f39406cc8
 2010-08-10 17:50:11 -07:00
Konstantin Lopyrev
f39d5987b9 Merge "Categorizing exported view properties." into gingerbread 2010-08-10 17:48:27 -07:00
Konstantin Lopyrev
bea95162ca Categorizing exported view properties. 
Change-Id: I79c42019836973d80662c21d195d088ae01537a0
 2010-08-10 17:45:03 -07:00
Adam Powell
42c0fe8652 Fix bug 2908851 - ActionBar does not get initialized if 
set/addContentView is never called.

Fix bugs around lazy initialization of ActionBar in Activities.

Change-Id: I39a4216a7f6b0051adc4a669b8f921f94148e1db
 2010-08-10 17:08:30 -07:00
Adam Powell
4c9073a9a4 Merge "Fix bug 2908823" 2010-08-10 16:58:37 -07:00
Adam Cohen
eeca7df892 Merge "Fixing StackView crash associated with DataSetObserver" 2010-08-10 16:55:15 -07:00
Adam Cohen
8322834a25 Fixing StackView crash associated with DataSetObserver 
Change-Id: Idbc8ed09ee8a58757b7383d6331a4c0357a6fb1f
 2010-08-10 16:48:33 -07:00
Jeff Brown
ea48ff4ba4 am 95105f3c: am c3fc2d03: Fix safe mode and KeyEvent.getMaxKeyCode(). 
Merge commit '95105f3c25110f28b236cfa71e9ad74533eef854'

* commit '95105f3c25110f28b236cfa71e9ad74533eef854':
  Fix safe mode and KeyEvent.getMaxKeyCode().
 2010-08-10 16:39:10 -07:00
Jeff Brown
fb8e05b154 am d3cf0544: am d98d0fc6: Merge "Optimize VelocityTracker to run in linear time." into gingerbread 
Merge commit 'd3cf0544cc7eec8ace3dc3b7fc17b7dac69e0aab'

* commit 'd3cf0544cc7eec8ace3dc3b7fc17b7dac69e0aab':
  Optimize VelocityTracker to run in linear time.
 2010-08-10 16:38:58 -07:00
Jeff Brown
95105f3c25 am c3fc2d03: Fix safe mode and KeyEvent.getMaxKeyCode(). 
Merge commit 'c3fc2d03d58a258c53c9265a70143d4af076b764' into gingerbread-plus-aosp

* commit 'c3fc2d03d58a258c53c9265a70143d4af076b764':
  Fix safe mode and KeyEvent.getMaxKeyCode().
 2010-08-10 16:33:47 -07:00
Jeff Brown
d3cf0544cc am d98d0fc6: Merge "Optimize VelocityTracker to run in linear time." into gingerbread 
Merge commit 'd98d0fc6e9172d3f130794e499462c911920adf6' into gingerbread-plus-aosp

* commit 'd98d0fc6e9172d3f130794e499462c911920adf6':
  Optimize VelocityTracker to run in linear time.
 2010-08-10 16:31:04 -07:00
Jeff Brown
c3fc2d03d5 Fix safe mode and KeyEvent.getMaxKeyCode(). 
Bug: 2901731
Change-Id: I78617c1b9dee3790fc590e5af4b5083368873184
 2010-08-10 16:28:03 -07:00
Jeff Brown
d98d0fc6e9 Merge "Optimize VelocityTracker to run in linear time." into gingerbread 2010-08-10 16:26:56 -07:00
Adam Powell
9b4c804b98 Fix bug 2908823 
Change-Id: Ia20d47ff4e2a09cc0e1ac47cd02a5f152f57073c
 2010-08-10 15:36:44 -07:00
Adam Powell
7c312bbd53 Merge "Fix bug 2888333" 2010-08-10 15:35:10 -07:00
Adam Powell
749b0eb2c9 Fix bug 2888333 
Change-Id: I2e9053e9c68cef447f47d181bfe0ddacc5f7167a
 2010-08-10 15:31:02 -07:00
Irfan Sheriff
0d25534fed Split WifiStateMachine from WifiStateTracker 
Notifications handled in WifiService. WifiStateTracker tracks
state for connectivity service

Change-Id: Idb0cf494898d28712af0f95f9e60c5417cd4a053
 2010-08-10 15:18:25 -07:00
Adam Cohen
8a06cf708b Merge "Preliminary implementation of StackView, which extends AdapterViewAnimator." 2010-08-10 15:10:59 -07:00
Adam Cohen
44729e3d1c Preliminary implementation of StackView, which extends AdapterViewAnimator. 
Change-Id: I3e9d1203fc8848835f28d6bc1c9dc0a3fcf7f242
 2010-08-10 15:09:31 -07:00
Romain Guy
7a70374606 Merge "Fast text selection drawing." 2010-08-10 14:59:18 -07:00
Romain Guy
a48a1a87ba Fast text selection drawing. 
Change-Id: I93fb1312b47bc05345defa9b6cfe47c0658bb329
 2010-08-10 14:59:15 -07:00
Jeff Hamilton
b721b47811 Add a constructor from CursorAdapter to ResourceCursorAdapter. 
Change-Id: I423bab1907c24a718a8575d5cbe0cee0e5e4968e
 2010-08-10 16:17:09 -05:00
Romain Guy
61c8c9c5b2 Fix tons of bugs and add new text rendering support. 
Change-Id: I326c66b10784006f6df2f12d38e120cef94cd0d7
 2010-08-10 12:22:01 -07:00
Chet Haase
fd2b002bcf Add 3D rotation to View 
Change-Id: I4aa2542eb821e82d44e13d69b0938de13ffd4f0d
 2010-08-10 10:36:21 -07:00
Jeff Hamilton
f0cfe3438a Add a few helpful APIs. 
Change-Id: Ie57aa71eb77a1e0fb058f4eb6f40d4144a6dfce7
 2010-08-10 10:13:18 -05:00
Mike Lockwood
ff68468f1b Merge changes I4f117090,Ifd449c4e 
* changes:
  MTP: Push queries for supported formats and properties up to Java.
  MTP: turn off verbose logging
 2010-08-10 06:13:35 -07:00
Mike Lockwood
4b322ce4fb MTP: Push queries for supported formats and properties up to Java. 
Change-Id: I4f117090340e3916afda3d194521a6092a672ddc
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-08-10 09:00:30 -04:00
Steve Block
68dede3d66 Hook up mock for testing DeviceOrientation in DRT 
Change-Id: I99fbe328807428aa0d94893545bad0697ccb71d7
 2010-08-10 12:00:35 +01:00
Adam Powell
dec9dfd0f9 Support ActionBar in Dialogs 
Dialogs planning on using an ActionBar must have an appropriate
theme. (Later on this will likely be default.)

Change-Id: I7fbf5f76eed3d10765fddeaf211e4decb4e89f87
 2010-08-09 22:18:24 -07:00
Jaikumar Ganesh
feb1a4e5e0 am 4a671a74: am 745d1e90: Merge "Update javadoc for the API and change return of getBondedDevices()." into gingerbread 
Merge commit '4a671a745202cb15cc668d46400731a03b068558'

* commit '4a671a745202cb15cc668d46400731a03b068558':
  Update javadoc for the API and change return of getBondedDevices().
 2010-08-09 20:00:53 -07:00
Konstantin Lopyrev
6f4169cb28 am 75493be9: am 63cca691: Merge "Make sure profiling is done only for views that are actually measured, laid out and drawn." into gingerbread 
Merge commit '75493be9c0b4dd24fc5cddce6ee993ce5f0b2887'

* commit '75493be9c0b4dd24fc5cddce6ee993ce5f0b2887':
  Make sure profiling is done only for views that are actually measured, laid out and drawn.
 2010-08-09 20:00:44 -07:00