126029 Commits

Author SHA1 Message Date
Jeff Brown
1eac839165 am c9a7eeba: am 4cb1bc28: Merge "Refresh cast icon assets to improve visual contrast." into klp-dev
* commit 'c9a7eeba15641da5a5bc8499e813e6c2211506ff':
  Refresh cast icon assets to improve visual contrast.
2014-03-19 00:55:39 +00:00
Dave Platt
17e7c4076b am 98a027a5: Merge "Harden NsdManager against null-dereference crashes" into klp-dev
* commit '98a027a506b5acff1a7ab0cc3655399da7d025c7':
  Harden NsdManager against null-dereference crashes
2014-03-19 00:54:54 +00:00
Dave Platt
98a027a506 Merge "Harden NsdManager against null-dereference crashes" into klp-dev 2014-03-19 00:50:30 +00:00
Jeff Brown
c9a7eeba15 am 4cb1bc28: Merge "Refresh cast icon assets to improve visual contrast." into klp-dev
* commit '4cb1bc2877f8562e6d349a6c737a3055ef4eaa29':
  Refresh cast icon assets to improve visual contrast.
2014-03-19 00:25:41 +00:00
Jeff Brown
4cb1bc2877 Merge "Refresh cast icon assets to improve visual contrast." into klp-dev 2014-03-19 00:19:38 +00:00
Ashish Sharma
a3f828ba30 Update the tests to deal with the new timestamps in idletimer module.
Change-Id: I1a8368d84ef806f1501b0a1f5e817388a1d10518
2014-03-18 16:38:58 -07:00
Zhijun He
ca2926f83b Camera2: Update exposureTimeRange related docs
Bug: 13250951
Change-Id: I8a77feb1b9877c75fd5a41a324fe17605ed338e0
2014-03-18 16:21:45 -07:00
ztenghui
28c3ea0187 Get rid of useless code
Change-Id: I7fedd0df349e1d9408d58edcab25396e2ff2edd6
2014-03-18 15:58:57 -07:00
George Mount
14a9738330 Fix ActionBar layout bug when INVISIBLE.
ActionBar did not layout properly when INVISIBLE, but worked
when VISIBLE or GONE.

Change-Id: I30ca85377f3516c79174a35b65648d4ca68e927a
2014-03-18 15:48:00 -07:00
Xia Wang
ea818400f8 am fe664ce3: am 454fc6b1: am 560e7541: am 1b007565: am 9b650702: Merge "Fix state transition verification." into klp-dev
* commit 'fe664ce3d2b2e7292f7a6aef2be6eb2fdc343d56':
  Fix state transition verification.
2014-03-18 22:45:53 +00:00
Xia Wang
fe664ce3d2 am 454fc6b1: am 560e7541: am 1b007565: am 9b650702: Merge "Fix state transition verification." into klp-dev
* commit '454fc6b1189225c54a833053f6aed32508f42f3e':
  Fix state transition verification.
2014-03-18 22:38:49 +00:00
Xia Wang
454fc6b118 am 560e7541: am 1b007565: am 9b650702: Merge "Fix state transition verification." into klp-dev
* commit '560e75417252b502a41967aa4d819a029361e384':
  Fix state transition verification.
2014-03-18 22:34:17 +00:00
Winson Chung
1bcb248db9 Merge "Fixing issue where launching a task was delayed due to a previous start delay being set on a ViewPropertyAnimator." 2014-03-18 22:25:33 +00:00
Winson Chung
9d8ff51c89 Merge "Moving alternate recents component logic into its own file." 2014-03-18 22:25:30 +00:00
Xia Wang
560e754172 am 1b007565: am 9b650702: Merge "Fix state transition verification." into klp-dev
* commit '1b007565c73097728496f3dbe811a51c879ba89e':
  Fix state transition verification.
2014-03-18 22:22:37 +00:00
Xia Wang
1b007565c7 am 9b650702: Merge "Fix state transition verification." into klp-dev
* commit '9b650702113f8a17e09940c3802de71a9fc62ff1':
  Fix state transition verification.
2014-03-18 22:16:26 +00:00
Xia Wang
9b65070211 Merge "Fix state transition verification." into klp-dev 2014-03-18 22:10:32 +00:00
Adrian Roos
d4915ab457 am 0e61ba8b: (-s ours) am 546f0c9c: am 2d70a47b: am a4a1c0d4: am ac275cb3: am 1f3186ee: (-s ours) am 67a92975: am 88da2bfa: am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '0e61ba8b33dec987258da840e0de3c669de1809f':
  DO NOT MERGE - Fix keyguard pattern lockout bug
