136989 Commits

Author SHA1 Message Date
Geoff Mendal
33b194a114 Import translations. DO NOT MERGE
Change-Id: I745acacd32934fbdcd114bc8cd4b8ca97898f486
Auto-generated-cl: translation import
2014-05-28 10:13:28 -07:00
Jorim Jaggi
703e66895e am 5a467b12: Merge "Appear animation for PIN view." into lmp-preview-dev
* commit '5a467b12d19af0538eb7762138bb06c9d5a73727':
  Appear animation for PIN view.
2014-05-28 15:37:14 +00:00
Jorim Jaggi
d5b71cbd7b Merge "Appear animation for PIN view." into lmp-preview-dev 2014-05-28 15:34:34 +00:00
Jorim Jaggi
15a77f7da8 Appear animation for PIN view.
Bug: 15163546
Change-Id: I05bc2920cc6e3d19ab64b8b43417b328552e9e2a
2014-05-28 17:31:33 +02:00
Christoph Studer
dedb76b76d am 38cf7798: SysUI: Fix bug where ZEN\'d notification wasn\'t updated
* commit '38cf77988ef16a2fafdc581aa563c49e3d266941':
  SysUI: Fix bug where ZEN'd notification wasn't updated
2014-05-28 14:47:05 +00:00
George Mount
854ed1c4e2 am 27d805ea: Merge "Use activity transitions when launched from fragments." into lmp-preview-dev
* commit '27d805ea6fb5aa3dbe46d4f8af86c46bce523760':
  Use activity transitions when launched from fragments.
2014-05-28 14:42:01 +00:00
George Mount
7a63a3d19d am 37568b6b: (-s ours) Merge "fixed mIsReturning initialized too late. DO NOT MERGE." into lmp-preview-dev
* commit '37568b6b7733308403cfa29125897492cfb2fd62':
  fixed mIsReturning initialized too late. DO NOT MERGE.
2014-05-28 14:41:56 +00:00
Christoph Studer
e35896885e SysUI: Fix bug where ZEN'd notification wasn't updated
Bug: 15131411
Change-Id: If6a149a04b34b63052797bbadb3a6fde18c675cd
2014-05-28 16:40:18 +02:00
Christoph Studer
8a766c6ae6 am 47b43918: Merge "SysUI: Reflect notification ranking" into lmp-preview-dev
* commit '47b439181075416ec46667239215102becde7afd':
  SysUI: Reflect notification ranking
2014-05-28 14:37:55 +00:00
George Mount
1cc3e2e7a0 Merge "Use activity transitions when launched from fragments." into lmp-preview-dev 2014-05-28 14:37:34 +00:00
George Mount
f0ebc5dc21 Merge "fixed mIsReturning initialized too late. DO NOT MERGE." into lmp-preview-dev 2014-05-28 14:37:19 +00:00
Selim Cinek
9d4e691174 am 807a8155: Introduced animations for the clipTopAmount of notifications.
* commit '807a81552eae005882c65df2c01ce2bed9478f4a':
  Introduced animations for the clipTopAmount of notifications.
2014-05-28 14:34:03 +00:00
Christoph Studer
67e83d5754 Merge "SysUI: Reflect notification ranking" into lmp-preview-dev 2014-05-28 14:33:06 +00:00
Selim Cinek
708a6c120d Introduced animations for the clipTopAmount of notifications.
Bug: 14081264
Change-Id: I09ca8161807d9dea7ca118601ddff9a28c373de5
2014-05-28 14:23:57 +00:00
Selim Cinek
844ec7b9ea am dc027553: Merge "Implemented basic camera and phone affordance." into lmp-preview-dev
* commit 'dc0275532fb6a5ce1cd0bb90966b22fc9a966bdb':
  Implemented basic camera and phone affordance.
2014-05-28 14:20:47 +00:00
Selim Cinek
e48bec9689 Merge "Implemented basic camera and phone affordance." into lmp-preview-dev 2014-05-28 14:17:25 +00:00
Selim Cinek
4c6969a512 Implemented basic camera and phone affordance.
The phone and the camera can now be accessed when swiping anywhere
on the background of the keyguard in the corresponding direction.

Bug: 15126905
Change-Id: If5551078676275764d5b7ddbca6e71cf008a1904
2014-05-28 15:56:22 +02:00
Christoph Studer
37fe693225 SysUI: Reflect notification ranking
Respect the ranking received via NotificationListenerService.

