Commit Graph

48979 Commits

Author SHA1 Message Date
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
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
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
8edfe18c19 Merge "Fully remove Toolbar children when action views expand" into mnc-dev 2015-06-16 21:30:13 +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
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
Abodunrinwa Toki
98f98dd19d Merge "Fix floating toolbar flickers." into mnc-dev 2015-06-16 15:54:26 +00:00
George Mount
fdf3ccc526 am 209fb433: Merge "Have the final setVisibility cause a requestLayout." into mnc-dev
* commit '209fb43376989c9a68f947d12bae3ea87e4101d2':
  Have the final setVisibility cause a requestLayout.
2015-06-16 15:39:50 +00:00
George Mount
209fb43376 Merge "Have the final setVisibility cause a requestLayout." into mnc-dev 2015-06-16 15:27:27 +00:00
Abodunrinwa Toki
f444b5c3ae Fix floating toolbar flickers.
-Flicker was a side effect the delay in hiding the toolbar when
there is a down press on a TextView handle. The timing clashed
with the time it takes for the FloatingActionMode to release a
hide lock on a changing content rect. Extra flickers also happened
if the ActionMode happened to be invalidated at about the same time.
Since there was no longer a hide lock, the toolbar refreshed, getting
rid of the "Select all" menu item.
FIX. I believe we don't need the delayed hide on down press on a
TextView handle. I've removed this.

-I've also updated FloatingActionMode to ensure that hide locks
overlap one another if necessary. The toolbar can only be visible if
all locks are off.

Bug: 21793687
Change-Id: I290ea45ab17d5862b453cb319afb4c8ffe084cd0
2015-06-16 15:47:04 +01:00
Benjamin Franz
37950b034a am dbc86ad1: Merge "Update documentation for PASSWORD_QUALITY_SOMETHING" into mnc-dev
* commit 'dbc86ad170e2c288f0154a264d12bd6dadf78c45':
  Update documentation for PASSWORD_QUALITY_SOMETHING
2015-06-16 13:32:46 +00:00
Benjamin Franz
dbc86ad170 Merge "Update documentation for PASSWORD_QUALITY_SOMETHING" into mnc-dev 2015-06-16 13:22:22 +00:00
Narayan Kamath
c355d30ee1 am 275294db: Merge "Better systrace slices for application startup." into mnc-dev
* commit '275294dbce30eb1f9ef4847d0f9c3d6b602de06c':
  Better systrace slices for application startup.
2015-06-16 12:02:35 +00:00
Narayan Kamath
275294dbce Merge "Better systrace slices for application startup." into mnc-dev 2015-06-16 11:50:57 +00:00
Paul Jensen
5d3d3553c5 am 19769114: Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev
* commit '19769114b48152efa57527574ee533c8e33db703':
  Remove dead hidden ConnectivityManager and NetworkInfo APIs.
2015-06-16 11:38:18 +00:00
Paul Jensen
19769114b4 Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev 2015-06-16 11:30:51 +00:00
Narayan Kamath
fbb32f6440 Better systrace slices for application startup.
This change adds three new timeslices :

- PostFork : As soon as possible after the app forks from the
  zygote. Can be used in conjunction with the system_server
  "Start proc:" event to derive an upper bound on fork() and
  zygote overhead.

- RuntimeInit & ActivityThreadMain for ZygoteInit#runtimeInit
  and ActivityThread#main.

ActivityThread#handleBindApplication and higher level functions
are already well instrumented in systrace. handleBindApplication
should occur immediately after ActivityThread#main.

Note that we use the Activity manager tag to make it easier to
correlate these new events with surrounding events (Start proc
and handleBindApplication) that are already using the AM tag.

bug: 21632700
Change-Id: Ibc01f1721f962c913f3c02a51763b6feb1eb6a4d
2015-06-16 12:06:31 +01:00