2014-03-18 22:01:50 +00:00
Adrian Roos
0e61ba8b33 am 546f0c9c: am 2d70a47b: am a4a1c0d4: am ac275cb3: am 1f3186ee: (-s ours) am 67a92975: am 88da2bfa: am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '546f0c9c2cc902ebe30fef79b34e93eac8542e14':
  DO NOT MERGE - Fix keyguard pattern lockout bug
2014-03-18 21:56:35 +00:00
Adrian Roos
546f0c9c2c am 2d70a47b: am a4a1c0d4: am ac275cb3: am 1f3186ee: (-s ours) am 67a92975: am 88da2bfa: am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '2d70a47b0e7196a58561195fc47a57085cf29633':
  DO NOT MERGE - Fix keyguard pattern lockout bug
2014-03-18 21:51:44 +00:00
Adrian Roos
2d70a47b0e am a4a1c0d4: am ac275cb3: am 1f3186ee: (-s ours) am 67a92975: am 88da2bfa: am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit 'a4a1c0d4ee66f85376adbd71800e05b88b60c5b7':
  DO NOT MERGE - Fix keyguard pattern lockout bug
2014-03-18 21:47:18 +00:00
Winson Chung
bd91297e89 Fixing issue where launching a task was delayed due to a previous start delay being set on a ViewPropertyAnimator.
- adding logging for timing certain paths (including startup and task launch)
2014-03-18 14:44:24 -07:00
Winson Chung
7048fea75c Moving alternate recents component logic into its own file.
- Adding min delay between toggles of recents
- Merging changes to show related recents

Change-Id: I2201a9f98417e26cdfb1c16cb0a2ef095d2cd5fc
2014-03-18 14:44:24 -07:00
Ashish Sharma
0535a9f7aa Include elapsed realtime (nanos) of the event in the radio state change notifications.
Bug: 13247811
Change-Id: I3454aa159a68b9087b4762df947b41965b5a3941
2014-03-18 21:42:02 +00:00
Jeff Brown
f1e8d36327 Refresh cast icon assets to improve visual contrast.
Bug: 13473719
Change-Id: Ia82b2bc487a612f24bbe47f7d6e9182e862bcefa
2014-03-18 14:40:43 -07:00
Craig Mautner
76aa61a920 Merge "Defer removal of activity until animation complete." 2014-03-18 21:36:02 +00:00
Craig Mautner
81481fc201 Defer removal of activity until animation complete.
Do not remove an AppWindowToken or its Task if it is running an
animation. Doing so leaves windows orphaned and bad things happen
when the system tries to retrieve the task assoicated with the
windows during layout.

Fixes the ugly output associated with bug 13440426.

Change-Id: I9d5fc50a7cb6189160d51cee3c82f7813baee715
2014-03-18 14:35:04 -07:00
Adrian Roos
a4a1c0d4ee am ac275cb3: am 1f3186ee: (-s ours) am 67a92975: am 88da2bfa: am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit 'ac275cb3d8184e83228899280bb8901e30f3a5f2':
  DO NOT MERGE - Fix keyguard pattern lockout bug
2014-03-18 21:07:28 +00:00
Adrian Roos
ac275cb3d8 am 1f3186ee: (-s ours) am 67a92975: am 88da2bfa: am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '1f3186ee4505997ef3a235f669313236099308f4':
  DO NOT MERGE - Fix keyguard pattern lockout bug
2014-03-18 21:03:15 +00:00
Doug Zongker
dd23853e63 am 06fe82d8: am 2e6d960c: am cdf00888: add option to shutdown after factory reset
* commit '06fe82d8e01780b7b6c16364f81f8dd75d467420':
  add option to shutdown after factory reset
2014-03-18 21:00:04 +00:00
Adrian Roos
1f3186ee45 am 67a92975: am 88da2bfa: am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '67a92975ac638db3d51ea4978cf78ee207fcceb7':
  DO NOT MERGE - Fix keyguard pattern lockout bug
2014-03-18 13:59:28 -07:00
Doug Zongker
06fe82d8e0 am 2e6d960c: am cdf00888: add option to shutdown after factory reset
* commit '2e6d960c85436b46f71a048a825c545a376fbf06':
  add option to shutdown after factory reset
2014-03-18 20:54:27 +00:00
Adrian Roos
67a92975ac am 88da2bfa: am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '88da2bfaacaafebdd2e0fb9542386486b9594871':
  DO NOT MERGE - Fix keyguard pattern lockout bug
2014-03-18 13:53:17 -07:00
Dianne Hackborn
8fc2eba0f7 am a2a13718: am 7987d84e: am d1d91eca: am 7cb1dfe6: Merge "Insufficient ProcessRecord cleanup when persistent process is killed"
* commit 'a2a13718d00172d224960146e4956de58da5b484':
  Insufficient ProcessRecord cleanup when persistent process is killed
