136575 Commits

Author SHA1 Message Date
Yohei Yukawa
6c8ca8473a Merge "Consolidate the language-switching logic" 2014-05-23 09:15:16 +00:00
Yohei Yukawa
9b29d04565 Consolidate the language-switching logic
This CL does not change the existing behavior.
In I84291fd4a7d6192b, the IME rotation group is logically
devided into two groups, one is for IMEs that are declared as
supportsSwitchingToNextInputMethod == true, and the other is
IMEs that are not declared so. The problem is that the logic
was implemented with a single ime/subtype list where these two
kinds of IMEs are completely mixed. This makes the code
unnecessarily complex.
With this CL, these two rotation groups are actually managed
as two different collections separately. This allows us to
simplify the rotation logic as well as its test cases.
This CL is also a groundwork to implement smarter
language-switching logic that is applied to
language-switching-aware IMEs only.

BUG: 7043015
Change-Id: I7f08ec299ec41d614e2cd3912320687db1576e80
2014-05-23 18:02:42 +09:00
Yuhao Zheng
7c28c36634 Update Hotspot 2.0 SDK APIs
- Add / fix java docs
- Add some setters in WifiPasspointCredential for update use

Change-Id: Ifc287ab9d69ea9e02bf036f22171947fde9ee94a
2014-05-22 22:41:13 -07:00
Jungshik Jang
46038ae020 Merge "Add SendMessageCallback to Hdmi control service." 2014-05-23 03:18:29 +00:00
Jungshik Jang
d643f764f7 Add SendMessageCallback to Hdmi control service.
As we have separate IO thread, we should have async callback
mechanism to get result of send request.
For that, I added SendMessageCallback interface to HdmiControl
Service
Along with this, replace message-based IO handling with
post Runnable based one for consistency

Change-Id: I61cf5b751b4f2af3b34956060869f3512f161d11
2014-05-23 11:14:15 +09:00
Philip Milne
5a4a3e9358 Merge "Support for weights in GridLayout" 2014-05-23 01:29:07 +00:00
Jeff Brown
1dfce0cf64 Merge "Improve window orientation listener." 2014-05-23 01:26:24 +00:00
Jeff Brown
600f003133 Improve window orientation listener.
Take into account whether the device appeared to be overhead facing
down.  If so, suppress orientation changes until the device is tilted
back upright again.  This should improve behavior in situations such
as reading in bed and rolling over to one side.

Change-Id: I683515e1867626dacc71d90eaacb32e75ab41827
2014-05-22 18:23:14 -07:00
Zhijun He
db0f573386 am 76be7fc6: Merge "Camera2: Raw is not croppable" into lmp-preview-dev
* commit '76be7fc69daea6b9118ad5b4eccdd5e940ca401b':
  Camera2: Raw is not croppable
2014-05-23 00:47:03 +00:00
Amith Yamasani
a02574a09b Merge "Fix current.txt" 2014-05-23 00:46:02 +00:00
Amith Yamasani
e1bba9d469 Fix current.txt
Probably a bad merge from upstream

Change-Id: Ie262b0be6cecd7084cab2b0468820e9d5b9ea670
2014-05-22 17:44:39 -07:00
Zhijun He
2ecba24c48 Merge "Camera2: Raw is not croppable" into lmp-preview-dev 2014-05-23 00:42:14 +00:00
Philip Milne
87260844af Support for weights in GridLayout
Change-Id: I31993cb7da331e0bcf404e858f2438a579093e7d
2014-05-22 17:41:53 -07:00
Michael Wright
2a89b08eb1 Merge "Add ability to request unbuffered dispatching." 2014-05-23 00:40:12 +00:00
Michael Wright
4e8437387a Merge "Pack PointerCoords with BitSet." 2014-05-23 00:40:12 +00:00
Zhijun He
83e214ecd6 am 920e79b6: Merge "Camera2: Clarify shading map spec" into lmp-preview-dev
* commit '920e79b680e7329dbbd107da8c9118a763d43f87':
  Camera2: Clarify shading map spec
2014-05-23 00:39:36 +00:00
Zhijun He
6eb03e10b4 Merge "Camera2: Clarify shading map spec" into lmp-preview-dev 2014-05-23 00:35:58 +00:00
Dianne Hackborn
aa90295d20 am deca2a04: (-s ours) Merge "(DO NOT MERGE) Battery monitoring fixes:" into lmp-preview-dev
* commit 'deca2a041d13846158b0db92781b352ab473d9bc':
  (DO NOT MERGE) Battery monitoring fixes:
