OSDN Git Service
Craig Mautner [Mon, 11 Feb 2013 22:20:58 +0000 (14:20 -0800)]
am
e2237ce8: Merge "Make ActivityStack.mHistory private."
# Via Android (Google) Code Review (1) and Craig Mautner (1)
* commit '
e2237ce8ad228bdba8d3026beab3b04d794203e9':
Make ActivityStack.mHistory private.
Craig Mautner [Mon, 11 Feb 2013 22:13:48 +0000 (22:13 +0000)]
Merge "Make ActivityStack.mHistory private."
Svetoslav [Mon, 11 Feb 2013 21:06:18 +0000 (13:06 -0800)]
am
981e60ed: Merge "Refactoring of the Accessibility."
# Via Android (Google) Code Review (1) and Svetoslav (1)
* commit '
981e60edc3ed91ea8b5e1dae98669b88b175e19b':
Refactoring of the Accessibility.
Svetoslav [Mon, 11 Feb 2013 21:03:08 +0000 (21:03 +0000)]
Merge "Refactoring of the Accessibility."
Svetoslav [Fri, 8 Feb 2013 03:21:42 +0000 (19:21 -0800)]
Refactoring of the Accessibility.
1. The accessibility manager service updates its internal state
based on which settings are enabled, what accessibility services
are installed and what features are requested by the enabled
services. It was trying to do the minimal amount of work to
react to contextual changes like these which resulted in missed
cases and complex code. Now there is a single method that reads
the contextual information and single method that reacts to
contextual changes. This makes the code much easier to maintain.
2. The accessibility manager service was not updating its internal
state when requested features from accessibility services change.
It was relying on changing system settings and reacting to the
settings change. This is problematic since the internal state is
not updated atomically which leads to race condition bugs. For
example, if touch exploration is enabled and a service requests
it is disabled, the internal state will not be updated but a
request for a settings change will be made. Now while the settings
change is propagating another request form the same service
comes to enable touch exploration but the system incorrectly
thinks touch exploration is enabled. At the end the feature is
disabled even though it was requested.
3. Fixed a potential NPE if the accessibility input filter's event
handler was nullified between processing two event batches.
4. Fixed a bug where, if magnification is enabled, it does not work
on the settings screen since the magnified bounds are not pushed
from the window manager to the accessibility manager.
Change-Id: Idf629a06480e12f0d88372762df6c024fe0d7856
Jean-Michel Trivi [Mon, 11 Feb 2013 19:32:40 +0000 (11:32 -0800)]
am
d21267a2: Merge "Add support for querying whether the music stream is active remotely"
# Via Android (Google) Code Review (1) and Jean-Michel Trivi (1)
* commit '
d21267a26845c36842990e0705a470b92caa7628':
Add support for querying whether the music stream is active remotely
Jean-Michel Trivi [Mon, 11 Feb 2013 19:28:49 +0000 (19:28 +0000)]
Merge "Add support for querying whether the music stream is active remotely"
Fabrice Di Meglio [Mon, 11 Feb 2013 19:26:04 +0000 (11:26 -0800)]
am
de1fadfb: Merge "Fix bug #
8115437 Need to remove ArabicShaping from Framework"
# Via Android (Google) Code Review (1) and Fabrice Di Meglio (1)
* commit '
de1fadfb7f70d464382e518c7f3390faf82f81f2':
Fix bug #
8115437 Need to remove ArabicShaping from Framework
Craig Mautner [Mon, 11 Feb 2013 19:26:02 +0000 (11:26 -0800)]
am
005f6f60: Merge "Reset SensorEventListener when listener reenabled."
# Via Android (Google) Code Review (1) and Craig Mautner (1)
* commit '
005f6f6077f34e0157598882fdc7ddb794cad84e':
Reset SensorEventListener when listener reenabled.
Baligh Uddin [Mon, 11 Feb 2013 19:25:58 +0000 (11:25 -0800)]
am
ea2f8029: (-s ours) Import translations. DO NOT MERGE
# Via Baligh Uddin
* commit '
ea2f802928297c199c7b94dbbba867a8544e14ac':
Import translations. DO NOT MERGE
Fabrice Di Meglio [Mon, 11 Feb 2013 18:50:47 +0000 (18:50 +0000)]
Merge "Fix bug #
8115437 Need to remove ArabicShaping from Framework"
Jean-Michel Trivi [Tue, 5 Feb 2013 00:24:09 +0000 (16:24 -0800)]
Add support for querying whether the music stream is active remotely
Bug
7485803
Change-Id: I554b44bd35b017fa4030a0d89779066c96594f2b
Craig Mautner [Mon, 11 Feb 2013 17:47:14 +0000 (17:47 +0000)]
Merge "Reset SensorEventListener when listener reenabled."
Craig Mautner [Thu, 17 Jan 2013 22:44:34 +0000 (14:44 -0800)]
Reset SensorEventListener when listener reenabled.
- Following disable and reenable of the WindowOrientationListener
the state was the same as before. State should be reset to default.
- Provide a Handler to the sensor task to deliver events on the
same Thread that WindowManagerPolicy operates on.
- Expand lock protection to all of WindowOrientationListener.
- Move WindowOrientationListener to policy package.
- Make SensorEventListenerImpl non-static.
Fixes bug
7964531.
Change-Id: I17cecf3d0b6d125cb3e4d7350c3adb3f62b684bd
Baligh Uddin [Mon, 11 Feb 2013 16:14:12 +0000 (08:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: I06ad3a3528b8378d6f0aa0b596a2dee9551c06f9
Auto-generated-cl: translation import
Baligh Uddin [Mon, 11 Feb 2013 16:12:48 +0000 (08:12 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5d6b97a7078b930416335dcf016bc820e1f09845
Auto-generated-cl: translation import
Adam Powell [Sat, 9 Feb 2013 02:49:44 +0000 (18:49 -0800)]
am
9d1d88ac: Merge "Fix setting action bar backgrounds after layout"
# Via Adam Powell (1) and Android (Google) Code Review (1)
* commit '
9d1d88acaaaf525bb6be49e6b7e2f3dc7992f76c':
Fix setting action bar backgrounds after layout
Adam Powell [Sat, 9 Feb 2013 02:38:01 +0000 (02:38 +0000)]
Merge "Fix setting action bar backgrounds after layout"
Adam Powell [Sat, 9 Feb 2013 01:32:24 +0000 (17:32 -0800)]
Fix setting action bar backgrounds after layout
Fix a bug that would prevent the drawable bounds from being set
correctly for action bar containers.
Change-Id: I396aa40e3d8f6e3b47bcd438e1f26bbfc7b20a7f
Dianne Hackborn [Sat, 9 Feb 2013 01:23:41 +0000 (17:23 -0800)]
am
e2dce85c: Merge "Fix issue #
8133857: Tracking ANR in Gallery"
# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit '
e2dce85c63436513079f7df9f9be5e515e4956fb':
Fix issue #
8133857: Tracking ANR in Gallery
Jeff Brown [Sat, 9 Feb 2013 01:20:13 +0000 (17:20 -0800)]
am
39938752: Fix build break due to merge.
# Via Jeff Brown
* commit '
39938752b368ae282b821a43efbc568c925ecc34':
Fix build break due to merge.
Dianne Hackborn [Sat, 9 Feb 2013 01:18:37 +0000 (01:18 +0000)]
Merge "Fix issue #
8133857: Tracking ANR in Gallery"
Dianne Hackborn [Fri, 8 Feb 2013 23:32:05 +0000 (15:32 -0800)]
Fix issue #
8133857: Tracking ANR in Gallery
Reworking the locking in resources so that we never hold the
state lock while calling in to potential long running operations.
This means the mTmpValue can no longer be final (since we need
to use it while the lock isn't held), so a new field needs to
be added as the lock and everything that touches mTmpValue must
deal with it being null, restoring the value in there when
possible, etc.
Change-Id: Ie5ffd0f66e5f2d0e869a62d72e7a55b1c74fe872
Jeff Brown [Sat, 9 Feb 2013 01:16:31 +0000 (17:16 -0800)]
Fix build break due to merge.
Change-Id: I08c39690ee9de825ff51afc7d102ee622af6ba13
Jeff Brown [Sat, 9 Feb 2013 01:06:20 +0000 (17:06 -0800)]
am
eaf2ec0c: am
4fd60792: am
5262a108: Merge "Complete documentation of whereArgs (Issue #43061)"
# By Tim Roes
# Via Android Git Automerger (2) and others
* commit '
eaf2ec0c6a50f9e24d36f6d1fac9c2e6543fc5f2':
Complete documentation of whereArgs (Issue #43061)
Jeff Brown [Sat, 9 Feb 2013 01:06:17 +0000 (17:06 -0800)]
am
d5c921f2: am
64f4de03: am
fa49a6b1: Merge "frameworks/base: Added English UK keyboard layout for physical keyboards"
# By HeyRatFans
# Via Android Git Automerger (2) and others
* commit '
d5c921f2cf3bc5a33d4d3b650b220cafbdfb6813':
frameworks/base: Added English UK keyboard layout for physical keyboards
Jeff Brown [Sat, 9 Feb 2013 01:03:42 +0000 (17:03 -0800)]
am
4fd60792: am
5262a108: Merge "Complete documentation of whereArgs (Issue #43061)"
# By Tim Roes
# Via Android Git Automerger (1) and others
* commit '
4fd60792473711a10dc9b27faa1a35efe9e4d6a0':
Complete documentation of whereArgs (Issue #43061)
Jeff Brown [Sat, 9 Feb 2013 01:03:38 +0000 (17:03 -0800)]
am
64f4de03: am
fa49a6b1: Merge "frameworks/base: Added English UK keyboard layout for physical keyboards"
# By HeyRatFans
# Via Android Git Automerger (1) and others
* commit '
64f4de03037b279e389ca20297e9d5086f49564c':
frameworks/base: Added English UK keyboard layout for physical keyboards
Jeff Brown [Sat, 9 Feb 2013 00:58:14 +0000 (16:58 -0800)]
am
5262a108: Merge "Complete documentation of whereArgs (Issue #43061)"
# By Tim Roes
# Via Gerrit Code Review (1) and Tim Roes (1)
* commit '
5262a1082663610a888d1145fd9676f7db41d397':
Complete documentation of whereArgs (Issue #43061)
Jeff Brown [Sat, 9 Feb 2013 00:58:09 +0000 (16:58 -0800)]
am
fa49a6b1: Merge "frameworks/base: Added English UK keyboard layout for physical keyboards"
# By HeyRatFans
# Via Gerrit Code Review (1) and Matt Beale (1)
* commit '
fa49a6b13ebf496ea01d5981f69084596d06d464':
frameworks/base: Added English UK keyboard layout for physical keyboards
Jeff Brown [Fri, 8 Feb 2013 23:58:10 +0000 (15:58 -0800)]
am
e624e0c7: am
110fe9b3: am
fe1f3a1b: Merge "Fix ViewRootImpl to find missing focus using D-pad."
# By Ki-Hwan Lee
# Via Android Git Automerger (2) and others
* commit '
e624e0c70409773df6c3eb274852f9dd7961f025':
Fix ViewRootImpl to find missing focus using D-pad.
Jeff Brown [Fri, 8 Feb 2013 23:56:04 +0000 (15:56 -0800)]
am
110fe9b3: am
fe1f3a1b: Merge "Fix ViewRootImpl to find missing focus using D-pad."
# By Ki-Hwan Lee
# Via Android Git Automerger (1) and others
* commit '
110fe9b303be527c30a8af95b6fb7afac12968b5':
Fix ViewRootImpl to find missing focus using D-pad.
Jeff Brown [Fri, 8 Feb 2013 23:49:51 +0000 (23:49 +0000)]
Merge "Complete documentation of whereArgs (Issue #43061)"
Jeff Brown [Fri, 8 Feb 2013 23:49:46 +0000 (15:49 -0800)]
am
fe1f3a1b: Merge "Fix ViewRootImpl to find missing focus using D-pad."
# By Ki-Hwan Lee
# Via Gerrit Code Review (1) and Ki-Hwan Lee (1)
* commit '
fe1f3a1beff9f73f6a04bcc35239038a21bc38ff':
Fix ViewRootImpl to find missing focus using D-pad.
Jeff Brown [Fri, 8 Feb 2013 23:49:10 +0000 (23:49 +0000)]
Merge "frameworks/base: Added English UK keyboard layout for physical keyboards"
The Android Open Source Project [Fri, 8 Feb 2013 23:48:08 +0000 (15:48 -0800)]
am
970b8b3f: (-s ours) am
4b71a472: (-s ours) Reconcile with jb-mr1.1-release - do not merge
# Via The Android Automerger (2) and others
* commit '
970b8b3fa98f67961a9afdaa63899f8df074db1a':
The Android Open Source Project [Fri, 8 Feb 2013 23:45:50 +0000 (15:45 -0800)]
am
4b71a472: (-s ours) Reconcile with jb-mr1.1-release - do not merge
# Via The Android Automerger (2) and The Android Open Source Project (1)
* commit '
4b71a472c0f254606e93b8f9f86f7df0e6dba522':
The Android Open Source Project [Fri, 8 Feb 2013 23:40:41 +0000 (15:40 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I728b304c185d7f0406b6d45334c10263bd38d769
Jeff Brown [Fri, 8 Feb 2013 23:29:11 +0000 (23:29 +0000)]
Merge "Fix ViewRootImpl to find missing focus using D-pad."
Craig Mautner [Fri, 8 Feb 2013 22:31:27 +0000 (14:31 -0800)]
Make ActivityStack.mHistory private.
Isolate the Activity history for later conversion to Task-based
management.
Change-Id: I4b6bf22de035c768aa705df0cc4f84486e8ede56
Romain Guy [Fri, 8 Feb 2013 22:05:00 +0000 (14:05 -0800)]
am
97dcc20e: Merge "Deprecate useless BitmapDrawable constructor Bug #
2590549"
# Via Android (Google) Code Review (1) and Romain Guy (1)
* commit '
97dcc20e6d6fcce712ab1101bfe03c74aa2b6682':
Deprecate useless BitmapDrawable constructor Bug #
2590549
Romain Guy [Fri, 8 Feb 2013 22:01:05 +0000 (22:01 +0000)]
Merge "Deprecate useless BitmapDrawable constructor Bug #
2590549"
Romain Guy [Fri, 8 Feb 2013 21:58:53 +0000 (13:58 -0800)]
Deprecate useless BitmapDrawable constructor
Bug #
2590549
Change-Id: Icb45bf2d9836c43ed0825105f64d7b98afcdcdac
Romain Guy [Fri, 8 Feb 2013 21:59:39 +0000 (13:59 -0800)]
am
dad85fb7: Merge "Apply the clip rect/region to drawLines()"
# Via Android (Google) Code Review (1) and Romain Guy (1)
* commit '
dad85fb7474c2b7e214ebc06c4cc449f26860c42':
Apply the clip rect/region to drawLines()
Romain Guy [Fri, 8 Feb 2013 21:57:24 +0000 (21:57 +0000)]
Merge "Apply the clip rect/region to drawLines()"
The Android Automerger [Fri, 8 Feb 2013 21:51:07 +0000 (13:51 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Romain Guy [Fri, 8 Feb 2013 21:46:40 +0000 (13:46 -0800)]
Apply the clip rect/region to drawLines()
Without the check to quickReject, drawConvexPath would never
setup the clip properly.
Change-Id: I23e5b25de3383c9e9b86eea4ee7a9552f8d9efb4
Dirk Dougherty [Fri, 8 Feb 2013 19:46:59 +0000 (11:46 -0800)]
am
6c971bfa: am
b555029e: am
2e65e20c: am
9b8b4ae5: am
f2d89ef9: am
64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev
# Via Android Git Automerger (5) and others
* commit '
6c971bfac3e95a0106dbdc9258656cb91ea033a8':
Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
Marco Nelissen [Fri, 8 Feb 2013 19:46:55 +0000 (11:46 -0800)]
am
70a0327a: am
85a1ee30: am
b683f354: am
69abccc3: Merge "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content"
# By Jan Bjernler
# Via Android Git Automerger (3) and Gerrit Code Review (2)
* commit '
70a0327abd80d07432cdad61fd1713a96248abb8':
MediaStore.Audio.Media.getContentUriForPath() returns unexpected content
Dirk Dougherty [Fri, 8 Feb 2013 19:43:07 +0000 (11:43 -0800)]
am
b555029e: am
2e65e20c: am
9b8b4ae5: am
f2d89ef9: am
64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev
# Via Android Git Automerger (4) and others
* commit '
b555029e411498b86efad38a1948e4cfb4f43dd1':
Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
Marco Nelissen [Fri, 8 Feb 2013 19:42:43 +0000 (11:42 -0800)]
am
85a1ee30: am
b683f354: am
69abccc3: Merge "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content"
# By Jan Bjernler
# Via Android Git Automerger (2) and Gerrit Code Review (2)
* commit '
85a1ee30215190b1782127a6afe323f4df4ef131':
MediaStore.Audio.Media.getContentUriForPath() returns unexpected content
Tim Murray [Fri, 8 Feb 2013 19:32:08 +0000 (11:32 -0800)]
am
21c14448: Merge "Add API entry points for clipped kernels."
# Via Android (Google) Code Review (1) and Tim Murray (1)
* commit '
21c144480a95bd3dbcd0b104ba8df0ff3610c5d7':
Add API entry points for clipped kernels.
Tim Murray [Fri, 8 Feb 2013 19:28:54 +0000 (19:28 +0000)]
Merge "Add API entry points for clipped kernels."
Dirk Dougherty [Fri, 8 Feb 2013 19:21:03 +0000 (11:21 -0800)]
am
2e65e20c: am
9b8b4ae5: am
f2d89ef9: am
64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit '
2e65e20c761f0fdee98eeefe9a8ee13c95a8b1ff':
Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
Dirk Dougherty [Fri, 8 Feb 2013 19:17:50 +0000 (11:17 -0800)]
am
9b8b4ae5: am
f2d89ef9: am
64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '
9b8b4ae5d7a4f5fbe242f5a2da145fd0fa88ce87':
Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
Dirk Dougherty [Fri, 8 Feb 2013 19:16:11 +0000 (11:16 -0800)]
am
f2d89ef9: am
64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
f2d89ef9d57b096962b802608a88d3483a51d08a':
Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
Dirk Dougherty [Fri, 8 Feb 2013 19:14:23 +0000 (11:14 -0800)]
am
64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev
# Via Android (Google) Code Review (1) and Dirk Dougherty (1)
* commit '
64ab8fdcb0a3015d3e6c4db0a1d66443085fd673':
Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
Dirk Dougherty [Fri, 8 Feb 2013 19:09:53 +0000 (19:09 +0000)]
Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev
Baligh Uddin [Fri, 8 Feb 2013 18:04:54 +0000 (18:04 +0000)]
Merge "Import translations. DO NOT MERGE" into master-chromium
Baligh Uddin [Fri, 8 Feb 2013 17:59:35 +0000 (09:59 -0800)]
am
63eb2d10: (-s ours) Import translations. DO NOT MERGE
# Via Baligh Uddin
* commit '
63eb2d1089c5bd2b10ae928e603cc588656e034e':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 8 Feb 2013 17:56:29 +0000 (09:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia8f842319d794e6d62cd9f084ec792df819830ef
Auto-generated-cl: translation import
Baligh Uddin [Fri, 8 Feb 2013 17:54:56 +0000 (09:54 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia60bfa7a614e309583df7273a64fdcb1f4d60633
Auto-generated-cl: translation import
Marco Nelissen [Fri, 8 Feb 2013 16:44:36 +0000 (08:44 -0800)]
am
b683f354: am
69abccc3: Merge "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content"
# By Jan Bjernler
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit '
b683f3542a123a07823b51643b1973507bfb57e2':
MediaStore.Audio.Media.getContentUriForPath() returns unexpected content
Marco Nelissen [Fri, 8 Feb 2013 16:41:20 +0000 (08:41 -0800)]
am
69abccc3: Merge "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content"
# By Jan Bjernler
# Via Gerrit Code Review
* commit '
69abccc3cdacee354dec8867865a0577a4e14e63':
MediaStore.Audio.Media.getContentUriForPath() returns unexpected content
Marco Nelissen [Fri, 8 Feb 2013 16:22:09 +0000 (16:22 +0000)]
Merge "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content"
Jan Bjernler [Mon, 30 Apr 2012 07:16:52 +0000 (09:16 +0200)]
MediaStore.Audio.Media.getContentUriForPath() returns unexpected content
MediaStore.Audio.getContentUriForPath() returns an uri to
internal storage if anything but /mnt/sdcard/ is sent in.
This fix checks if there is an additional sdcard
(normally called ext_card) or usb mass storage attached to
the device and then returns an uri to the external db.
The extra sdcard name and the usb mass storage name info is read from
the system environment variable SECONDARY_STORAGE so if a customer
chooses to change the name this will work as expected.
Change-Id: Ib78bca929fe382d4770df895149a0132f0e56994
Jesse Hall [Fri, 8 Feb 2013 04:32:01 +0000 (20:32 -0800)]
am
cd3b804e: am
93194ffb: am
c2edfa2b: am
7c292062: Merge "Process all display events in order"
# Via Android Git Automerger (3) and Gerrit Code Review (2)
* commit '
cd3b804e114c06b111fb0ad049c8845475a11a9b':
Process all display events in order
Jesse Hall [Fri, 8 Feb 2013 04:31:58 +0000 (20:31 -0800)]
am
8f87aa0b: am
5a5cc3dc: am
bc18fe85: am
fd1c028e: Merge "Handle hotplug events as described instead of rescanning"
# Via Android Git Automerger (3) and Gerrit Code Review (2)
* commit '
8f87aa0b08731b18e779cc9ebbe582667004ec89':
Handle hotplug events as described instead of rescanning
Jesse Hall [Fri, 8 Feb 2013 04:29:33 +0000 (20:29 -0800)]
am
93194ffb: am
c2edfa2b: am
7c292062: Merge "Process all display events in order"
# Via Android Git Automerger (2) and Gerrit Code Review (2)
* commit '
93194ffbf16e051b7bcb696417d3869eee05b7e4':
Process all display events in order
Jesse Hall [Fri, 8 Feb 2013 04:29:29 +0000 (20:29 -0800)]
am
5a5cc3dc: am
bc18fe85: am
fd1c028e: Merge "Handle hotplug events as described instead of rescanning"
# Via Android Git Automerger (2) and Gerrit Code Review (2)
* commit '
5a5cc3dcb054716803401149aa1eee0d3cd4a19c':
Handle hotplug events as described instead of rescanning
Jesse Hall [Fri, 8 Feb 2013 04:26:27 +0000 (20:26 -0800)]
am
c2edfa2b: am
7c292062: Merge "Process all display events in order"
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit '
c2edfa2b9649f67c142b181c54580c015badfca3':
Process all display events in order
Jesse Hall [Fri, 8 Feb 2013 04:26:23 +0000 (20:26 -0800)]
am
bc18fe85: am
fd1c028e: Merge "Handle hotplug events as described instead of rescanning"
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit '
bc18fe851c98dbe6be4eb2655efb1ef95902d961':
Handle hotplug events as described instead of rescanning
Svetoslav Ganov [Fri, 8 Feb 2013 03:43:29 +0000 (19:43 -0800)]
am
5f070284: Merge "Delay accessibility announcements in the keyguard."
# By Alan Viverette
# Via Alan Viverette (1) and Android (Google) Code Review (1)
* commit '
5f0702849996f43df78e71fbfb1b6919e90d78f5':
Delay accessibility announcements in the keyguard.
Svetoslav Ganov [Fri, 8 Feb 2013 03:39:04 +0000 (03:39 +0000)]
Merge "Delay accessibility announcements in the keyguard."
Robert Ly [Fri, 8 Feb 2013 02:05:31 +0000 (18:05 -0800)]
am
48e9219e: am
74e8693d: am
ddc0a7bd: am
11fa4460: am
9da9a7cd: am
e60b6023: Merge "makefile changes for gcm javadocs" into jb-mr1-dev
# Via Android Git Automerger (5) and others
* commit '
48e9219e6b0606aa04bcbdd3c9f1c6a72e9cd53e':
makefile changes for gcm javadocs
Robert Ly [Fri, 8 Feb 2013 02:03:20 +0000 (18:03 -0800)]
am
74e8693d: am
ddc0a7bd: am
11fa4460: am
9da9a7cd: am
e60b6023: Merge "makefile changes for gcm javadocs" into jb-mr1-dev
# Via Android Git Automerger (4) and others
* commit '
74e8693d310d75e98c5cf62340612d474f6f197b':
makefile changes for gcm javadocs
Robert Ly [Fri, 8 Feb 2013 02:01:17 +0000 (18:01 -0800)]
am
ddc0a7bd: am
11fa4460: am
9da9a7cd: am
e60b6023: Merge "makefile changes for gcm javadocs" into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit '
ddc0a7bdf94f4ba84dd4b89b693eb148ff32b5d3':
makefile changes for gcm javadocs
Robert Ly [Fri, 8 Feb 2013 01:57:57 +0000 (17:57 -0800)]
am
11fa4460: am
9da9a7cd: am
e60b6023: Merge "makefile changes for gcm javadocs" into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '
11fa446033a8600b681efeb857507388e8113d72':
makefile changes for gcm javadocs
Robert Ly [Fri, 8 Feb 2013 01:55:20 +0000 (17:55 -0800)]
am
9da9a7cd: am
e60b6023: Merge "makefile changes for gcm javadocs" into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
9da9a7cda27a9b9a3a08e64e81d0ca10ac4c4ec1':
makefile changes for gcm javadocs
Robert Ly [Fri, 8 Feb 2013 01:53:29 +0000 (17:53 -0800)]
am
e60b6023: Merge "makefile changes for gcm javadocs" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Robert Ly (1)
* commit '
e60b6023ae4fdea932d0effc553dddc38117d235':
makefile changes for gcm javadocs
Robert Ly [Fri, 8 Feb 2013 01:48:14 +0000 (01:48 +0000)]
Merge "makefile changes for gcm javadocs" into jb-mr1-dev
Jesse Hall [Fri, 8 Feb 2013 01:41:50 +0000 (17:41 -0800)]
am
7c292062: Merge "Process all display events in order"
# Via Gerrit Code Review
* commit '
7c2920625eb72216025aeb8ea8dce544df0eca36':
Process all display events in order
Jesse Hall [Fri, 8 Feb 2013 01:41:44 +0000 (17:41 -0800)]
am
fd1c028e: Merge "Handle hotplug events as described instead of rescanning"
# Via Gerrit Code Review
* commit '
fd1c028e34fc559ccccebd18979ee85ec7821dea':
Handle hotplug events as described instead of rescanning
Dirk Dougherty [Fri, 8 Feb 2013 01:32:35 +0000 (17:32 -0800)]
Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
Change-Id: I3003fa163f7c9e10925d96f8d89005b42baed315
Katie McCormick [Fri, 8 Feb 2013 01:31:27 +0000 (17:31 -0800)]
am
d68c0964: am
89e7aa3d: am
2306f0ee: am
ee27bcda: am
b68702eb: am
0e66f16a: Merge "Doc change: Scroller Javadoc Bug #
7966653" into jb-mr1-dev
# Via Android Git Automerger (5) and others
* commit '
d68c0964765b48934f528600ba5fe51b45cb8ae1':
Doc change: Scroller Javadoc Bug #
7966653
Jesse Hall [Fri, 8 Feb 2013 01:29:32 +0000 (01:29 +0000)]
Merge "Process all display events in order"
Katie McCormick [Fri, 8 Feb 2013 01:29:18 +0000 (17:29 -0800)]
am
89e7aa3d: am
2306f0ee: am
ee27bcda: am
b68702eb: am
0e66f16a: Merge "Doc change: Scroller Javadoc Bug #
7966653" into jb-mr1-dev
# Via Android Git Automerger (4) and others
* commit '
89e7aa3dae133fd38007eddb47a3e372abb68d4d':
Doc change: Scroller Javadoc Bug #
7966653
Jesse Hall [Fri, 8 Feb 2013 01:29:03 +0000 (01:29 +0000)]
Merge "Handle hotplug events as described instead of rescanning"
Katie McCormick [Fri, 8 Feb 2013 01:26:13 +0000 (17:26 -0800)]
am
2306f0ee: am
ee27bcda: am
b68702eb: am
0e66f16a: Merge "Doc change: Scroller Javadoc Bug #
7966653" into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit '
2306f0ee3396cd8a85d04dfbc08fb8c5ffa6699f':
Doc change: Scroller Javadoc Bug #
7966653
Katie McCormick [Fri, 8 Feb 2013 01:23:00 +0000 (17:23 -0800)]
am
ee27bcda: am
b68702eb: am
0e66f16a: Merge "Doc change: Scroller Javadoc Bug #
7966653" into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '
ee27bcda8644f8c3f2328acc248b8c5c9d152f59':
Doc change: Scroller Javadoc Bug #
7966653
Katie McCormick [Fri, 8 Feb 2013 01:21:29 +0000 (17:21 -0800)]
am
b68702eb: am
0e66f16a: Merge "Doc change: Scroller Javadoc Bug #
7966653" into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
b68702eb0526633e51d9dbfe6fc971c168e1274a':
Doc change: Scroller Javadoc Bug #
7966653
Katie McCormick [Fri, 8 Feb 2013 01:18:48 +0000 (17:18 -0800)]
am
0e66f16a: Merge "Doc change: Scroller Javadoc Bug #
7966653" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Katie McCormick (1)
* commit '
0e66f16abd651bdf5833f4aede4899e627d7b333':
Doc change: Scroller Javadoc Bug #
7966653
Katie McCormick [Fri, 8 Feb 2013 01:14:47 +0000 (01:14 +0000)]
Merge "Doc change: Scroller Javadoc Bug #
7966653" into jb-mr1-dev
Wink Saville [Fri, 8 Feb 2013 01:10:01 +0000 (17:10 -0800)]
am
17cccb8c: Merge "Move a few files from frameworks/opt/telephony to frameworks/base."
# Via Android (Google) Code Review (1) and Wink Saville (1)
* commit '
17cccb8ccbfb077334dcf37d9e93ec614ff8761e':
Move a few files from frameworks/opt/telephony to frameworks/base.
Wink Saville [Fri, 8 Feb 2013 01:06:02 +0000 (01:06 +0000)]
Merge "Move a few files from frameworks/opt/telephony to frameworks/base."
Wink Saville [Fri, 8 Feb 2013 01:03:05 +0000 (17:03 -0800)]
Move a few files from frameworks/opt/telephony to frameworks/base.
Because ISms.aidl imports PendingIntent we couldn't easily
make opt/telephony part of the PDK. So this change moves
ISms.aidl and SmsRawData.*, which ISms.aidl also imports,
back to frameworks/base.
Change-Id: Ia64c6e771d5a292d9bfebb413a43f3745df55c85
Baligh Uddin [Fri, 8 Feb 2013 01:01:32 +0000 (17:01 -0800)]
am
5ef8f22d: (-s ours) Merge "Import translations. DO NOT MERGE"
# Via Android (Google) Code Review (1) and Baligh Uddin (1)
* commit '
5ef8f22d71256e4db795796f7b88e5c4d7ee2843':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 8 Feb 2013 00:55:19 +0000 (00:55 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 8 Feb 2013 00:50:26 +0000 (00:50 +0000)]
Merge "Import translations. DO NOT MERGE" into master-chromium
Baligh Uddin [Fri, 8 Feb 2013 00:51:26 +0000 (16:51 -0800)]
am
4d429e30: (-s ours) Merge "Import translations. DO NOT MERGE"
# Via Android (Google) Code Review (1) and Baligh Uddin (1)
* commit '
4d429e302a3331a773dfa8a6beb28dd19dcc82a1':
Import translations. DO NOT MERGE
OSDN Git Service
