Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,819 Commits 3 Branches 0 Tags
df030d2c160ff42927c58ff54c51049c69a48312
Commit Graph

756 Commits

Author SHA1 Message Date
Chris Tate
5bac1cc0b8 am 9f6b16a2: am 5d46ce24: Merge "Enhanced VelocityTracker for > 5 pointers and fixed bugs." into gingerbread 
Merge commit '9f6b16a29b62f29496bc652cfec7d6fe9f08c7f4'

* commit '9f6b16a29b62f29496bc652cfec7d6fe9f08c7f4':
  Enhanced VelocityTracker for > 5 pointers and fixed bugs.
 2010-08-04 11:12:32 -07:00
Adam Powell
4be0d52125 Added android.widget.PopupMenu 
Change-Id: Id507cf93ebd0484f141a0a44266b883c01aa10db
 2010-08-04 11:06:22 -07:00
Adam Powell
1f9c7afc5a Add support for action buttons without an icon. 
Change-Id: I026bb7463e7a73419dbaf79950d579ba05d04ea8
 2010-08-03 15:01:31 -07:00
Chris Tate
9f6b16a29b am 5d46ce24: Merge "Enhanced VelocityTracker for > 5 pointers and fixed bugs." into gingerbread 
Merge commit '5d46ce24cc46dc57d31f809302af916999114ced' into gingerbread-plus-aosp

* commit '5d46ce24cc46dc57d31f809302af916999114ced':
  Enhanced VelocityTracker for > 5 pointers and fixed bugs.
 2010-08-03 12:25:29 -07:00
Jeff Sharkey
a8a72c38fe Populate accessibility field on ActionBar items. 
When building an ActionMenuItemView, set the content description based
on the item title.  Fixes http://b/2885106

Change-Id: I101bbc6db7080ce08eed1bbb401c45329da2ab53
 2010-08-02 16:30:20 -07:00
Adam Powell
9168f0b170 Add ActionMode#getMenuInflater() for easier menu inflation in 
ActionMode.Callback implementations

Change-Id: If9e7ab0d65598bab537add6c6a452a55c093064f
 2010-08-02 16:02:24 -07:00
Adam Powell
8350f7dbc3 Added CHOICE_MODE_MULTIPLE_MODAL to ListView. 
Based on ActionModes, CHOICE_MODE_MULTIPLE_MODAL supports the new
Honeycomb-style selection mode.

Change-Id: I293ea22487db8e081c95e5236f1e053f7dd4ada6
 2010-08-02 11:28:31 -07:00
Jeff Brown
9e2ad36be8 Enhanced VelocityTracker for > 5 pointers and fixed bugs. 
Improved PointerLocation tool to use VelocityTracker more efficiently
and correctly when multiple pointers are down.

Fixed a bug in TouchInputMapper where it was not correctly copying
the id to index map in the last touch data.  This could cause strange
behavior on secondary pointer up events.

Also added finished callback pooling in InputQueue.

Change-Id: Ia85e52ac2fb7350960ea1d7edfbe81a1b3e8267b
 2010-07-30 20:08:29 -07:00
Romain Guy
15d6184be7 am ff74e22b: am ce3ac5f0: Merge "Corrected buffer overflow when parsing /proc/wakelocks" 
Merge commit 'ff74e22b59f8157580953fcd69e3c32aa8f68eb2'

* commit 'ff74e22b59f8157580953fcd69e3c32aa8f68eb2':
  Corrected buffer overflow when parsing /proc/wakelocks
 2010-07-29 14:36:29 -07:00
Romain Guy
ff74e22b59 am ce3ac5f0: Merge "Corrected buffer overflow when parsing /proc/wakelocks" 
Merge commit 'ce3ac5f02970fcab91e16ecb573931d209b1985c' into gingerbread-plus-aosp

* commit 'ce3ac5f02970fcab91e16ecb573931d209b1985c':
  Corrected buffer overflow when parsing /proc/wakelocks
 2010-07-29 14:32:34 -07:00
