194138 Commits

Author SHA1 Message Date
Dirk Dougherty
4a08d6f042 am 392f5321: am 5c117ae1: Merge "Fix dependency specs for data binding." into mnc-preview-docs
* commit '392f532104aeba2d395bdf940cc08a1247bd3de5':
  Fix dependency specs for data binding.
2015-06-05 02:18:42 +00:00
Filip Gruszczynski
43c4cd1c82 am 93634166: am d88e4d50: Merge "ActivityView: set surface on a background thread." into cw-d-mr1-dev
* commit '93634166c8c78bdeccf045c62a0f601dceed74e3':
  ActivityView: set surface on a background thread.
2015-06-05 02:18:35 +00:00
Chris Craik
44dc1667eb am 78ab4c38: am 6042f351: Merge "Rework systrace analysis documentation" into mnc-preview-docs
* commit '78ab4c3867af40b512d2e0c046abd5c8b040d05f':
  Rework systrace analysis documentation
2015-06-05 02:18:29 +00:00
Joe Fernandez
eb837e8cf8 am ab1fb237: am 79106d1c: docs: Remove ADT-1 RMA form link
* commit 'ab1fb23712c66286285ffdce2d1488c41565650f':
  docs: Remove ADT-1 RMA form link
2015-06-05 02:18:23 +00:00
Clara Bayarri
de5cdebac7 Merge "Fix Toolbar is not refreshed after Select All" into mnc-dev 2015-06-05 02:05:46 +00:00
Clara Bayarri
01243ac57e Fix Toolbar is not refreshed after Select All
Bug: 21361248
Change-Id: Iab913bd610c208e5881d3d0eb5574efdf9eb5d92
2015-06-05 03:03:31 +01:00
Adam Lesinski
6b717c66a7 Merge "AAPT2: Add manifest merging" into mnc-dev 2015-06-05 01:35:15 +00:00
Zhijun He
0ccc940a0d Merge "Camera2: implement high speed video APIs" into mnc-dev 2015-06-05 01:07:52 +00:00
Adam Lesinski
8c831ca87b AAPT2: Add manifest merging
Now that AAPT2 is library-aware, it needs to take care of
all library related work, including merging manifests.
The logic was taken from the current Java ManifestMerger.

Change-Id: Id93f713f27ae8617922bf89e325e45be9f863c06
2015-06-04 18:00:33 -07:00
Doris Liu
5de55868a9 Merge "Make ListView's EdgeEffect respect the clipToPadding flag" into mnc-dev 2015-06-05 00:57:32 +00:00
Ben Kwa
8dbb43289c Merge "Fix drawer selection to match Material spec." into mnc-dev 2015-06-05 00:51:54 +00:00
Doris Liu
f36c061909 Make ListView's EdgeEffect respect the clipToPadding flag
This CL sets the position of EdgeEffect based on whether
clipToPadding is enabled. When enabled, the EdgeEffect will be
bounded to the padding. Otherwise, it will be drawn at the view's
bounds.

Bug: 21595866
Change-Id: I3968e5b8d3a75ce2d7607e2037bc372024694d5b
2015-06-04 17:50:47 -07:00
Svet Ganov
e074831605 Merge "Update the pdfium library - framework" into mnc-dev 2015-06-05 00:49:43 +00:00
Clara Bayarri
c1f28bc97d Merge "Separate the SelectionActionMode into Insertion and Selection." into mnc-dev 2015-06-05 00:40:43 +00:00
Dongwon Kang
9e7ac352eb Merge "TIF: Add sanitization code for the current position" into mnc-dev 2015-06-05 00:27:02 +00:00
Dongwon Kang
bb3e2674b5 TIF: Add sanitization code for the current position
+ More documentation on the currnet position

Bug: 21573422
Change-Id: I51d184d03a61270d3ea36b36f880f1f052a99cd1
2015-06-04 17:25:59 -07:00
Wale Ogunwale
733f147401 Merge "Always have a handler for PendingIntents sent in the system process" into mnc-dev 2015-06-05 00:23:28 +00:00
Roozbeh Pournader
73d2f160ec Merge "Move NotoSansSymbols higher than CJK in the fallback chain." into mnc-dev 2015-06-04 23:45:27 +00:00
Johnson Hsieh
6c72febd35 Merge "Updates AlarmClock intent API." into mnc-dev 2015-06-04 23:34:50 +00:00
Ben Kwa
50698068c1 Fix drawer selection to match Material spec.
- highlighted text changed to match the application primary color
- change highlighted background to light gray
- remove highlight icon tinting (provides insufficient contrast against
  the new light gray background)

