Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
197,293 Commits 3 Branches 0 Tags
526f227ff3598cc51127daa2a1458db484c66fc2
Commit Graph

53247 Commits

Author SHA1 Message Date
Eino-Ville Talvala
526f227ff3 am b7bbd629: Merge "Camera2: Do not throw unexpected runtime exception to app" into mnc-dev 
* commit 'b7bbd629eb0370f36ce27cbc9ecfc7e5c9d8953f':
  Camera2: Do not throw unexpected runtime exception to app
 2015-06-17 18:44:40 +00:00
Eino-Ville Talvala
b7bbd629eb Merge "Camera2: Do not throw unexpected runtime exception to app" into mnc-dev 2015-06-17 18:31:45 +00:00
Eino-Ville Talvala
d3e39d16cb Camera2: Do not throw unexpected runtime exception to app 
Use a generic CameraAccessException DEVICE_ERROR exception instead

Bug: 21869917
Change-Id: I73581b817cbdcbb4b876c234f050f725a459a29b
 2015-06-17 11:18:43 -07:00
Chien-Yu Chen
e6c3c17b29 am 563d60e0: Merge "Camera2: Handle getting input surface failures" into mnc-dev 
* commit '563d60e03f8d5961e5578fca66092bd6b8d5496e':
  Camera2: Handle getting input surface failures
 2015-06-17 18:09:24 +00:00
Zhijun He
d103c0bdce am 0f70c415: Merge "Camera2: fix high speed request builder creation issue" into mnc-dev 
* commit '0f70c415519f0a89f8ba765f9046802a2223f790':
  Camera2: fix high speed request builder creation issue
 2015-06-17 18:09:19 +00:00
Alex Klyubin
411b8a3a2a am 4250c8d6: Merge "Expose AES GCM backed by Android Keystore." into mnc-dev 
* commit '4250c8d6435cca2c14839f7adec0a43773d01e3b':
  Expose AES GCM backed by Android Keystore.
 2015-06-17 18:09:14 +00:00
Yigit Boyar
202bb20378 am 5ddaa72b: Merge "Handle negative view types properly in getScrapView" into mnc-dev 
* commit '5ddaa72b9a60dda43c9e199f85990c01b0bf702c':
  Handle negative view types properly in getScrapView
 2015-06-17 18:09:09 +00:00
Chien-Yu Chen
563d60e03f Merge "Camera2: Handle getting input surface failures" into mnc-dev 2015-06-17 18:02:31 +00:00
Zhijun He
0f70c41551 Merge "Camera2: fix high speed request builder creation issue" into mnc-dev 2015-06-17 18:00:17 +00:00
Alex Klyubin
4250c8d643 Merge "Expose AES GCM backed by Android Keystore." into mnc-dev 2015-06-17 17:58:35 +00:00
Yigit Boyar
5ddaa72b9a Merge "Handle negative view types properly in getScrapView" into mnc-dev 2015-06-17 17:58:27 +00:00
Mady Mellor
6b7bdd98c7 am 5279d11f: Merge "Drag to select text: add some slop for moving between lines" into mnc-dev 
* commit '5279d11f258a01cfdf0a16d965b5e4cd7566b8ac':
  Drag to select text: add some slop for moving between lines
 2015-06-17 17:45:30 +00:00
Mady Mellor
5279d11f25 Merge "Drag to select text: add some slop for moving between lines" into mnc-dev 2015-06-17 17:36:31 +00:00
Mady Mellor
7e2e9da668 am f0522882: Merge "Insertion cursor: add some slop for moving between lines" into mnc-dev 
* commit 'f05228822c5da6333f20dc3a29c8f064b7562e06':
  Insertion cursor: add some slop for moving between lines
 2015-06-17 17:14:34 +00:00
Mady Mellor
ee3821e565 Insertion cursor: add some slop for moving between lines 
Applying same method to insertion cursor as the text selection drag
handles to improve moving along lines.

Basically adds some slop above / below the current line and only
allows you to change lines if you move outside of that.

Bug: 21306433
Change-Id: I6c7f3a496fbd1ea66936832f96325736cea872aa
 2015-06-17 09:48:38 -07:00
Mady Mellor
f9f8aebdc6 Drag to select text: add some slop for moving between lines 
It's pretty easy to accidentally move to a different line when
selecting text. This CL makes an adjustment so that if the user
is on a line, they must move above the top of it + slop to move
up a line, and they must move below the bottom of it + slop to move
down a line. This applies the changes to the drag accelerator.

This CL also makes an adjustment to not apply the finger offset
to the drag accelerator until the user has moved lines, this was
causing an issue where it would immediately include the above line
when initiating the selection.

Bug: 21306433
Bug: 21303943
Change-Id: Id240136493f62524fe6445d8bd65479084fe8126
 2015-06-17 09:46:01 -07:00