Romain Guy
ce3ac5f029 Merge "Corrected buffer overflow when parsing /proc/wakelocks" 2010-07-29 14:00:48 -07:00
Adam Powell
a66c7b0456 Add support for setting action bar title/subtitle by resource ID 
Change-Id: I91b6f56bd3736fd7cc8b82cbbf0b7be2e1c718e5
 2010-07-28 18:02:48 -07:00
Adam Powell
c9ae2a24dc Add support for setting action mode titles/subtitles by resource ID 
Change-Id: Ia0d5234cc16f325eeb29127fb87e2616d67379ec
 2010-07-28 17:00:02 -07:00
Mike Lockwood
03a545e5ed Merge changes I00d6980a,I814221b4,Id88603a5 
* changes:
  CameraBrowser: Launch itself when a camera is attached to USB.
  Send Intents when PTP compatible devices are connected/disconnected to USB
  Give system server permission to access USB.
 2010-07-28 14:59:45 -07:00
Adam Powell
5d27977f9d Action modes without action bar 
Change-Id: I0367ab35e598a17980bd373b30828175f6283acc
 2010-07-27 21:04:52 -07:00
Mike Lockwood
037a086b16 Give system server permission to access USB. 
Change-Id: Id88603a5555b37b437f5333acf78dac3c5ffbce3
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-07-27 18:42:44 -04:00
Adam Powell
6e34636749 Moved context modes into view, renamed to action modes 
ContextualMode renamed to ActionMode. Adds a reference to the action
bar and reduces confusion around things named "Context".

Change-Id: Ia5098b1d0799a0ece0810c34e6696eda039fb005
 2010-07-26 17:28:45 -07:00
Mike Lockwood
9765211b90 am 64f04a64: am 70736a6d: Merge "Avoid starting multiple threads in ShutdownThread" into gingerbread 
Merge commit '64f04a645ea4fd81cfb41fba23d9ba9e1279d416'

* commit '64f04a645ea4fd81cfb41fba23d9ba9e1279d416':
  Avoid starting multiple threads in ShutdownThread
 2010-07-26 12:30:28 -07:00
Dianne Hackborn
48b9cbb046 am 443d884e: am 3bee5af8: Battery stats: start removing last stats, keep total discharge. 
Merge commit '443d884e16fad2e01a97aa788d4b30de53c94048'

* commit '443d884e16fad2e01a97aa788d4b30de53c94048':
  Battery stats: start removing last stats, keep total discharge.
 2010-07-26 12:30:06 -07:00
Mathias Agopian
bf23832acc am fed3c364: am eab07e5c: Merge "Report sensor events to BatteryStats service" into gingerbread 
Merge commit 'fed3c364e6fc6acc5e5836bd1370c3c278f8a248'

* commit 'fed3c364e6fc6acc5e5836bd1370c3c278f8a248':
  Report sensor events to BatteryStats service
 2010-07-26 12:30:01 -07:00
Mike Lockwood
64f04a645e am 70736a6d: Merge "Avoid starting multiple threads in ShutdownThread" into gingerbread 
Merge commit '70736a6d92767258543bb03ac22a705535d86341' into gingerbread-plus-aosp

* commit '70736a6d92767258543bb03ac22a705535d86341':
  Avoid starting multiple threads in ShutdownThread
 2010-07-26 12:25:31 -07:00
Dianne Hackborn
443d884e16 am 3bee5af8: Battery stats: start removing last stats, keep total discharge. 
Merge commit '3bee5af8162c177f8c8f4199489a401058ab26a9' into gingerbread-plus-aosp

* commit '3bee5af8162c177f8c8f4199489a401058ab26a9':
  Battery stats: start removing last stats, keep total discharge.
 2010-07-26 12:24:16 -07:00
Mathias Agopian
fed3c364e6 am eab07e5c: Merge "Report sensor events to BatteryStats service" into gingerbread 
Merge commit 'eab07e5c1d48d45f76ac2dd4a45c8a3457aa290d' into gingerbread-plus-aosp

