103441 Commits

Author SHA1 Message Date
Amith Yamasani
399a2977a5 am b3a98725: Merge "Show an error dialog when account type is requested on a limited user" into jb-mr2-dev
* commit 'b3a9872549137f6c3983609e48e5b2d4fc94a3d4':
  Show an error dialog when account type is requested on a limited user
2013-04-10 17:33:35 -07:00
Amith Yamasani
b3a9872549 Merge "Show an error dialog when account type is requested on a limited user" into jb-mr2-dev 2013-04-11 00:27:49 +00:00
Jim Miller
3ef8f64d3f am 5c58a916: Merge "Fix missing clock in keyguard" into jb-mr2-dev
* commit '5c58a916f6b10652af02aa357ceb70ba2cd18363':
  Fix missing clock in keyguard
2013-04-10 17:22:20 -07:00
Jim Miller
5c58a916f6 Merge "Fix missing clock in keyguard" into jb-mr2-dev 2013-04-11 00:16:39 +00:00
Christopher Tate
04f5c8cb95 am 790518a1: Merge "Implicitly enable system apps when updates installed" into jb-mr2-dev
* commit '790518a1a2f06030d19fdd896bd0f80dd03d94fc':
  Implicitly enable system apps when updates installed
2013-04-10 17:04:46 -07:00
Christopher Tate
790518a1a2 Merge "Implicitly enable system apps when updates installed" into jb-mr2-dev 2013-04-10 23:58:37 +00:00
Craig Mautner
98874efb99 am cc979c9e: Merge "Debug logging improvement." into jb-mr2-dev
* commit 'cc979c9eae387d80e4c4129d18991d708dde44a6':
  Debug logging improvement.
2013-04-10 16:57:50 -07:00
Craig Mautner
cc979c9eae Merge "Debug logging improvement." into jb-mr2-dev 2013-04-10 23:54:29 +00:00
Raph Levien
b2c8dca1b4 am 81c8de3a: Merge "Fix for bug 8574856 - bad metrics in Roboto Italic" into jb-mr2-dev
* commit '81c8de3a3c2ce26866afd4e003c1739627a398e1':
  Fix for bug 8574856 - bad metrics in Roboto Italic
2013-04-10 16:28:25 -07:00
Raph Levien
81c8de3a3c Merge "Fix for bug 8574856 - bad metrics in Roboto Italic" into jb-mr2-dev 2013-04-10 23:24:17 +00:00
Adam Powell
66104e1e19 am 521eeaef: Merge "Make MediaRouter ignore remembered wifi displays when wifi display is off" into jb-mr2-dev
* commit '521eeaefcb4b78a8b571d1a1b4f095d993aea8b6':
  Make MediaRouter ignore remembered wifi displays when wifi display is off
2013-04-10 16:13:01 -07:00
Jim Miller
e5fb5e4c4d Fix missing clock in keyguard
This fixes a bug where the clock sometimes doesn't show due to the
alpha values not being reset when the widget page order changes
due to removing a widget.

Fixes bug 8545025.

Change-Id: I17c531af4c844647b3262fcf56faa84fff8bafc5
2013-04-10 16:10:06 -07:00
Michael Wright
af543eb050 am 8881455a: Merge "Send joystick key repeat messages to correct handler" into jb-mr2-dev
* commit '8881455af119762a25d4548384322b8e4a2023dd':
  Send joystick key repeat messages to correct handler
2013-04-10 16:09:25 -07:00
Adam Powell
521eeaefcb Merge "Make MediaRouter ignore remembered wifi displays when wifi display is off" into jb-mr2-dev 2013-04-10 23:08:47 +00:00
Adam Powell
615e413a90 Make MediaRouter ignore remembered wifi displays when wifi display is off
Bug 8417329

Change-Id: Ica9bf1b250be4b72ba32e63d7eb1a6ff0b727961
2013-04-10 16:04:59 -07:00
Michael Wright
8881455af1 Merge "Send joystick key repeat messages to correct handler" into jb-mr2-dev 2013-04-10 23:04:13 +00:00
Santos Cordon
0a5eb3eca7 am acd840d5: Merge "Obfuscate any phone numbers that pass through the event log." into jb-mr2-dev
* commit 'acd840d5c31bee48cc13a03f5e0c5e3b69ff23db':
  Obfuscate any phone numbers that pass through the event log.
2013-04-10 15:57:07 -07:00
Santos Cordon
acd840d5c3 Merge "Obfuscate any phone numbers that pass through the event log." into jb-mr2-dev 2013-04-10 22:53:08 +00:00
Amith Yamasani
23c8b96a7e Show an error dialog when account type is requested on a limited user
This covers the scenario where an app doesn't find an account of the
required type and requests the account manager to add one of that
type.