Bug: 15131411
Change-Id: I9e3a1530ffb5f4c29eeeccdbc910261d2eb72216
2014-05-28 15:53:34 +02:00
Christoph Studer
29fae7b394 am 1468841a: Merge "NoMan: Don\'t unbind system listeners" into lmp-preview-dev
* commit '1468841afc1431ddd0d3c843e41fa7a14c16e430':
  NoMan: Don't unbind system listeners
2014-05-28 12:13:14 +00:00
Christoph Studer
19a81a616f Merge "NoMan: Don't unbind system listeners" into lmp-preview-dev 2014-05-28 12:10:34 +00:00
Sungsoo Lim
e0a88629e1 am 5e73be4a: Merge "Fix a typo" into lmp-preview-dev
* commit '5e73be4affbf84a4935ac310b8323bfc944caa7e':
  Fix a typo
2014-05-28 10:09:40 +00:00
Griff Hazen
0cfc751a96 am f411d6b7: (-s ours) Merge "DO NOT MERGE Cherry-pick: Doc fixes for Notification.WearableExtender" into lmp-preview-dev
* commit 'f411d6b76348cce21a5e6c05cf6ac7126c620f3b':
  DO NOT MERGE Cherry-pick: Doc fixes for Notification.WearableExtender
2014-05-28 10:09:34 +00:00
Sungsoo Lim
d3ee3ca90c Merge "Fix a typo" into lmp-preview-dev 2014-05-28 09:37:29 +00:00
Jinsuk Kim
b0674f0f7c Fix a couple of bugs in CEC services
- Correct conversion for byte to int for cec opcode
- Use the right Handler.obtainMessage() to pass an integer variable

Change-Id: Ie3e86225f1702decce454aeb197911a371f51c17
2014-05-28 09:30:39 +00:00
Lorenzo Colitti
af878b4e3c Merge "Support disconnecting while trying to connect." 2014-05-28 07:40:50 +00:00
Lorenzo Colitti
9a6a11ae1e Support disconnecting while trying to connect.
Currently, once a NetworkAgent has decided to connect, there's
no way to disconnect without first connecting and having
ConnectivityService tear down the connection. This is suboptimal
because it causes the transport to keep retrying even if it knows
that it will not be able to connect.

Instead, allow the transport to abort a connection request that's
in progress, as long as the agent is not yet registered with
ConnectivityService.

Also add locking to evalScores. evalScores should already have
been taking a lock, because it accesses member variables that are
also accessed by the send*methods.

Bug: 15295359
Change-Id: I913c341bdfc50be9c23b632399f53168e754c1c0
2014-05-28 07:35:24 +00:00
Sungsoo Lim
a2c901d430 Fix a typo
Change-Id: I93e7e38a2e3502883b64c38567eaf5957c4197d2
2014-05-28 16:34:21 +09:00
Griff Hazen
197123db24 Merge "DO NOT MERGE Cherry-pick: Doc fixes for Notification.WearableExtender" into lmp-preview-dev 2014-05-28 07:31:26 +00:00
Matthew Williams
bc132a068b Merge "Implementation of TaskManager reschedule/cancel" 2014-05-28 02:52:00 +00:00
Fabrice Di Meglio
4a4a17aa11 am f52b9c8a: Merge "Revert "Only allow 1 Stack on Leanback-only devices"" into lmp-preview-dev
* commit 'f52b9c8a4aebf6d04b747e45c921fa4f51344b34':
  Revert "Only allow 1 Stack on Leanback-only devices"
2014-05-28 01:53:43 +00:00
Fabrice Di Meglio
bbd8e6ffc6 Merge "Revert "Only allow 1 Stack on Leanback-only devices"" into lmp-preview-dev 2014-05-28 01:50:08 +00:00
Fabrice Di Meglio
c82e7d30e3 Revert "Only allow 1 Stack on Leanback-only devices"
This is making a HH device (and probably others) in a reboot loop

This reverts commit 0cac71e9bdee1e9e6b2faafec0f9f894effbcb67.

===

See:

