drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
116,004 Commits 1 Branch 0 Tags
Commit Graph

116004 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
f04e66953b am 501633dd: (-s ours) am f56d8694: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '501633dd45858159255447f7b4118a80b44bbcae':
  Import translations. DO NOT MERGE
 2013-10-22 12:55:15 -07:00
Baligh Uddin
501633dd45 am f56d8694: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'f56d8694f224ef7082c48a227d18d5612a4cfe11':
  Import translations. DO NOT MERGE
 2013-10-22 12:52:16 -07:00
Baligh Uddin
f56d8694f2 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-22 19:48:05 +00:00
Craig Mautner
39308006d6 am e609a677: am 74082349: Merge "Make sure mFocusedStack is never the home stack." into klp-dev 
* commit 'e609a677f8ff02aa163d6136370b9fee0dec9096':
  Make sure mFocusedStack is never the home stack.
 2013-10-22 10:42:48 -07:00
Craig Mautner
e609a677f8 am 74082349: Merge "Make sure mFocusedStack is never the home stack." into klp-dev 
* commit '7408234985707f98d4800cdd43a6fcaa35cb628a':
  Make sure mFocusedStack is never the home stack.
 2013-10-22 10:39:51 -07:00
Craig Mautner
7408234985 Merge "Make sure mFocusedStack is never the home stack." into klp-dev 2013-10-22 17:36:57 +00:00
Craig Mautner
d1bbdb462a Make sure mFocusedStack is never the home stack. 
There were circumstances where mFocusedStack could be assigned the
home stack. If this were ever to occur then all subsequent tasks would
be put on the home stack. This fix ensures that there is no way that
mFocusedStack will ever be assigned to the home task.

Fixes bug 11271189.

Change-Id: I7ddd9b6bcbf2787cbe2f44b461ad057ae2241f00
 2013-10-22 09:53:20 -07:00
Roman Nurik
b1f8f31b4c am 1330dfa8: am acc642bc: Merge "Add Nexus 5 to Device Art Generator." into klp-dev 
* commit '1330dfa8c73f05dc076cc822dd46805a1ac31200':
  Add Nexus 5 to Device Art Generator.
 2013-10-22 09:12:25 -07:00
Roman Nurik
1330dfa8c7 am acc642bc: Merge "Add Nexus 5 to Device Art Generator." into klp-dev 
* commit 'acc642bce9e1ca1782c8f93131d944d4a2f92be0':
  Add Nexus 5 to Device Art Generator.
 2013-10-22 09:09:05 -07:00
Roman Nurik
acc642bce9 Merge "Add Nexus 5 to Device Art Generator." into klp-dev 2013-10-22 16:06:20 +00:00
Craig Mautner
e0bebd294e am 0857e3b9: am 24ba3234: Merge "Do not delete stacks that are not empty." into klp-dev 
* commit '0857e3b97a12bbd9f4d333b620bd7dfbd275c812':
  Do not delete stacks that are not empty.
 2013-10-21 21:38:12 -07:00
Craig Mautner
0857e3b97a am 24ba3234: Merge "Do not delete stacks that are not empty." into klp-dev 
* commit '24ba3234caa27185aa34aab5b88190f85f9a8d75':
  Do not delete stacks that are not empty.
 2013-10-21 21:34:59 -07:00
Craig Mautner
24ba3234ca Merge "Do not delete stacks that are not empty." into klp-dev 2013-10-22 04:31:12 +00:00
Craig Mautner
19d9bd54d3 Do not delete stacks that are not empty. 
The possibility existed that an activity was set to a task that it was
already being set to. If that were to happen, and it was the only
activity in the only task of the stack the stack would be deleted.
This fixes that situation and logs it as well to confirm that it does
fix bug 11272935. Logging to be deleted upon successful monkey run
exhibiting the log.

Change-Id: I436fdcc9a3734adad81d3ef90f29b93b3ac4dfcd
 2013-10-21 20:05:26 -07:00
Jeff Brown
f52b9f0001 am c024edfb: am 534103d4: Merge "Fix issues catching up to touch events after a short pause." into klp-dev 
* commit 'c024edfb085e42945f7021adb9d4aaf07dbc2f46':
  Fix issues catching up to touch events after a short pause.
 2013-10-21 18:09:01 -07:00
Jeff Brown
c024edfb08 am 534103d4: Merge "Fix issues catching up to touch events after a short pause." into klp-dev 
* commit '534103d4004ffd102609a09e0b55d329adbc1a57':
  Fix issues catching up to touch events after a short pause.
 2013-10-21 18:06:23 -07:00
Robert Greenwalt
63dd9d2f55 am 4802c6da: am 4d8a8392: Merge "Don\'t set same country code on supplicant again and again" into klp-dev 
* commit '4802c6da7f044e7bd5927601a78713130cf157c0':
  Don't set same country code on supplicant again and again
 2013-10-21 18:05:05 -07:00