* commit 'eab07e5c1d48d45f76ac2dd4a45c8a3457aa290d':
  Report sensor events to BatteryStats service
 2010-07-26 12:24:00 -07:00
Mike Lockwood
d67b236497 Avoid starting multiple threads in ShutdownThread 
The previous code allowed this to happen if a second call to shutdown
happened while the dialog was being displayed.

BUG: 2563243

Change-Id: I93adc4ef316917a79002d580b17eda0dc354704c
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-07-26 07:27:23 -04:00
Dianne Hackborn
3bee5af816 Battery stats: start removing last stats, keep total discharge. 
Change-Id: I59c4bcbb9893adb237017add76b83c22153f94ef
 2010-07-24 13:36:47 -07:00
Mathias Agopian
32123fde1b Report sensor events to BatteryStats service 
Change-Id: I9b83aa709887aa658bc474391573f2d45b6c4eb2
 2010-07-23 16:55:24 -07:00
Adam Powell
93b6bc3d15 Make finish() a no-op on a context mode that is not active. 
Change-Id: I2b3b304b7371a76ce67dcf197eaea2e77904399b
 2010-07-22 11:36:35 -07:00
Adam Powell
2175f1370c Rename callback methods for contextual modes to match recent refactoring. 
Change-Id: I9403f0c728143cd075827f21270b5468abc5271b
 2010-07-21 17:26:46 -07:00
Adam Powell
71cbae81b0 Merge "Fix bug 2859423 - action bar: need a way to choose item in spinner" 2010-07-21 14:35:41 -07:00
Adam Powell
178097727f Fix bug 2859423 - action bar: need a way to choose item in spinner 
Change-Id: Idf9c222e5d8f27b4339a6df7d14f3f10dcb4be2c
 2010-07-21 13:56:35 -07:00
Tom Taylor
b1b5a1ab93 am aa0f5550: am 92010ff5: am dbac180d: Fix a merge problem with html mms 
Merge commit 'aa0f5550cbfe713d5a08e25b734b6b976ca1a127'

* commit 'aa0f5550cbfe713d5a08e25b734b6b976ca1a127':
  Fix a merge problem with html mms
 2010-07-21 11:29:39 -07:00
Tom Taylor
aa0f5550cb am 92010ff5: am dbac180d: Fix a merge problem with html mms 
Merge commit '92010ff5cf014c0ff73ee4ad4bb169dd916a15a9' into gingerbread-plus-aosp

* commit '92010ff5cf014c0ff73ee4ad4bb169dd916a15a9':
  Fix a merge problem with html mms
 2010-07-21 11:26:17 -07:00
Tom Taylor
92010ff5cf am dbac180d: Fix a merge problem with html mms 
Merge commit 'dbac180d8342a7db2bb9994f937869eecb6b50ff' into gingerbread

* commit 'dbac180d8342a7db2bb9994f937869eecb6b50ff':
  Fix a merge problem with html mms
 2010-07-21 11:22:22 -07:00
Tom Taylor
dbac180d83 Fix a merge problem with html mms 
Html mms message support was added back in Jan '10. At that time, we
had moved the mms code out of the framework into the mms app. We decided
to back out that change and leave the mms code in its original place.
As a result, the changes to support html messages were lost. This
handmerged CL restores those changes. I'll cherry-pick this into master
as well. Bug 2858888

Change-Id: Icf8835edc8ac396698c167be5433a6fe1cfe6103
 2010-07-21 10:49:48 -07:00
Adam Powell
ac695c608b Refactored contextual modes out of action bar. 
Change-Id: I1fc1c9383e5ee90f135b92a5afa8eadbf1c13d20
 2010-07-20 18:56:59 -07:00
Adam Powell
269b8bb0cb Fix a bug with closing action bar context modes 
Change-Id: I4f11549664f11cdc02d135288e05459007dbf0c8
 2010-07-20 16:46:42 -07:00
Adam Powell
b366bbae2b Make sure action bar context modes reserve space for overflow menus on all devices. 
Change-Id: I393f041efef3852b7f3ee57c6a4c26ba176b2702
 2010-07-20 14:26:46 -07:00