2014-05-23 00:11:11 +00:00
Eino-Ville Talvala
0324a95052 am 7e01420b: Merge "Camera2: New capture session interface" into lmp-preview-dev
* commit '7e01420b8e532694369fc885f83838fc527708dd':
  Camera2: New capture session interface
2014-05-23 00:11:05 +00:00
Jorim Jaggi
c877f6ab11 am 95b404dc: (-s ours) DO NOT MERGE Move clock and top padding while dismissing Keyguard.
* commit '95b404dc1f0c4f74824de401537d51e73d84e6e8':
  DO NOT MERGE Move clock and top padding while dismissing Keyguard.
2014-05-23 00:11:04 +00:00
Ihab Awad
8b15da393a am f346ac3b: (-s ours) DO NOT MERGE. Fix invalid format specifier in log message
* commit 'f346ac3b119b71f083067ee73f03955fdd037035':
  DO NOT MERGE. Fix invalid format specifier in log message
2014-05-23 00:11:04 +00:00
The Android Automerger
b11ee52864 am 0c82c484: merge in master-release history after reset to 244e25ef817ddf48727845f14d08b2b787e1ff89
* commit '0c82c484c475422aedf17a8fee5ce3fb1b4290a8': (121 commits)
  am 82ec8c58: am ab3d85ab: am 838b1e22: Merge "Fix NPE in PackageManagerService."
  Fixing bugs due to the new custom accessibility action APIs.
  Should not be closing system dialogs when Recents is hidden. (Bug 15109551)
  Fix a runtime break caused by merge conflict
  Fix typo causing immersive mode transition flickering.
  Fix 64 bit long pointer size for media scanning
  fix argument order in call to SkBlurDrawLooper constructor
  Fix recording of wake_lock_in.
  Fix not being able to pull down status bar.
  Add net.dns system properties
  Battery stats more wake history, power save mode.
  Disable texture atlas
  Fix reboot loop due to NPE.
  Quick fix to ensure mipmap doesn't get stripped by AAPT
  Comment out some new netd calls to fix networking.
  Revert "If PackageUsage information is missing, treat as first boot and compile everything"
  Add api for getting the parent of a profile.
  If PackageUsage information is missing, treat as first boot and compile everything
  Allow setting password restrictions from a managed profile.
  Fix badness from proxy refactoring.
  ...
2014-05-23 00:11:04 +00:00
Chris Craik
d490aa4260 Merge "Inspect SkShader to determine hw shader." 2014-05-23 00:03:46 +00:00
Jeff Sharkey
5ec9aed64c Merge "Offer to stream and fsync() install sessions." 2014-05-22 23:52:41 +00:00
Zhijun He
9e6d1880c2 Camera2: Raw is not croppable
Update spec doc to clarify that raw stream is not croppable.

Bug: 15168075
Change-Id: I4ffa8e2a06acd17913426ba37744bb9df1bc7330
2014-05-22 16:47:35 -07:00
Dianne Hackborn
caa3abd3d1 Merge "(DO NOT MERGE) Battery monitoring fixes:" into lmp-preview-dev 2014-05-22 23:44:12 +00:00
Dianne Hackborn
2932513181 (DO NOT MERGE) Battery monitoring fixes:
- Improve monitoring of level changes to not be confused
  when it goes up while draining or down while charging.
- Put back in connectivity service code to tell battery
  stats about the interfaces.
- Turn back on reporting of mobile radio active state
  from the RIL.
- Fix bug in marshalling/unmarshalling that would cause
  the UI to show bad data.

Change-Id: I733ef52702894cca81a0813eccdfc1023e546fce
2014-05-22 16:43:17 -07:00
Zhijun He
fa7c755a92 Camera2: Clarify shading map spec
The existing spec is unclear about shading map calculation for both application
developer and hal implementers, need more clarification.

Also fix a typo in tonemap.mode.

Bug: 15168075
Change-Id: I7f38ccf6aa6938fdac9f64e95deddc0188025d08
2014-05-22 16:36:02 -07:00
Griff Hazen
6b7b34849a Merge commit 'e5b73ae2' into manualmerge
Conflicts:
	api/current.txt
	core/java/android/app/Notification.java

Change-Id: I3141ed6b456107b7e5aa8c0c9c98ffc1d77fdf75
2014-05-22 16:05:19 -07:00
Jeff Sharkey
78cc340c2d Offer to stream and fsync() install sessions.
Installers are interested in both streaming APK data and establishing
a happens-after relationship to support resuming downloads after a
process kill or battery pull.

This exposes a generic OutputStream for writing, and hooks up flush()
to be a blocking call which returns only when all outstanding write()
data has been fsync()'ed to disk.

Tests to verify behavior.