Christopher Tate
1c565bfe53 am 6fd88844: am 7eb83c59: Merge "Preserve window sizes when rebatching alarms" into klp-dev 
* commit '6fd8884402659c1cf2fd6e638a36fa69396be4fa':
  Preserve window sizes when rebatching alarms
 2013-10-21 18:05:01 -07:00
Jeff Brown
534103d400 Merge "Fix issues catching up to touch events after a short pause." into klp-dev 2013-10-22 01:03:55 +00:00
Robert Greenwalt
4802c6da7f am 4d8a8392: Merge "Don\'t set same country code on supplicant again and again" into klp-dev 
* commit '4d8a8392f7a452479f228fbe08e43fa4145dda56':
  Don't set same country code on supplicant again and again
 2013-10-21 18:01:39 -07:00
Christopher Tate
6fd8884402 am 7eb83c59: Merge "Preserve window sizes when rebatching alarms" into klp-dev 
* commit '7eb83c597fadaa41052c96826c7ca3e53aca9a3d':
  Preserve window sizes when rebatching alarms
 2013-10-21 18:01:36 -07:00
Robert Greenwalt
4d8a8392f7 Merge "Don't set same country code on supplicant again and again" into klp-dev 2013-10-22 00:59:40 +00:00
Christopher Tate
7eb83c597f Merge "Preserve window sizes when rebatching alarms" into klp-dev 2013-10-22 00:58:42 +00:00
Vinit Deshapnde
da40d92766 Don't set same country code on supplicant again and again 
Setting the same code is redundant, and may cause supplicant to drop
currently connected connection.

Bug: 11303252
Change-Id: I1af57b3af2d0b8cc51939a8b9872fb3fe0105a91
 2013-10-21 17:55:12 -07:00
Christopher Tate
3e04b47216 Preserve window sizes when rebatching alarms 
The existing code wasn't retaining the requested window bounds, if any,
and so could wind up rebatching alarms into much longer potential
delivery windows than originally demanded by the caller.  This could
wind up delivering alarms outside their designated windows entirely.

Bug 11324357

Change-Id: I4d418cd08702e397b3c7692b412d4bf51d5d9e4b
 2013-10-21 17:51:31 -07:00
Jim Miller
6ed3ce0b71 am 253f7295: am 1693f6a5: Prevent having multiple seek runnables in flight. 
* commit '253f7295c820bf960c0411288495145582a0d3b2':
  Prevent having multiple seek runnables in flight.
 2013-10-21 17:27:25 -07:00
Jim Miller
253f7295c8 am 1693f6a5: Prevent having multiple seek runnables in flight. 
* commit '1693f6a5639a1f993bdc1dca9dade5e3eb3c14f2':
  Prevent having multiple seek runnables in flight.
 2013-10-21 17:23:54 -07:00
Adam Lesinski
42ad5ef155 am ed51f0ac: am e17e0f0e: Merge "Fix jank for translucent window transitions" into klp-dev 
* commit 'ed51f0ac8f264c83bbafa397f8ee9a83ab9ab033':
  Fix jank for translucent window transitions
 2013-10-21 17:20:15 -07:00
Jim Miller
1693f6a563 Prevent having multiple seek runnables in flight. 
This fix ensures that only one runnable is running at a time, no matter how
many events come in.  There's probably a better way to do this, but this is a
safe fix.

Fixes bug 11307391

Change-Id: I007c95062b20285571f39603c95fb9174b9a2da3
 2013-10-21 17:17:40 -07:00
Adam Lesinski
ed51f0ac8f am e17e0f0e: Merge "Fix jank for translucent window transitions" into klp-dev 
* commit 'e17e0f0e6cfdf32a8b6d142f49819ca9c90be69c':
  Fix jank for translucent window transitions
 2013-10-21 17:16:51 -07:00
Adam Lesinski
e17e0f0e6c Merge "Fix jank for translucent window transitions" into klp-dev 2013-10-22 00:13:17 +00:00
Adam Lesinski
43d8d3355b Fix jank for translucent window transitions 
When a translucent window is closing, the transition
animation to Launcher is janky because Launcher is
expected to be 'opening' but it has always been open
underneath the translucent window. Therefore, the
animation applied to the translucent app appears
janky.

bug:11253262
Change-Id: I9b6af3291d119e6927401f63785b12f25573f4eb
 2013-10-21 16:41:48 -07:00
Jim Miller
059d89a1a4 am 262e5281: am 644696f0: Merge "Workaround for corner case in TransitionManager" into klp-dev 
* commit '262e5281d7d678c765ae2500dc05c742946c716b':
  Workaround for corner case in TransitionManager
 2013-10-21 16:14:58 -07:00