Adam Powell
2c9c9fe806 Action bar context mode support for overflow, submenus 
Change-Id: I951ae179698b08b6aba5b174b3d47f0cf847352e
 2010-07-20 12:08:07 -07:00
The Android Open Source Project
ca48433afc merge from open-source master 
Change-Id: I1901177e8a4bd32a707020c581f25f21349ba571
 2010-07-20 10:33:38 -07:00
Christian Mehlmauer
798e2d3d0c Replaced /sdcard with Environment.getExternalStorageDirectory() 
Change-Id: Id789f44a8569e307b1b7ab15eb266c9ce7ef2029
 2010-07-19 15:54:40 -07:00
Adam Powell
dcdefbbff2 Fix bug 2852909 - screen density for contextual action bar 
Change-Id: I9e3d8fe4e6f5eb0282cc103a98ed60ca2911c91e
 2010-07-19 15:46:48 -07:00
Winson Chung
499cb9f516 Initial changes to allow collections in widgets. 
Change-Id: I3cfa899bae88cd252912cecebc12e93c27a3b7c9
 2010-07-19 14:48:31 -07:00
Adam Powell
8028dd32a4 Overflow menu for action bars. 
The overflow menu replaces the normal options menu panel for
activities with an action bar. It always appears as the rightmost
action button and is displayed as a dropdown menu. The menu key
summons and dismisses the overflow menu instead of the options panel
where applicable.

Change-Id: I0b4fa7e36f35ab12e2f0c1d12bec79ccab8cc4b1
 2010-07-16 10:22:31 -07:00
Kenny Root
94919a170f am f97b21b5: am bd623daf: Undo IMediaContainerService changes 
Merge commit 'f97b21b54e2e35fdfcc8614dedd8692d5a535a5e'

* commit 'f97b21b54e2e35fdfcc8614dedd8692d5a535a5e':
  Undo IMediaContainerService changes
 2010-07-16 09:12:36 -07:00
Kenny Root
fb4e1e24a9 resolved conflicts for merge of 181bb0ab to master 
Change-Id: I2284e7c671d127da0d124fbabae8d887727fd5bf
 2010-07-16 09:04:09 -07:00
Jeff Brown
b75fa30aaf resolved conflicts for merge of aca672ba to master 
Change-Id: I7ae11fca0acdbf513a4870226d0d3e3cafbe9a08
 2010-07-15 23:47:29 -07:00
Kenny Root
f97b21b54e am bd623daf: Undo IMediaContainerService changes 
Merge commit 'bd623daff1f261a0e794f059d90ba5907eb5a89a' into gingerbread-plus-aosp

* commit 'bd623daff1f261a0e794f059d90ba5907eb5a89a':
  Undo IMediaContainerService changes
 2010-07-15 22:37:06 -07:00
Kenny Root
bd623daff1 Undo IMediaContainerService changes 
These should be in the next commit and not the previous one.

Change-Id: I8d13fecf3b978ae2e796dc6e10ef3f969b27a0f4
 2010-07-15 22:22:57 -07:00
Kenny Root
181bb0ab46 am 02c8730c: Add API to call to vold for mounting OBBs 
Merge commit '02c8730c1bf19daf48bec8c6995df676a00a73b1' into gingerbread-plus-aosp

* commit '02c8730c1bf19daf48bec8c6995df676a00a73b1':
  Add API to call to vold for mounting OBBs
 2010-07-15 21:35:53 -07:00
Kenny Root
02c8730c1b Add API to call to vold for mounting OBBs 
* Unhide StorageService class; hide all the USB-related items

* Add application-visible API to StorageManager for OBB files

* Add class for parceling OBB info across binders (ObbInfo)

* Add a JNI glue class to libutils/ObbFile (ObbScanner)

* Add API to MountService to deal with calling into vold and checking
  permissions

Change-Id: I33ecf9606b8ff535f3a2ada83931da6bbef41cfd
 2010-07-15 21:31:58 -07:00