185825 Commits

Author SHA1 Message Date
Geoff Mendal
273c6f2e00 Import translations. DO NOT MERGE
Change-Id: I0acc044f88445fe6d48f84bcaee6a971409ad144
Auto-generated-cl: translation import
2015-03-21 02:02:20 -05:00
Geoff Mendal
ed4267d0d6 Merge "Import translations. DO NOT MERGE" 2015-03-21 06:57:46 +00:00
Geoff Mendal
3997c05782 Import translations. DO NOT MERGE
Change-Id: Ia2267065864b0a7ff750e2956f0bab7507b8c32c
Auto-generated-cl: translation import
2015-03-20 23:56:54 -07:00
Geoff Mendal
ff88dba81c Merge "Import translations. DO NOT MERGE" 2015-03-21 06:54:25 +00:00
Geoff Mendal
672aab38b6 Import translations. DO NOT MERGE
Change-Id: I3b918278be7f5c4849a49821ab35385abaf440e4
Auto-generated-cl: translation import
2015-03-20 23:53:59 -07:00
Geoff Mendal
f2ab5f6e55 Merge "Import translations. DO NOT MERGE" 2015-03-21 06:43:42 +00:00
Geoff Mendal
ed963393c3 Import translations. DO NOT MERGE
Change-Id: I05e39854eb2d78c22192faebdbfab579831b162a
Auto-generated-cl: translation import
2015-03-20 23:42:27 -07:00
Geoff Mendal
2b37ae6e3c Merge "Import translations. DO NOT MERGE" 2015-03-21 06:40:03 +00:00
Geoff Mendal
d397039876 Import translations. DO NOT MERGE
Change-Id: I43f19279f08e1c5b204836ee69e715c1f889acc7
Auto-generated-cl: translation import
2015-03-20 23:39:30 -07:00
Geoff Mendal
23d3a54673 Merge "Import translations. DO NOT MERGE" 2015-03-21 06:37:07 +00:00
Geoff Mendal
6536f65afb Import translations. DO NOT MERGE
Change-Id: Ifac523c71970a048540fcfdbdb81b1b6d02e630a
Auto-generated-cl: translation import
2015-03-20 23:36:23 -07:00
Geoff Mendal
b72ae7a8f3 Merge "Import translations. DO NOT MERGE" 2015-03-21 06:30:13 +00:00
Geoff Mendal
c549f8f4a9 Import translations. DO NOT MERGE
Change-Id: I4f9a97623c88e65d32873d996f29725024d9f37e
Auto-generated-cl: translation import
2015-03-20 23:28:43 -07:00
Geoff Mendal
3f7aee5808 Merge "Import translations. DO NOT MERGE" 2015-03-21 06:26:41 +00:00
Geoff Mendal
c6d8b937d0 Import translations. DO NOT MERGE
Change-Id: I274a842ea3e3811e64c35791e2eb3a7603509184
Auto-generated-cl: translation import
2015-03-20 23:25:50 -07:00
Geoff Mendal
d4f45766fa Import translations. DO NOT MERGE
Change-Id: I6ead0981923edc795695e1419ae5dfff28c5fb5c
Auto-generated-cl: translation import
2015-03-20 23:24:42 -07:00
Geoff Mendal
427de1b691 Merge "Import translations. DO NOT MERGE" 2015-03-21 06:23:56 +00:00
Geoff Mendal
b91a3309b6 Import translations. DO NOT MERGE
Change-Id: I5d8cc25c94f71a9f3f14307fbb2f09e0779f4d6e
Auto-generated-cl: translation import
2015-03-20 23:23:01 -07:00
Geoff Mendal
ddb47ba186 Merge "Import translations. DO NOT MERGE" 2015-03-21 06:20:27 +00:00
Geoff Mendal
c98146b556 Import translations. DO NOT MERGE
Change-Id: Iac1b987545c21b2e4b29787b13fbaf3414a6a2fb
Auto-generated-cl: translation import
2015-03-20 23:20:04 -07:00
Geoff Mendal
24284b578d Merge "Import translations. DO NOT MERGE" 2015-03-21 06:17:48 +00:00
Geoff Mendal
0ae2b12c29 Import translations. DO NOT MERGE
Change-Id: I1bdbaf86f8f5fd957938b9d186e824d115054e10
Auto-generated-cl: translation import
2015-03-20 23:17:07 -07:00
Geoff Mendal
1f9bad3cb9 Import translations. DO NOT MERGE
Change-Id: I59ad105e99dbd4c8bd19c4e94eecd6e19425345a
Auto-generated-cl: translation import
2015-03-20 23:15:45 -07:00
Geoff Mendal
1e0cde0ada Merge "Import translations. DO NOT MERGE" 2015-03-21 06:15:15 +00:00
Ruben Brunk
7559a98ef1 Merge "camera2: Remove ProCamera." 2015-03-21 06:14:19 +00:00
Geoff Mendal
9bf5801545 Import translations. DO NOT MERGE
Change-Id: I6fd85e17705e81326d3440fc3ef2180683c968b3
Auto-generated-cl: translation import
2015-03-20 23:14:05 -07:00
Geoff Mendal
43c0e5bf3c Import translations. DO NOT MERGE
Change-Id: Ia6706068d602792edfbbca15f3832b0447b9b13e
Auto-generated-cl: translation import
2015-03-20 23:11:02 -07:00
Ruben Brunk
2c2546a296 camera2: Remove ProCamera.
Bug: 19186859
Change-Id: I4aaadb53db65b479f92cbb3c05329d1e40317900
2015-03-20 22:38:54 -07:00
Zhijun He
960a285a7e Merge "ImageReader/Writer: Add ImageWriter and Opaque ImageReader" 2015-03-21 01:25:03 +00:00
Zhijun He
f6a09e5106 ImageReader/Writer: Add ImageWriter and Opaque ImageReader
ImageWriter/Reader API change, including below changes
* Interface for Opaque ImageReader
* ImageWriter Interface and implementation
* Image class minor update to support ImageWriter opaque ImageReader