Bug: 8537648
Change-Id: I4d9c8842c2d90aa668f16034d3db007dc61714b8
2013-04-10 15:36:54 -07:00
Jaikumar Ganesh
7228e1aeb9 am 8ce470dd: GPS Hardware geofencing.
* commit '8ce470dd4ba0608abb6b5eae117cefca927af96b':
  GPS Hardware geofencing.
2013-04-10 15:34:35 -07:00
Craig Mautner
66d7730903 Debug logging improvement.
Previously a change to a surface would be logged with the old value
and you had to scroll through the logs to see what the new value
was. This change reflects the change to the surface immediately.

Change-Id: I2a6566466287922d08f4ce2329c61aa46d692ee1
2013-04-10 15:33:26 -07:00
The Android Open Source Project
04958d1543 Reconcile with jb-mr2-release - do not merge
Change-Id: Idf48718630a3b4260b530f26d8f8f26b3d2e1e5c
2013-04-10 15:31:38 -07:00
Jaikumar Ganesh
8ce470dd4b GPS Hardware geofencing.
Add support for doing geofencing in hardware.

Change-Id: I6d5015190e8d84e1f4beb1010ed977a71c1622d0
2013-04-10 15:25:07 -07:00
Adam Powell
4348fcddda am 8d06cc6d: Merge "Permit null adapters in Spinners" into jb-mr2-dev
* commit '8d06cc6d871fce6d5d6b6283027d4625edd92550':
  Permit null adapters in Spinners
2013-04-10 15:24:31 -07:00
Michael Wright
b9618523ad Send joystick key repeat messages to correct handler
Change-Id: I7f8dbe21c9088553ad2c5efe70585f516ab78141
2013-04-10 15:20:56 -07:00
Adam Powell
8d06cc6d87 Merge "Permit null adapters in Spinners" into jb-mr2-dev 2013-04-10 22:17:31 +00:00
Raph Levien
98082fa98b Fix for bug 8574856 - bad metrics in Roboto Italic
The last update to Roboto Italic has a stray point in delta.alt with a
y value of -11299. This causes metrics to give too much vertical space
in some cases.

This is a "hot patch" fix, with the stray point deleted using TTX. We
want to fix the font upstream as well, but this should fix things in
the mean time.

Change-Id: I08edae96f69753b2d46dfc3fd1cc3b9176dcb5ad
2013-04-10 14:51:06 -07:00
Mathias Agopian
ee067769ea am 26cbb806: Merge "Don\'t draw synchronously in onResume()" into jb-mr2-dev
* commit '26cbb8060098f5cdfce7684eb7336f1b1c7af4c2':
  Don't draw synchronously in onResume()
2013-04-10 14:45:40 -07:00
Mathias Agopian
26cbb80600 Merge "Don't draw synchronously in onResume()" into jb-mr2-dev 2013-04-10 21:40:44 +00:00
Joe Fernandez
8bd211c79e am 767e8747: am 0b6162e1: am 3f156d73: am 12ee56aa: am 5f27b486: am 53bbb4ff: Merge "docs: OpenGL Dev Guide, fix bug: 6104328" into jb-mr1.1-docs
* commit '767e8747b4c3b08f75f48dc2b3d3baf7d6d37af8':
  docs: OpenGL Dev Guide, fix bug: 6104328
2013-04-10 14:35:38 -07:00
Joe Fernandez
767e8747b4 am 0b6162e1: am 3f156d73: am 12ee56aa: am 5f27b486: am 53bbb4ff: Merge "docs: OpenGL Dev Guide, fix bug: 6104328" into jb-mr1.1-docs
* commit '0b6162e148db58ff8f8a5f0a3422933cd0005216':
  docs: OpenGL Dev Guide, fix bug: 6104328
2013-04-10 14:30:17 -07:00
Joe Fernandez
0b6162e148 am 3f156d73: am 12ee56aa: am 5f27b486: am 53bbb4ff: Merge "docs: OpenGL Dev Guide, fix bug: 6104328" into jb-mr1.1-docs
* commit '3f156d7331a0932755cea431b5c681f451055fdf':
  docs: OpenGL Dev Guide, fix bug: 6104328
2013-04-10 14:28:15 -07:00
Joe Fernandez
3f156d7331 am 12ee56aa: am 5f27b486: am 53bbb4ff: Merge "docs: OpenGL Dev Guide, fix bug: 6104328" into jb-mr1.1-docs
* commit '12ee56aaad5614e010edd24f41654b6ab135492c':
  docs: OpenGL Dev Guide, fix bug: 6104328