BUG=18685226

Change-Id: I4040fa951fd2822cea324e0bd1924d10024b6a11
2015-06-04 16:28:16 -07:00
Yohei Yukawa
4493017abb Merge "Report EditorInfo#packageName based on the actual uid." into mnc-dev 2015-06-04 23:12:45 +00:00
Makoto Onuki
c0f9ca7bf1 Merge "Change option label from "Duplex" to "Two-sided"" into mnc-dev 2015-06-04 22:49:10 +00:00
Alan Viverette
193259d40a Merge "Manually jump ripples when preemptively aborting RT animation" into mnc-dev 2015-06-04 22:41:18 +00:00
Roozbeh Pournader
912dbdb9fa Move NotoSansSymbols higher than CJK in the fallback chain.
This makes sure that symbol characters who have both an alternative
or "full-width" version in the CJK fonts and a more regular version
in the symbols font get the default or "half-width" version by
default in non-CJK locales.

This is not a complete fix: such "full-width" symbol characters only
exist in the Simplfied Chinese font for now, which means in
Traditional Chinese, Japanese, and Korean locales, they characters
would now appear "half-width", which *may* be sub-optimal. The
complete fix would make sure the ones that actually need to be
"full-width" in TC/J/K are also included in the TC/J/K font.

Bug: 21525318
Bug: 21525012
Bug: 21524421
Bug: 21521330
Bug: 21520316
Bug: 21518544
Bug: 21517912
Bug: 21503807
Bug: 21502245
Bug: 21501669
Bug: 21525905
Bug: 21524018
Bug: 21503952
Bug: 21502678
Change-Id: I93cf7119b45ed3c080cd39d631a687e0ef9fd8ce
2015-06-04 15:39:43 -07:00
Alan Viverette
c3b68dff16 Manually jump ripples when preemptively aborting RT animation
Bug: 21079749
Change-Id: If79dcef59aba616c0446efc623863f563cb16250
2015-06-04 15:33:52 -07:00
Jorim Jaggi
81f2992fac Merge "Speed up recents -> app #2" into mnc-dev 2015-06-04 22:30:57 +00:00
Jorim Jaggi
752896648e Merge "Speed up recents -> app" into mnc-dev 2015-06-04 22:30:27 +00:00
Zhijun He
a767772230 Camera2: implement high speed video APIs
Bug: 21442271
Change-Id: Ia0ae5bbd3e8c81bad293c29987301a2457817d12
2015-06-04 15:22:00 -07:00
Alex Klyubin
2c37807801 Merge "Export KeyFactory backed by Android Keystore." into mnc-dev 2015-06-04 22:16:19 +00:00
Svet Ganov
fbd0288655 Update the pdfium library - framework
Change-Id: I4880e9310c02c6e26d4560fb8515f2ce51c597f4
2015-06-04 14:57:06 -07:00
John Reck
dde606df7f Merge "Iterate step of launch & iterate" into mnc-dev 2015-06-04 21:54:18 +00:00
Jorim Jaggi
3a4656e887 Merge "Make entering recents a lot faster" into mnc-dev 2015-06-04 21:52:14 +00:00
Tim Kilbourn
57914802b5 Merge "DO NOT MERGE Fix DropBoxManager.Entry parcels with fds." into mnc-dev 2015-06-04 21:40:15 +00:00
Yohei Yukawa
34df42d597 Merge "Make IMMS#mSettingsObserver multiuser-aware." into mnc-dev 2015-06-04 21:38:20 +00:00
Tim Kilbourn
4bf27b53b9 DO NOT MERGE Fix DropBoxManager.Entry parcels with fds.
When the socketpair communication channel was added to
ParcelFileDescriptor, the CREATOR method for DropBoxManager.Entry was
not updated to read the extra fd from the Parcel. This was causing reads
to end too early.

Also removed comments referring to the now-deleted native methods in
the native Parcel implementation.