Mady Mellor
19457a41e9 am 13e54ff0: Merge "Text selection: add some slop for moving between lines" into mnc-dev 
* commit '13e54ff0ebc5fe6f425c16d9d30ea9ecd5db1348':
  Text selection: add some slop for moving between lines
 2015-06-17 16:45:08 +00:00
Mady Mellor
13e54ff0eb Merge "Text selection: add some slop for moving between lines" into mnc-dev 2015-06-17 16:30:19 +00:00
Mady Mellor
cc65c37f10 Text selection: add some slop for moving between lines 
It's pretty easy to accidentally move to a different line when
selecting text. This CL makes an adjustment so that if the user
is on a line, they must move above the top of it + slop to move
up a line, and they must move below the bottom of it + slop to move
down a line.

This CL also makes a small modification to check if the layout is
null and return early which simplifies some of the following code.

Bug: 21306433
Change-Id: I4a854e644faafaf1e159201ae1f2838862f16b25
 2015-06-17 09:25:19 -07:00
Alex Klyubin
00af27b7d9 Expose AES GCM backed by Android Keystore. 
Bug: 18088752
Bug: 21786749
Change-Id: Ica90491037d2920f7635195894ba18882fc4406d
 2015-06-17 09:24:06 -07:00
Zhijun He
a002fb4df4 Camera2: fix high speed request builder creation issue 
The metadata local copy was mutated (swapped) to an empty copy after use,
we need make a copy every time.

Bug: 21442271
Change-Id: I8a71663ba964288bdd1d7f50b42db762d28d89c0
 2015-06-17 09:23:22 -07:00
Narayan Kamath
1248c94934 am 2c89e7d8: Merge "Delete android.speech.srec.*" into mnc-dev 
* commit '2c89e7d8dba1713de17157a164071c65f4b00915':
  Delete android.speech.srec.*
 2015-06-17 11:51:37 +00:00
Narayan Kamath
2c89e7d8db Merge "Delete android.speech.srec.*" into mnc-dev 2015-06-17 11:38:16 +00:00
Yohei Yukawa
80267adfba am f4d225a4: Fix debug log for SpellCheckerSessionListenerImpl#TASK_CANCEL 
* commit 'f4d225a4b502ef227788447eb1a5bb2902019c01':
  Fix debug log for SpellCheckerSessionListenerImpl#TASK_CANCEL
 2015-06-17 04:30:41 +00:00
Yohei Yukawa
f4d225a4b5 Fix debug log for SpellCheckerSessionListenerImpl#TASK_CANCEL 
This is a follow up CL for Ifd05565ac0c057c46ec88a3fb9094c04934041d.

SpellCheckerSessionListenerImpl.taskToString(TASK_CANCEL) has
somehow returned "STATE_WAIT_CONNECTION" probably because of
a copy-and-paste mistake.

With this CL, it now returns "TASK_CANCEL", which is observable
only in debug log anyway though.

Bug: 21319642
Change-Id: Ib0bf11494bd3f210e6e8192fc25a33c65f7d313d
 2015-06-16 21:19:00 -07:00
Yohei Yukawa
a219f1e5d4 am e34f0984: Merge "Fix a reference leak in SpellCheckerSessionListenerImpl." into mnc-dev 
* commit 'e34f0984bb879cb7c89b8ff5a78e4bc7243c6331':
  Fix a reference leak in SpellCheckerSessionListenerImpl.
 2015-06-17 03:02:36 +00:00
Yohei Yukawa
e34f0984bb Merge "Fix a reference leak in SpellCheckerSessionListenerImpl." into mnc-dev 2015-06-17 02:54:08 +00:00
Junda Liu
4e85ac8130 am a11ffa64: Merge "Remove hide_carrier_network_settings from Settings." into mnc-dev 
* commit 'a11ffa64366e39899bcda7448e5b5ffe727bea48':
  Remove hide_carrier_network_settings from Settings.
 2015-06-16 23:23:16 +00:00
Junda Liu
a11ffa6436 Merge "Remove hide_carrier_network_settings from Settings." into mnc-dev 2015-06-16 23:11:32 +00:00
Maxim Bogatov
d74a13e3f9 am e6ba94ce: Merge "fix CTS: AccessibilityEndToEndTest failing" into mnc-dev 
* commit 'e6ba94ce022a60b5225ee54cf2cc710633441d87':
  fix CTS: AccessibilityEndToEndTest failing
 2015-06-16 23:00:46 +00:00
Maxim Bogatov
e6ba94ce02 Merge "fix CTS: AccessibilityEndToEndTest failing" into mnc-dev 2015-06-16 22:48:59 +00:00
Matthew Williams
f28a2f6226 am 15ce3387: Merge "Make sync settings restore more robust" into mnc-dev 
* commit '15ce33873e2ca774a1fca666a05cc8ed79f327d7':
  Make sync settings restore more robust
 2015-06-16 22:42:50 +00:00