Bug: 14975160
Change-Id: I38289867c80ac659163bb0c2158ef12d99cc570d
2014-05-22 15:54:16 -07:00
Griff Hazen
e5b73ae234 am c3104157: Api updates for wearable extensions to notifications
* commit 'c3104157d8f12238b0ac8cf6c6f963dadb44167c':
  Api updates for wearable extensions to notifications
2014-05-22 22:44:35 +00:00
Christopher Tate
4e7a225589 Merge "Don't crash uninstalling updates to system apps" 2014-05-22 22:11:06 +00:00
Eino-Ville Talvala
88aca033ff Merge "Camera2: New capture session interface" into lmp-preview-dev 2014-05-22 21:56:55 +00:00
Christopher Tate
f71ece48a1 Don't crash uninstalling updates to system apps
Bug 15167960

Change-Id: I606638292e524078f2859ba6be0a4861a4e01c00
2014-05-22 14:55:11 -07:00
Jorim Jaggi
7d16bb1e32 DO NOT MERGE Move clock and top padding while dismissing Keyguard.
Such translation. Much alpha. Very parallax. Wow.

Bug: 15163546
Change-Id: Id419acced94083cf6cd7abebbcf1d5a08439b0a7
(cherry picked from commit c42bdc3ba9493efe68b9ed39fbd55c84ba175185)
2014-05-22 21:43:46 +00:00
Griff Hazen
c3104157d8 Api updates for wearable extensions to notifications
1. Move Extender outside of Builder
2. Rename apply/applyTo to extend
3. Move Wearable extenders into Notification.java
4. Collapse Builder model into single classes
5. Use Bundle for storage: no new parcelable types.

Minor fix to RemoteInput to use flags int for boolean options.

Change-Id: I40012fd0458ec103eabf75ed4c91f636e02f4c8f
2014-05-22 14:38:36 -07:00
Jorim Jaggi
b37637b6fd Merge "Move clock and top padding while dismissing Keyguard." 2014-05-22 21:37:17 +00:00
Santos Cordon
5c013261a9 Merge "Adding ITelecommService definition for Telecomm." 2014-05-22 21:21:41 +00:00
vandwalle
567d3f461b Merge "revert change preventing NULL SSID in a WifiConfiguration" 2014-05-22 20:59:45 +00:00
Eino-Ville Talvala
cca00c614c Camera2: New capture session interface
- Add CameraCaptureSession for all operations that require a
  valid camera configuration
- Deprecate methods in CameraDevice that are moving to CameraCaptureSession
- Document new semantics

Bug: 14964443
Change-Id: I53b2b71ed2b746cfcf76a01483f499765eb5047b
2014-05-22 20:52:36 +00:00
Ihab Awad
42b30e1b83 DO NOT MERGE. Fix invalid format specifier in log message
Bug: 15154713
Change-Id: Ia1f45eb568b31f02a7443def0dc9ef32a21e7f02
(cherry picked from commit 8523607b6e4927d034e47681174843f22308e34a)
2014-05-22 20:36:16 +00:00
Jorim Jaggi
afc11f196c Move clock and top padding while dismissing Keyguard.
Such translation. Much alpha. Very parallax. Wow.

Bug: 15163546
Change-Id: Id419acced94083cf6cd7abebbcf1d5a08439b0a7
2014-05-22 21:58:10 +02:00
Raph Levien
186213f28c Merge "Roboto v2" 2014-05-22 19:37:03 +00:00
Lorenzo Colitti
a8aad1b65f Merge "Fix Ethernet documentation." 2014-05-22 19:22:57 +00:00
Winson Chung
f13cd857e0 Merge "Removing unnecessary public values. (Bug 14995844)" 2014-05-22 19:20:14 +00:00
Aravind Akella
94e4d29eff Merge "Hide Sensor.getRequiredPermission API." 2014-05-22 19:11:53 +00:00
John Spurlock
bba3f86f22 Merge "Honor Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS." 2014-05-22 19:03:08 +00:00
Jae Seo
b138300a27 Merge "Add more columns to TV metadata to enable newly requested use cases" 2014-05-22 19:02:46 +00:00
vandwalle
559486f081 revert change preventing NULL SSID in a WifiConfiguration
bug: 15114340

Change-Id: Ic66363fc7781a1d65e5b8647843a752c048145a1
2014-05-22 11:54:44 -07:00
Lorenzo Colitti
9c1ccc54a5 Fix Ethernet documentation.
1. Remove incorrect @return tag for void function.
2. Fix build breakage by removing the reference to
   #ETHERNET_SERVICE, which is hidden.

Change-Id: Ia893464bafc8257e48e0bd710d27954b535fcece
2014-05-22 11:51:27 -07:00