Jim Miller
262e5281d7 am 644696f0: Merge "Workaround for corner case in TransitionManager" into klp-dev 
* commit '644696f0a0bee1714868b9e9cf351f1380e68f39':
  Workaround for corner case in TransitionManager
 2013-10-21 16:12:18 -07:00
Jim Miller
644696f0a0 Merge "Workaround for corner case in TransitionManager" into klp-dev 2013-10-21 23:10:01 +00:00
Matthew Xie
46cfa69137 am 9a53fbe4: am ce39e8ce: Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev 
* commit '9a53fbe44fcf4b3fe740e8b68ad16f2016aca62c':
  Change pairing api/intent permission from PRIVILEGED to ADMIN
 2013-10-21 16:07:53 -07:00
Matthew Xie
9a53fbe44f am ce39e8ce: Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev 
* commit 'ce39e8ced8bcbc6663d420bea66280f8b438e027':
  Change pairing api/intent permission from PRIVILEGED to ADMIN
 2013-10-21 16:05:26 -07:00
Matthew Xie
ce39e8ced8 Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev 2013-10-21 22:58:53 +00:00
Jim Miller
ee186de4b2 Workaround for corner case in TransitionManager 
This works around a problem where removing a review with unfinished
transitions results in leaked object references to KeyguardTransportControlView.

The workaround disables transitions until we have a better fix.

Fixes bug 11307391

Change-Id: I1df82f2c6f1cd9f5c9076d4c76cfd4aec3b6806c
 2013-10-21 15:36:54 -07:00
Jay Shrauner
4eaca59766 am 3e33d5a7: am 8d51c2f6: Merge "Fix CountryDetector NPE" into klp-dev 
* commit '3e33d5a769885dcd7f19f386f165810881e22c16':
  Fix CountryDetector NPE
 2013-10-21 15:31:05 -07:00
Jay Shrauner
3e33d5a769 am 8d51c2f6: Merge "Fix CountryDetector NPE" into klp-dev 
* commit '8d51c2f6fa628cc8f3e4d182df2dafdb7cbea48c':
  Fix CountryDetector NPE
 2013-10-21 15:27:43 -07:00
Jay Shrauner
8d51c2f6fa Merge "Fix CountryDetector NPE" into klp-dev 2013-10-21 22:23:55 +00:00
Roman Nurik
e81bd59d01 Add Nexus 5 to Device Art Generator. 
Change-Id: I101ec82b1d50c6437e96165fb8ac6c73d451ff84
 2013-10-21 18:11:58 -04:00
Matthew Xie
ac2c6c3a16 Change pairing api/intent permission from PRIVILEGED to ADMIN 
The APIs are createBond, setPin, setPairingConfirmation
The intent is ACTION_PAIRING_REQUEST
bug 11101076

Change-Id: I3a314efd973b3ce078ab5347159c336f222d9f15
 2013-10-21 14:56:33 -07:00
Jason Monk
85bb9056fc am 7d167181: am 0aeca872: Merge "Make setting PAC require CONNECTIVITY_INTERNAL" into klp-dev 
* commit '7d16718105fc2ddf2fa2238df601f8316193e3a5':
  Make setting PAC require CONNECTIVITY_INTERNAL
 2013-10-21 14:47:24 -07:00
Jason Monk
7d16718105 am 0aeca872: Merge "Make setting PAC require CONNECTIVITY_INTERNAL" into klp-dev 
* commit '0aeca87233950933f4f48003f4ebaba342ee2ab8':
  Make setting PAC require CONNECTIVITY_INTERNAL
 2013-10-21 14:44:08 -07:00
Jason Monk
0aeca87233 Merge "Make setting PAC require CONNECTIVITY_INTERNAL" into klp-dev 2013-10-21 21:40:17 +00:00
Winson Chung
29ffafb62c am 5b0da90a: am 1bab99c8: Merge "DO NOT MERGE Fix null pointer exception when updating rotation tile. (Bug 11111473)" into klp-dev 
* commit '5b0da90a68d00724da422b9d5e4b24244c101517':
  DO NOT MERGE Fix null pointer exception when updating rotation tile. (Bug 11111473)
 2013-10-21 14:23:27 -07:00
Winson Chung
5b0da90a68 am 1bab99c8: Merge "DO NOT MERGE Fix null pointer exception when updating rotation tile. (Bug 11111473)" into klp-dev 
* commit '1bab99c8cebbf23379c2ccad9188da1dce6fef09':
  DO NOT MERGE Fix null pointer exception when updating rotation tile. (Bug 11111473)
 2013-10-21 14:20:57 -07:00
Winson Chung
1bab99c8ce Merge "DO NOT MERGE Fix null pointer exception when updating rotation tile. (Bug 11111473)" into klp-dev 2013-10-21 21:16:23 +00:00