W/dalvikvm( 2320): threadid=1: thread exiting with uncaught exception (group=0x952d3f28)
E/AndroidRuntime( 2320): *** FATAL EXCEPTION IN SYSTEM PROCESS: main
E/AndroidRuntime( 2320): java.lang.RuntimeException: Failed to create service com.android.server.am.ActivityManagerService$Lifecycle: service constructor threw an exception
E/AndroidRuntime( 2320): 	at com.android.server.SystemServiceManager.startService(SystemServiceManager.java:89)
E/AndroidRuntime( 2320): 	at com.android.server.SystemServer.startBootstrapServices(SystemServer.java:304)
E/AndroidRuntime( 2320): 	at com.android.server.SystemServer.run(SystemServer.java:244)
E/AndroidRuntime( 2320): 	at com.android.server.SystemServer.main(SystemServer.java:161)
E/AndroidRuntime( 2320): 	at java.lang.reflect.Method.invokeNative(Native Method)
E/AndroidRuntime( 2320): 	at java.lang.reflect.Method.invoke(Method.java:515)
E/AndroidRuntime( 2320): 	at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:836)
E/AndroidRuntime( 2320): 	at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:631)
E/AndroidRuntime( 2320): 	at dalvik.system.NativeStart.main(Native Method)
E/AndroidRuntime( 2320): Caused by: java.lang.reflect.InvocationTargetException
E/AndroidRuntime( 2320): 	at java.lang.reflect.Constructor.constructNative(Native Method)
E/AndroidRuntime( 2320): 	at java.lang.reflect.Constructor.newInstance(Constructor.java:423)
E/AndroidRuntime( 2320): 	at com.android.server.SystemServiceManager.startService(SystemServiceManager.java:78)
E/AndroidRuntime( 2320): 	... 8 more
E/AndroidRuntime( 2320): Caused by: java.lang.NullPointerException
E/AndroidRuntime( 2320): 	at com.android.server.am.ActivityStackSupervisor.isLeanbackOnlyDevice(ActivityStackSupervisor.java:3508)
E/AndroidRuntime( 2320): 	at com.android.server.am.ActivityStackSupervisor.<init>(ActivityStackSupervisor.java:220)
E/AndroidRuntime( 2320): 	at com.android.server.am.ActivityManagerService.<init>(ActivityManagerService.java:2145)
E/AndroidRuntime( 2320): 	at com.android.server.am.ActivityManagerService$Lifecycle.<init>(ActivityManagerService.java:2073)
E/AndroidRuntime( 2320): 	... 11 more
E/AndroidRuntime( 2320): Error reporting crash
E/AndroidRuntime( 2320): java.lang.NullPointerException
E/AndroidRuntime( 2320): 	at com.android.internal.os.RuntimeInit$UncaughtHandler.uncaughtException(RuntimeInit.java:89)
E/AndroidRuntime( 2320): 	at java.lang.ThreadGroup.uncaughtException(ThreadGroup.java:693)
E/AndroidRuntime( 2320): 	at java.lang.ThreadGroup.uncaughtException(ThreadGroup.java:690)
E/AndroidRuntime( 2320): 	at dalvik.system.NativeStart.main(Native Method)
I/Process ( 2320): Sending signal. PID: 2320 SIG: 9
I/ServiceManager(  174): service 'power' died
I/ServiceManager(  174): service 'sensorservice' died

Change-Id: Ib90ae4dff6542d67f5827b100a3ab6158ce88ae2
2014-05-28 01:46:05 +00:00
Matthew Williams
b61c506a50 Implementation of TaskManager reschedule/cancel
Issues here:
"Reschedule" of an idle-mode task is not well-defined. In the
API I throw an error if you try to set a back-off policy on
an idle mode task.
Implementation-wise, i add a delay for a reschedule request of an
idle mode task. This means that if the phone's still in idle mode
after the delay they app will get a call back, but otherwise it'll
have to wait til the next one.

Implemented all API functions

Change-Id: I0264c2614cc52c28730abbcb1557f314f058f991
2014-05-27 18:36:54 -07:00
Dave Langemak
98d65c8aa3 am 56588ed0: (-s ours) Merge "DO NOT MERGE: revert change preventing NULL SSID in a WifiConfiguration" into lmp-preview-dev
* commit '56588ed08e007c7bf0c53fd211b1ebde7a24577c':
  DO NOT MERGE: revert change preventing NULL SSID in a WifiConfiguration