2013-04-10 14:24:51 -07:00
Joe Fernandez
12ee56aaad am 5f27b486: am 53bbb4ff: Merge "docs: OpenGL Dev Guide, fix bug: 6104328" into jb-mr1.1-docs
* commit '5f27b4860b67ac35b8089c244c89832689a8297a':
  docs: OpenGL Dev Guide, fix bug: 6104328
2013-04-10 14:22:36 -07:00
Joe Fernandez
5f27b4860b am 53bbb4ff: Merge "docs: OpenGL Dev Guide, fix bug: 6104328" into jb-mr1.1-docs
* commit '53bbb4ff4970c52619a78c54da6356f2b5aeb2a7':
  docs: OpenGL Dev Guide, fix bug: 6104328
2013-04-10 14:20:31 -07:00
Dianne Hackborn
a92e95e5d9 am 064fab54: Merge "Fix issue #7691456: adbd CPU usage identified as Bluetooth in battery stats" into jb-mr2-dev
* commit '064fab54d743c6b00319ec08669e8b0872625317':
  Fix issue #7691456: adbd CPU usage identified as Bluetooth in battery stats
2013-04-10 14:20:10 -07:00
Michael Wright
e5f80f4bec am f7104136: Merge "Stop marking gamepads as keyboards" into jb-mr2-dev
* commit 'f7104136927f45e152cec3583463b8ef1570df7b':
  Stop marking gamepads as keyboards
2013-04-10 14:20:07 -07:00
Joe Fernandez
53bbb4ff49 Merge "docs: OpenGL Dev Guide, fix bug: 6104328" into jb-mr1.1-docs 2013-04-10 21:17:21 +00:00
Dianne Hackborn
064fab54d7 Merge "Fix issue #7691456: adbd CPU usage identified as Bluetooth in battery stats" into jb-mr2-dev 2013-04-10 21:15:15 +00:00
Michael Wright
f710413692 Merge "Stop marking gamepads as keyboards" into jb-mr2-dev 2013-04-10 21:14:27 +00:00
Romain Guy
23886803a1 am 5180ed14: Merge "Instrument views inflation in systrace" into jb-mr2-dev
* commit '5180ed141db0f1acced4f19f37391572bc18280b':
  Instrument views inflation in systrace
2013-04-10 14:11:45 -07:00
Romain Guy
5180ed141d Merge "Instrument views inflation in systrace" into jb-mr2-dev 2013-04-10 21:07:09 +00:00
Dianne Hackborn
2323dd8d1e Fix issue #7691456: adbd CPU usage identified as Bluetooth in battery stats
Bluetooth GID was wrong and pointless and dumb and now gone.

Change-Id: Ibde563ef0c10c6d316428e1e683b013005b934d4
2013-04-10 12:50:12 -07:00
Baligh Uddin
36b5c967e1 am 0cb19909: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '0cb19909211cefc5874c0bcb02335d7b0e988328':
  Import translations. DO NOT MERGE
2013-04-10 12:40:48 -07:00
Baligh Uddin
0cb1990921 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-04-10 19:36:55 +00:00
Mathias Agopian
ab814a6472 Don't draw synchronously in onResume()
this could cause a dead-lock if the applicaltion's draw
implementation blocks until something happenson the main
ui thread.

note: we're still doing this synchronous draw in onWindowResize() because
that's what the previous implementation did. Technically, it has the
same problem.

Bug: 8586305
Change-Id: I782568289cc9419346aeea73775d86faa28b3058
2013-04-10 12:33:15 -07:00
Maxim Siniavine
f7c6475d0a am 85478b59: Skip apps without launch intent.
* commit '85478b59722837ed1bec447b2920f2f7111b57ea':
  Skip apps without launch intent.
2013-04-10 12:23:38 -07:00
Tim Murray
c45da6d7ce Add GC thread to RSGL.
bug 8585185

Change-Id: I06df29c3be831d6cd53fa8913ba3731f29c137d1
2013-04-10 12:19:07 -07:00
Maxim Siniavine
85478b5972 Skip apps without launch intent.
If an app from the apk cannot be launched then skip it in compatibility
test, rather than generate a null pointer exception.

Change-Id: I252031f249bfe25282b10394889ab8c5506cabcf
2013-04-10 12:14:11 -07:00
Maxim Siniavine
d15c6de22b am d9621f86: Merge "Make download manager tests more reliable." into jb-mr2-dev
* commit 'd9621f867027dedc47df50c8ff4bf6f67c188ea4':
  Make download manager tests more reliable.
2013-04-10 11:50:03 -07:00