Change-Id: I49a9691da6ea927382ceb2fcbfdc7985a601111b
(cherry picked from commit ba953230f71e5117d819d9e7153da8304b141695)
2015-06-04 21:37:50 +00:00
Paul Lawrence
8836528d7b Merge "Move crypt commands to a different listener in vold" into mnc-dev 2015-06-04 21:32:38 +00:00
Pavlin Radoslavov
d2b033aeb4 Add a missing check for null pointer.
There is a race condition when processing intents inside
PairingCancelHandler.onReceive() that could trigger NPE.
A speculative list of events (untested) that could trigger it:

1. Trigger Pairing Cancel for a Bluetooth device.
2. Turn Off Bluetooth
   This should call CachedBluetoothDeviceManager.onBluetoothStateChanged()
   and should remove the device from (1) from the list of cached devices
3. BluetoothEventManager.PairincCancelHander.onReceive() receives
   an intent about about Pairing Cancel event.
   Within the processing of that intent, cachedDevice.getName()
   is called without checking whether cachedDevice is null.
   In this specific example, cachedDevice could be null because of (2)

Bug: 21368124
Change-Id: I86f5d5287b440d1d2e0fe147278b1c2257902e95
2015-06-04 21:29:34 +00:00
Alex Klyubin
cb94dd1cee Merge "Expose RSA and ECDSA Signature from Android Keystore Provider." into mnc-dev 2015-06-04 21:19:37 +00:00
Makoto Onuki
9f9d70b603 Change option label from "Duplex" to "Two-sided"
Bug 21640154

Change-Id: Icab4754e0aeb23fc4da178e7306f5c7a74108c22
2015-06-04 14:17:44 -07:00
Jeff Brown
16422b25f7 Merge changes If241e329,Ib69b6987 into mnc-dev
* changes:
  Clarify docs on registerContentObserver.
  Add missing docs to StateSet.
2015-06-04 21:11:05 +00:00
Nancy Chen
65561b5c51 Merge "Add carrier package name field to check for carrier vvm app." into mnc-dev 2015-06-04 21:09:45 +00:00
Vadim Tryshev
c51c3f6436 Merge "Processing non-long clicks on application icon." into mnc-dev 2015-06-04 21:08:33 +00:00
Alex Klyubin
df6c67028a Merge "Streamline Android Keystore delete entry operation." into mnc-dev 2015-06-04 21:06:29 +00:00
Alex Klyubin
b070e486c8 Merge "Reliably delete keys if key generation fails." into mnc-dev 2015-06-04 21:05:41 +00:00
Eino-Ville Talvala
05ae9b56ae Merge "Camera: Change origin of poseTranslation." into mnc-dev 2015-06-04 20:52:02 +00:00
Chris Craik
0ee780a993 Merge "Ensure RenderScript tracing is always balanced via try/finally" into mnc-dev 2015-06-04 20:47:34 +00:00
Ruben Brunk
74fc1837e0 Merge "Fix CameraManager#open exception handling." into mnc-dev 2015-06-04 20:43:16 +00:00
Alex Klyubin
ccbe88a505 Expose RSA and ECDSA Signature from Android Keystore Provider.
The RSA Signature supports PKCS#1 and PSS padding.

Bug: 18088752
Bug: 20912868
Change-Id: I03cdc86d1935af36f7c87a0b23d67f813829cfb0
2015-06-04 13:42:43 -07:00
Eino-Ville Talvala
d3dbfb3f75 Camera: Change origin of poseTranslation.
No actual defined center for the Android sensor coordinate system
exists, so define the translation relative to the largest camera
device facing the same way.

Bug: 20123879
Change-Id: Ica33d23717c976c063c26b768af5b6148483909c
2015-06-04 13:41:56 -07:00
Vadim Tryshev
c1a6c658ae Processing non-long clicks on application icon.
This CL alone doens't fix the whole bug, see the bug
for the AI list.

In normal mode, clicking at application icon on a task view
is ignored to avoid accidental clicks. To open app properties,
we need a long click.

In accessibility mode, we want to make it easier to open app
properties, and accidental clicks are less likely. Hence, allowing
"simple" clicks.

Bug: 20945599
Change-Id: Iec3f911dced1eda09175500fc1e798dd09b6f9e2
2015-06-04 13:26:53 -07:00