2014-05-28 00:53:39 +00:00
Dave Langemak
e2f8183077 Merge "DO NOT MERGE: revert change preventing NULL SSID in a WifiConfiguration" into lmp-preview-dev 2014-05-28 00:48:19 +00:00
vandwalle
f4672ad2e4 DO NOT MERGE: revert change preventing NULL SSID in a WifiConfiguration
bug: 15114340

Change-Id: Ic66363fc7781a1d65e5b8647843a752c048145a1
(cherry picked from commit 7aa05179b970e9f1346374f1e506a2cfeaff060a)
2014-05-28 00:48:04 +00:00
Griff Hazen
75c191a6e6 am 31418fd9: (-s ours) Merge "DO NOT MERGE Cherry-pick: Fix current.txt" into lmp-preview-dev
* commit '31418fd9965b0d79814f816eb898bae202a76e50':
  DO NOT MERGE Cherry-pick: Fix current.txt
2014-05-28 00:34:32 +00:00
Griff Hazen
14f5799ba9 DO NOT MERGE Cherry-pick: Doc fixes for Notification.WearableExtender
Change-Id: I22947e30d329e667079555ac4ac5f9b25d6bd3fa
2014-05-27 17:34:27 -07:00
Griff Hazen
62ba122e72 am 47d9f4c9: (-s ours) Merge "DO NOT MERGE Cherry-pick: Fix build: CheckBuild line for removed wearable package" into lmp-preview-dev
* commit '47d9f4c95339171ce85547a5c0d3dd8a5a758836':
  DO NOT MERGE Cherry-pick: Fix build: CheckBuild line for removed wearable package
2014-05-28 00:34:27 +00:00
Griff Hazen
092125dbbb am 4f19a458: (-s ours) Merge "DO NOT MERGE Cherry-pick: Api updates for wearable extensions to notifications" into lmp-preview-dev
* commit '4f19a458ab5de74ad17257594db09b02f0d5f9e0':
  DO NOT MERGE Cherry-pick: Api updates for wearable extensions to notifications
2014-05-28 00:34:15 +00:00
Griff Hazen
24f1e5342e Merge "DO NOT MERGE Cherry-pick: Fix current.txt" into lmp-preview-dev 2014-05-28 00:32:01 +00:00
Griff Hazen
9ed2e4e465 Merge "DO NOT MERGE Cherry-pick: Fix build: CheckBuild line for removed wearable package" into lmp-preview-dev 2014-05-28 00:31:53 +00:00
Griff Hazen
e6fff6e088 Merge "DO NOT MERGE Cherry-pick: Api updates for wearable extensions to notifications" into lmp-preview-dev 2014-05-28 00:31:46 +00:00
Jose Lima
ca7ddbfef7 am 00430954: Merge "Only allow 1 Stack on Leanback-only devices" into lmp-preview-dev
* commit '004309546b7efa188df56e58539e4227ed192cf7':
  Only allow 1 Stack on Leanback-only devices
2014-05-28 00:13:36 +00:00
Chris Craik
f87ec6a644 am 365dfe93: Merge "Update docs around empty/null outline behavior" into lmp-preview-dev
* commit '365dfe93dd3baab1417e20bc9ba7e3175600faa0':
  Update docs around empty/null outline behavior
2014-05-28 00:13:31 +00:00
Jose Lima
80962666b8 Merge "Only allow 1 Stack on Leanback-only devices" into lmp-preview-dev 2014-05-28 00:10:15 +00:00
Chris Craik
ddce68996b Merge "Update docs around empty/null outline behavior" into lmp-preview-dev 2014-05-28 00:08:58 +00:00
Igor Murashkin
5fe5bcaeaa am dc0230fc: Merge "camera2: Add partial results to the capture listener (API change)" into lmp-preview-dev
* commit 'dc0230fc450e8880fb640cd476f2248bf0a401e4':
  camera2: Add partial results to the capture listener (API change)
2014-05-27 23:57:36 +00:00
Igor Murashkin
79458826c6 Merge "camera2: Add partial results to the capture listener (API change)" into lmp-preview-dev 2014-05-27 23:54:21 +00:00
Jose Lima
a5c7e0f80f Only allow 1 Stack on Leanback-only devices
- For Leanback only devices we will force all activities to
   live in the same app stack. This is a design decision for the
   shy/gregarious changes we are planning to implement for
   leanback devices.

Change-Id: I201f56541ba22356e9598f09419ad41e588c74dc
2014-05-27 16:51:35 -07:00