Commit Graph

53500 Commits

Author SHA1 Message Date
Raph Levien
fc40d93981 am efe1f4bb: am 8872ca4d: Merge "Remove indents from TextView" into mnc-dev
* commit 'efe1f4bb4be408c43f63b672b3db3cec26f222ef':
  Remove indents from TextView
2015-06-17 23:25:51 +00:00
Adam Powell
3977bad2b0 am 352e6d77: am 40359f73: Merge "Request application of WindowInsets when setting a content view" into mnc-dev
* commit '352e6d77ef73d846ee840d26e6ccacb54e485eed':
  Request application of WindowInsets when setting a content view
2015-06-17 23:06:48 +00:00
Raph Levien
8872ca4d55 Merge "Remove indents from TextView" into mnc-dev 2015-06-17 23:06:17 +00:00
Raph Levien
8edac58e55 Remove indents from TextView
On more careful reflection, the "indents" feature was not ready for
inclusion in the public API. It is still available at a lower level
in StaticLayout.

Also fix a minor typo in the doc for breakStrategy.

Bug: 20641996
Change-Id: I5cd976a536c48615980860396b1564b51b19e14a
2015-06-17 15:53:33 -07:00
Dianne Hackborn
2133afc77a am d21b695f: am 22433a33: Merge "Fix issue #21814207 and issue #21814212 (alarm manager)" into mnc-dev
* commit 'd21b695f8b344b12e623694db86856a89642d934':
  Fix issue #21814207 and issue #21814212 (alarm manager)
2015-06-17 22:43:51 +00:00
Adam Powell
40359f73b1 Merge "Request application of WindowInsets when setting a content view" into mnc-dev 2015-06-17 22:42:17 +00:00
Alan Viverette
d496d3bd06 am 5e034226: am e1c94726: Merge "Work around inconsistent views in RelativeLayout.onMeasure()" into mnc-dev
* commit '5e034226283270479cd7017cd7493baa46fbd66d':
  Work around inconsistent views in RelativeLayout.onMeasure()
2015-06-17 22:31:09 +00:00
Dianne Hackborn
22433a337a Merge "Fix issue #21814207 and issue #21814212 (alarm manager)" into mnc-dev 2015-06-17 22:18:37 +00:00
Alan Viverette
e1c947263f Merge "Work around inconsistent views in RelativeLayout.onMeasure()" into mnc-dev 2015-06-17 22:10:11 +00:00
Chris Wren
93b046d64f am 65d94514: am e222a444: Merge "Revert "remove setLatestEventInfo"" into mnc-dev
* commit '65d94514c90566ce4b8298b091357616a5bcb69c':
  Revert "remove setLatestEventInfo"
2015-06-17 21:27:08 +00:00
Chris Wren
e222a44429 Merge "Revert "remove setLatestEventInfo"" into mnc-dev 2015-06-17 21:03:24 +00:00
Chris Wren
dfdb52abe6 Revert "remove setLatestEventInfo"
This reverts commit 965097321d.

Change-Id: I658bb2611fe8f983309e962d6772d1bd80ed586e
2015-06-17 21:03:11 +00:00
Adam Powell
c0611fd77e am fb1fdca9: am 074c3404: Merge "Add matching xml attributes for existing Toolbar properties" into mnc-dev
* commit 'fb1fdca90f6c5c794104f6e14bc86f41db6fa48b':
  Add matching xml attributes for existing Toolbar properties
2015-06-17 20:47:41 +00:00
Alan Viverette
3e2e064a1f Work around inconsistent views in RelativeLayout.onMeasure()
Previously, RelativeLayout's measure pass could crash if the view's
children were modified without calling requestLayout() prior to the
next measure pass. This avoids the issue by only looking at the most
recent set of sorted views and preserves the previous behavior where
onMeasure() could return incorrect data.

Bug: 21123292
Change-Id: If471d071d1d2e2729cf13854d95b1f517c1fe73a
2015-06-17 13:42:32 -07:00
Adam Powell
41607d5a2b Request application of WindowInsets when setting a content view
For both PhoneWindow and VoiceInteractionSession, call
requestApplyInsets when the content view(s) change. This is generally
what the developer expects if the new view tree responds to insets in
any way.

Bug 21620924

Change-Id: I60a88af55bf85217c3587aa37f03fdc3fdce686d
2015-06-17 13:37:06 -07:00
Chris Wren
824bd9e0f2 am 59489bb3: am c20c1eec: Merge "remove setLatestEventInfo" into mnc-dev
* commit '59489bb3b5b7c89dcaa66f53edb9fc1da4655333':
  remove setLatestEventInfo
2015-06-17 20:30:17 +00:00
Adam Powell
074c340420 Merge "Add matching xml attributes for existing Toolbar properties" into mnc-dev 2015-06-17 20:22:37 +00:00
Dianne Hackborn
5416c2ecf8 am 181f99e3: am d1419ed2: Merge "Bring back screenshot API." into mnc-dev
* commit '181f99e3b01f9c4e035730b40eea5f9be3431b2b':
  Bring back screenshot API.