2014-03-18 20:52:51 +00:00
Ricardo Cervera
82647f54b6 am adbd67d8: am 342eb1f5: am 808779d1: am 965e5e85: am ace69017: docs: Reverted ADT 22.6.1 links
* commit 'adbd67d8f7199e7a57e407146757a7bf157ddb59':
  docs: Reverted ADT 22.6.1 links
2014-03-18 20:52:36 +00:00
Doug Zongker
2e6d960c85 am cdf00888: add option to shutdown after factory reset
* commit 'cdf008883921c2eb7daf10c82687e9a36461eb16':
  add option to shutdown after factory reset
2014-03-18 20:49:12 +00:00
Adrian Roos
88da2bfaac am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit 'ed529a5a78ade4833a8fd2ddfaf88d68ca260e6b':
  DO NOT MERGE - Fix keyguard pattern lockout bug
2014-03-18 13:47:58 -07:00
Adrian Roos
ed529a5a78 am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '500ec9ce4b7856eca480c4c7dca8df1211614102':
  DO NOT MERGE - Fix keyguard pattern lockout bug
2014-03-18 13:41:20 -07:00
Adrian Roos
500ec9ce4b am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '25fb7133901f6a538d5d365f3c0c1c936e76679d':
  DO NOT MERGE - Fix keyguard pattern lockout bug
2014-03-18 13:34:05 -07:00
Adrian Roos
25fb713390 am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '0b2f212204bd71700a4a32b87ac2d4c6a0c56feb':
  DO NOT MERGE - Fix keyguard pattern lockout bug
2014-03-18 13:28:17 -07:00
Adrian Roos
0b2f212204 am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit 'd3da8f711ec642322e497a493985bed5c43f597b':
  DO NOT MERGE - Fix keyguard pattern lockout bug
2014-03-18 13:24:35 -07:00
Adrian Roos
d3da8f711e am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit 'ecba937b005b07d72eadfaf93a200e0b14af2980':
  DO NOT MERGE - Fix keyguard pattern lockout bug
2014-03-18 13:17:12 -07:00
Doug Zongker
cdf0088839 add option to shutdown after factory reset
Add a new hidden method to recovery system to trigger a factory reset
followed by a shutdown, rather than a reboot back to the regular
system.  Use this flag when the MASTER_CLEAR intent is broadcast with
a boolean extra "shutdown" set to true.

Change-Id: I2ceb25b715d9f0ef492a75b3d287d1e17cec89ef
2014-03-18 12:52:04 -07:00
Craig Mautner
157b645e5d Merge "Fix activities appearing behind home icons" 2014-03-18 19:24:29 +00:00
Dianne Hackborn
a2a13718d0 am 7987d84e: am d1d91eca: am 7cb1dfe6: Merge "Insufficient ProcessRecord cleanup when persistent process is killed"
* commit '7987d84e35fb8d7a20ef33786906968e8b7f2dc2':
  Insufficient ProcessRecord cleanup when persistent process is killed
2014-03-18 18:42:45 +00:00
Dianne Hackborn
7987d84e35 am d1d91eca: am 7cb1dfe6: Merge "Insufficient ProcessRecord cleanup when persistent process is killed"
* commit 'd1d91eca3e78f2074b110a0e3530aeff6deef6fe':
  Insufficient ProcessRecord cleanup when persistent process is killed
2014-03-18 18:36:53 +00:00
Dianne Hackborn
d1d91eca3e am 7cb1dfe6: Merge "Insufficient ProcessRecord cleanup when persistent process is killed"
* commit '7cb1dfe690b2d700ce212712287dfd59c2c8e43f':
  Insufficient ProcessRecord cleanup when persistent process is killed
2014-03-18 11:31:34 -07:00
Dianne Hackborn
7cb1dfe690 Merge "Insufficient ProcessRecord cleanup when persistent process is killed" 2014-03-18 18:28:16 +00:00
Xia Wang
01f03b50fb Fix state transition verification.
When there is connectivity state change, the network states could be broadcasted multiple times.
The state transition should consider that.

Bug: 13277256
Change-Id: I3d400900a0e2454f9d198629f1c062cbb15bdcd8
(cherry picked from commit 71aae0b6fd1bb9204b81c2e9447f3544c29579c4)
2014-03-18 18:23:05 +00:00
Ruben Brunk
6dc379c7bd hal3: Add missing available mode tags.
Change-Id: I588aacade5c5638967970e2e7eb04924c0ea9cc7
2014-03-18 11:13:44 -07:00