Matthew Williams
15ce33873e Merge "Make sync settings restore more robust" into mnc-dev 2015-06-16 22:36:53 +00:00
dcashman
29cbc202c8 am acc2df21: Merge "Add keyset support for ECDSA public keys." into mnc-dev 
* commit 'acc2df21de9da66d8aaf9bf2b733f8b284454403':
  Add keyset support for ECDSA public keys.
 2015-06-16 22:22:51 +00:00
Maxim Bogatov
f399af3e5f fix CTS: AccessibilityEndToEndTest failing 
ViewGroup overrides class name population to
AccessibilityEvent. So className is always ViewGroup
for any ViewGroup inherited classes

b/21369265

Change-Id: I46095c21e523e05066c7f6ee395171d4725983ac
 2015-06-16 15:19:42 -07:00
dcashman
acc2df21de Merge "Add keyset support for ECDSA public keys." into mnc-dev 2015-06-16 22:14:35 +00:00
Adam Powell
ef06a629d4 am 8edfe18c: Merge "Fully remove Toolbar children when action views expand" into mnc-dev 
* commit '8edfe18c193e2d6d719b2e141628f33b669598d9':
  Fully remove Toolbar children when action views expand
 2015-06-16 21:47:26 +00:00
Adam Powell
caa1a03777 am 26b27cab: Merge "Fix crash in ToolbarActionBar when setting null custom view" into mnc-dev 
* commit '26b27cab811e2c91b6e229cf5bfcf5846fb6d094':
  Fix crash in ToolbarActionBar when setting null custom view
 2015-06-16 21:47:20 +00:00
Matthew Williams
53abfdb86c Make sync settings restore more robust 
Bug: 18506992
Parent Bug: 17967106
Introduce a new state for ContentResolver#getIsSyncable.
This state specifies that an adapter should be disabled until
explicitly turned on by ContentResolver#setSyncAutomatically(true).
In this way we can restore disabled sync adapters and still allow
them to run their initialization logic later on when they are
re-enabled.

Change-Id: I03fd1f994c4bc982bbc723154ba20bb252efdf80
 2015-06-16 14:46:59 -07:00
Adam Powell
8edfe18c19 Merge "Fully remove Toolbar children when action views expand" into mnc-dev 2015-06-16 21:30:13 +00:00
Adam Powell
26b27cab81 Merge "Fix crash in ToolbarActionBar when setting null custom view" into mnc-dev 2015-06-16 21:29:48 +00:00
Eino-Ville Talvala
a366b4923c am 57af7531: Merge "Camera: Adjust intrinsic transform coordinate system." into mnc-dev 
* commit '57af75313c005134b85cf29b7e9972ca1fad53dc':
  Camera: Adjust intrinsic transform coordinate system.
 2015-06-16 20:45:25 +00:00
Chien-Yu Chen
c58a602a2f Camera2: Handle getting input surface failures 
Don't get the input surface after creating a session failed. Catch
the CameraRuntimeException when getting the input surface so
onConfigureFailed will be fired.

Bug: 20945169
Change-Id: Iea6891c2a1d7419d7d6669a17114f949c03a0319
 2015-06-16 12:07:57 -07:00
Eino-Ville Talvala
b8bd8ab184 Camera: Adjust intrinsic transform coordinate system. 
Needs to be in the pre-correction active array coordinates
for consistency.

Bug: 20491394
Change-Id: I7a28499fec59219a0f8d85c1fc37867aed90f4c0
 2015-06-16 11:45:33 -07:00
Narayan Kamath
b39dfe87b8 Delete android.speech.srec.* 
This code had an undeclared dependency on libsrec_jni which
we no longer build.

bug: 21855957
Change-Id: Ie00645960b18aaa2a7d944a2ad31ff57e0b0b2ba
 2015-06-16 19:40:09 +01:00
Rubin Xu
8b6d9ad3a7 am dd862aeb: Merge "Deprecate SHA-1 in ManagedProvisioning (API doc change)" into mnc-dev 
* commit 'dd862aebda15a5b63c90b1b670373028b48172c4':
  Deprecate SHA-1 in ManagedProvisioning (API doc change)
 2015-06-16 18:31:04 +00:00
Rubin Xu
dd862aebda Merge "Deprecate SHA-1 in ManagedProvisioning (API doc change)" into mnc-dev 2015-06-16 18:15:33 +00:00
Chirag Shah
44143f4974 am 7f92f067: Merge "Allow 3P apps to provide structured data within AssistContent." into mnc-dev 
* commit '7f92f06742fe3b66b9e8049db62ea55e1b41adf5':
  Allow 3P apps to provide structured data within AssistContent.
 2015-06-16 17:03:44 +00:00
Chirag Shah
7f92f06742 Merge "Allow 3P apps to provide structured data within AssistContent." into mnc-dev 2015-06-16 16:54:03 +00:00
Abodunrinwa Toki
b9b27fefb1 am 98f98dd1: Merge "Fix floating toolbar flickers." into mnc-dev 
* commit '98f98dd19def468afc310bd879cb79cce9917ba2':
  Fix floating toolbar flickers.
 2015-06-16 16:06:59 +00:00