2015-06-17 20:10:15 +00:00
Chris Wren
c20c1eec9e Merge "remove setLatestEventInfo" into mnc-dev 2015-06-17 20:05:11 +00:00
Dianne Hackborn
d1419ed29a Merge "Bring back screenshot API." into mnc-dev 2015-06-17 19:47:11 +00:00
Eino-Ville Talvala
2027483455 am f902ec5c: am b7bbd629: Merge "Camera2: Do not throw unexpected runtime exception to app" into mnc-dev
* commit 'f902ec5cb78e18207601a6fefa1ef10aa9851fdf':
  Camera2: Do not throw unexpected runtime exception to app
2015-06-17 18:57:46 +00:00
Dianne Hackborn
a750a63d63 Fix issue #21814207 and issue #21814212 (alarm manager)
Issue #21814207: AlarmManager.setAndAllowWhileIdle should also allow wake locks.

Introduce a whole new infrastructure for providing options when
sending broadcasts, much like ActivityOptions.  There is a single
option right now, asking the activity manager to apply a tempory
whitelist to each receiver of the broadcast.

Issue #21814212: Need to allow configuration of alarm manager parameters

The various alarm manager timing configurations are not modifiable
through settings, much like DeviceIdleController.  Also did a few
tweaks in the existing DeviceIdleController impl.

Change-Id: Ifd01013185acc4de668617b1e46e78e30ebed041
2015-06-17 11:41:45 -07: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
Chien-Yu Chen
e63eeedab0 am 760d9082: am 563d60e0: Merge "Camera2: Handle getting input surface failures" into mnc-dev
* commit '760d90822adee611bc0e7e5b9d53cb32412de600':
  Camera2: Handle getting input surface failures
2015-06-17 18:21:02 +00:00
Zhijun He
09a6192707 am 46c2a195: am 0f70c415: Merge "Camera2: fix high speed request builder creation issue" into mnc-dev
* commit '46c2a195598aabcdaaad2e98f1df7b38e8dc8f3a':
  Camera2: fix high speed request builder creation issue
2015-06-17 18:20:57 +00:00
Alex Klyubin
32689e364f am 26f7b5d9: am 4250c8d6: Merge "Expose AES GCM backed by Android Keystore." into mnc-dev
* commit '26f7b5d96eceb147b3d995218c8daa9a4bed0d40':
  Expose AES GCM backed by Android Keystore.
2015-06-17 18:20:52 +00:00
Yigit Boyar
f8acc3af12 am b2b53fb9: am 5ddaa72b: Merge "Handle negative view types properly in getScrapView" into mnc-dev
* commit 'b2b53fb941b269019cf82289eb63b44336bc47b8':
  Handle negative view types properly in getScrapView
2015-06-17 18:20:48 +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
563d60e03f Merge "Camera2: Handle getting input surface failures" into mnc-dev 2015-06-17 18:02:31 +00:00
Mady Mellor
4a39288618 am 31fa5ad3: am 5279d11f: Merge "Drag to select text: add some slop for moving between lines" into mnc-dev
* commit '31fa5ad31e6eb83b373e548647dd5bbe602afb43':
  Drag to select text: add some slop for moving between lines
2015-06-17 18:01:51 +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
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
432e0422ca am ef25faa0: am f0522882: Merge "Insertion cursor: add some slop for moving between lines" into mnc-dev
* commit 'ef25faa09d8e17bbd07d11003c570311182acfed':
  Insertion cursor: add some slop for moving between lines
2015-06-17 17:27:19 +00:00
Mady Mellor
2663f817c7 am 7b914149: am 13e54ff0: Merge "Text selection: add some slop for moving between lines" into mnc-dev
* commit '7b9141499455cf77c6e353166859d9474d4221f9':
  Text selection: add some slop for moving between lines
2015-06-17 16:53:59 +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
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
abe5549e95 am df48f71c: am 2c89e7d8: Merge "Delete android.speech.srec.*" into mnc-dev
* commit 'df48f71c3f7ade0d445599f9474b2b2298696340':
  Delete android.speech.srec.*
2015-06-17 12:03:15 +00:00
Narayan Kamath
2c89e7d8db Merge "Delete android.speech.srec.*" into mnc-dev 2015-06-17 11:38:16 +00:00
Yohei Yukawa
97261d7979 am 6df39517: am f4d225a4: Fix debug log for SpellCheckerSessionListenerImpl#TASK_CANCEL
* commit '6df395171de030be8aeca1f89c5b1641133fa2bb':
  Fix debug log for SpellCheckerSessionListenerImpl#TASK_CANCEL
2015-06-17 04:43:10 +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
54090fef78 am cfcd232e: am e34f0984: Merge "Fix a reference leak in SpellCheckerSessionListenerImpl." into mnc-dev
* commit 'cfcd232e453cbb9a0ce2ac1f61250680afdb1b52':
  Fix a reference leak in SpellCheckerSessionListenerImpl.
2015-06-17 03:13:23 +00:00
Yohei Yukawa
e34f0984bb Merge "Fix a reference leak in SpellCheckerSessionListenerImpl." into mnc-dev 2015-06-17 02:54:08 +00:00
Dianne Hackborn
216f5c3347 Bring back screenshot API.
Change-Id: Ia6bdfa300398d39119239f6a88c9992673edb3e0
2015-06-16 18:12:31 -07:00
Junda Liu
603bf00fcb am 25acdffa: am a11ffa64: Merge "Remove hide_carrier_network_settings from Settings." into mnc-dev
* commit '25acdffa23be41c4e49021153983d67e9fa48e38':
  Remove hide_carrier_network_settings from Settings.
2015-06-16 23:32:58 +00:00