detach/attach interface are defined but yet to be implemented.

Change-Id: Ic7c0d2df73c80b1a81a7316d8c4556bf7703c309
2015-03-20 18:19:58 -07:00
Tim Kilbourn
66d2bbf1e1 Fix jni method signature.
Bug: 19870217
Change-Id: I8db1bb8cb8af2df73e899b861c91f090c068d127
2015-03-20 16:56:13 -07:00
Alan Viverette
6194d728cf Correctly apply android:theme attribute from <include> tag
Bug: 19865544
Change-Id: I6b50fa9f28a9d7f1685f9f55e505c630c12c53a2
2015-03-20 15:49:06 -07:00
Jeff Brown
13d81b6dd2 am 619ce1ce: am d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev
* commit '619ce1ce534775ab0ff4d591a69dafd53c04a315':
  Disable more hotkeys while in setup.
2015-03-20 22:35:41 +00:00
Jason Sams
0590423d71 Merge "unhide AllocationAdapter APIs" 2015-03-20 22:14:26 +00:00
Jeff Brown
619ce1ce53 am d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev
* commit 'd62163055f983b95a954f1a6c2cbc8e0085a7ab5':
  Disable more hotkeys while in setup.
2015-03-20 22:10:54 +00:00
Jason Sams
206666790a unhide AllocationAdapter APIs
Change-Id: Id7ff10c7b09a5bedd9952602dd394e76b4fae8b1
2015-03-20 15:09:35 -07:00
Jeff Brown
d62163055f Merge "Disable more hotkeys while in setup." into lmp-mr1-dev 2015-03-20 22:05:07 +00:00
Casey Ho
3daef246bd Merge "Javadoc for ACTION_SCREEN_<ON|OFF> to indicate they cannot be registered in the manifest." 2015-03-20 21:05:04 +00:00
Chad Brubaker
003a55a671 Specify public exponent for RSA
Keymaster no longer adds a default value, so these tests were failing.

Change-Id: I9c5a8d2552534db1d7fa77965b0d675acc3ccc0a
2015-03-20 14:03:49 -07:00
Adam Lesinski
47fe60a643 Merge "Output modified bcp47 tag in ResTable_config::toString()" 2015-03-20 20:46:40 +00:00
Adam Lesinski
0964cfc384 Merge "split-select: Languages should not be grouped exclusively" 2015-03-20 20:46:03 +00:00
Alan Viverette
d746370fdd Merge "Only propagate state changes if wrapped drawable is stateful" 2015-03-20 20:37:52 +00:00
Jeff Brown
38d3feb76c Disable more hotkeys while in setup.
Disables fallback key processing for CALL, CAMERA, and HEADSETHOOK
buttons.

Bug: 19767816
Change-Id: I423103c367e05827c939cd8d8dbecb6012b0e9f0
2015-03-20 13:26:09 -07:00
John Spurlock
606f1c9c9d Merge "HUN: Implement per-package config." 2015-03-20 20:20:09 +00:00
Tim Kilbourn
a81c231d31 Merge "Add unique id to InputDevice." 2015-03-20 18:46:20 +00:00
Tim Kilbourn
415b450bf2 Add unique id to InputDevice.
If an input device driver assigns unique ids to devices (e.g., MAC
address), this method will be used to retrieve it from the device.

Change-Id: If1fd6643c5be7af5b989ef47f4bb653e7a63b6c6
2015-03-20 11:43:12 -07:00
Wale Ogunwale
abfcc22ddf Default ActivityInfo.resizeable to false for all SDK versions.
Bug: 19347452
Bug: 19865400
Change-Id: I2afbcdb9c876c756b14068efc750093057f0b865
2015-03-20 11:32:20 -07:00
Alan Viverette
1b23240f96 Only propagate state changes if wrapped drawable is stateful
Always update layer bounds if the contained drawable changed in any
way. Also adds null annotations in LayerDrawable and throws a more
useful exception when the layers argument is null.

Change-Id: Iae0cba68257e48b6a45fe081c3d4b0509d2dedd5
2015-03-20 11:08:46 -07:00
Alex Klyubin
2110a28a6c am a4c4c575: Merge "Add android.security.NetworkSecurityPolicy."
* commit 'a4c4c575c793d3ba4847107b15ce3a9dd5395878':
  Add android.security.NetworkSecurityPolicy.
2015-03-20 18:08:30 +00:00
Adam Lesinski
39fa40cbad Merge "Disable WiFi energy data collection to avoid deadlock" 2015-03-20 18:07:24 +00:00