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

53377 Commits

Author SHA1 Message Date
Selim Gurun
dc0e71bdd2 am 8d79e36c: Merge "Clarify handling client certificates" into mnc-dev 
* commit '8d79e36c886a092bbc3d97b9c573e39021739886':
  Clarify handling client certificates
 2015-06-19 19:01:07 +00:00
Adrian Roos
748dc2be27 am 4f43dc04: Assist disclosure 
* commit '4f43dc042bf76ec6c3b340b2297dec7c4cdd9098':
  Assist disclosure
 2015-06-19 18:51:18 +00:00
Selim Gurun
8d79e36c88 Merge "Clarify handling client certificates" into mnc-dev 2015-06-19 18:48:49 +00:00
Selim Gurun
36cf701e1e Clarify handling client certificates 
Bug: 21910771

Clarify handling client certificates when using a webview. This is a
documentation change only.

Change-Id: Ifcd7c2c9fffc79c1dcc162d829dfbb175cddaa11
 2015-06-19 11:46:29 -07:00
Abodunrinwa Toki
652574f06d am 6983752a: Merge "Better FloatingToolbar positioning." into mnc-dev 
* commit '6983752a10a4dc097bc49882f8ea2ba874d554da':
  Better FloatingToolbar positioning.
 2015-06-19 18:35:07 +00:00
David Srbecky
e1be38d7fd am f32f7a3f: Merge "Replace --include-cfi with --generate-debug-info." into mnc-dev 
* commit 'f32f7a3ffdbb80fb8d635c1aacaf0c7d2c2dde9f':
  Replace --include-cfi with --generate-debug-info.
 2015-06-19 18:35:02 +00:00
Adrian Roos
4f43dc042b Assist disclosure 
Add an animation that discloses delivery
of contextual data to the assist component.

Also fixes a bug where contextual data was
delivered to legacy assist activities even
though the user explicitly disabled context.

Bug: 21568059
Change-Id: I27dfaa36e2f677b0d73acfa4730f0f4ea3486919
 2015-06-19 11:33:05 -07:00
Abodunrinwa Toki
6983752a10 Merge "Better FloatingToolbar positioning." into mnc-dev 2015-06-19 18:28:20 +00:00
Alan Viverette
396bccd8f5 am 7c669f45: Merge "Revert "Work around inconsistent views in RelativeLayout.onMeasure()"" into mnc-dev 
* commit '7c669f4547d459d64ac403647e177b9953dfe60a':
  Revert "Work around inconsistent views in RelativeLayout.onMeasure()"
 2015-06-19 18:27:17 +00:00
Christopher Tate
27d11f99c3 am 7ad40c50: Merge "Debug logging for a certain class of binder transaction failures" into mnc-dev 
* commit '7ad40c503281a797e2ca30e5e06a6e0c562471a7':
  Debug logging for a certain class of binder transaction failures
 2015-06-19 18:27:12 +00:00
David Srbecky
f32f7a3ffd Merge "Replace --include-cfi with --generate-debug-info." into mnc-dev 2015-06-19 18:26:42 +00:00
Alan Viverette
7c669f4547 Merge "Revert "Work around inconsistent views in RelativeLayout.onMeasure()"" into mnc-dev 2015-06-19 18:20:21 +00:00
Alan Viverette
9355533bf6 Revert "Work around inconsistent views in RelativeLayout.onMeasure()" 
This reverts commit 3e2e064a1f.

Change-Id: Ib3712076585cba507ef1666e3fb6abb2bedb016f
 2015-06-19 18:19:56 +00:00
Christopher Tate
7ad40c5032 Merge "Debug logging for a certain class of binder transaction failures" into mnc-dev 2015-06-19 18:19:15 +00:00
Christopher Tate
8a2ce3c751 Debug logging for a certain class of binder transaction failures 
Bug 21801759

Change-Id: I9973d4ffb9450e510a4e1c64e2eae1489ce93054
 2015-06-19 11:17:24 -07:00
Abodunrinwa Toki
9ae95dff1d Better FloatingToolbar positioning. 
-The toolbar is now rendered over the IME.
-The toolbar respects the presence of the IME and tries as much as
 possible not to obstruct it.
-The toolbar may obstruct the IME if there is limited space and we
 can't find a position that won't obstruct the IME.

*A side effect of the toolbar over the IME is that TextView handles
 will also always be rendered over the IME where necessary. This was
 the previous behavior before the regression.

Bug: 17510971
Change-Id: I26a49565bf025d7c007ba6bb80468c4988fcc051
 2015-06-19 19:15:50 +01:00
Wale Ogunwale
2aace305d2 am 4186c977: Merge "Don\'t write IntentFilter autoVerify field to xml if false." into mnc-dev 
* commit '4186c977eba743bd8718e03326db5c025fd0ccc2':
  Don't write IntentFilter autoVerify field to xml if false.
 2015-06-19 16:43:42 +00:00
Wale Ogunwale
4186c977eb Merge "Don't write IntentFilter autoVerify field to xml if false." into mnc-dev 2015-06-19 16:36:00 +00:00
Zhijun He
8d4cb8a58f am 33e07bd7: Merge "Camera2: add FACE_PRIORITY_LOW_LIGHT" into mnc-dev 
* commit '33e07bd730f552ab0d176b2c3e3c51eabf16bdb8':
  Camera2: add FACE_PRIORITY_LOW_LIGHT
 2015-06-19 16:31:06 +00:00
Zhijun He
33e07bd730 Merge "Camera2: add FACE_PRIORITY_LOW_LIGHT" into mnc-dev 2015-06-19 16:23:42 +00:00
Zhijun He
ee2ebdedcc Camera2: add FACE_PRIORITY_LOW_LIGHT 
Add FACE_PRIORITY_LOW_LIGHT to allow higher sensitivity value AE under low
light.

Also fix some minor doc issue for high speed recording capability.

Bug: 21813977
Change-Id: I965ece936c1bc3d3cb370454e950fde4aad06335
 2015-06-19 09:13:37 -07:00
Wale Ogunwale
15b9fd268a Don't write IntentFilter autoVerify field to xml if false. 
Bug: 21205789
Change-Id: I650265eeec99d470ae2f089d8ae3ef3c866c0096
 2015-06-19 08:59:52 -07:00
Chris Wren
3708edd9ab am 7e786954: Merge "drop corrupt notifications in the Listener" into mnc-dev 
* commit '7e786954e5821ad00335fae5d9c492c855631099':
  drop corrupt notifications in the Listener
 2015-06-19 15:22:48 +00:00
Shawn Willden
3a80e243a8 am df0b80e4: Merge "Add new error codes for rate-limit and max-use failures." into mnc-dev 
* commit 'df0b80e4e1ca8145440161f063b20540095e70ba':
  Add new error codes for rate-limit and max-use failures.
 2015-06-19 15:22:43 +00:00
Chris Wren
7e786954e5 Merge "drop corrupt notifications in the Listener" into mnc-dev 2015-06-19 15:15:22 +00:00
Shawn Willden
df0b80e4e1 Merge "Add new error codes for rate-limit and max-use failures." into mnc-dev 2015-06-19 15:13:22 +00:00
Shawn Willden
91526c1430 Add new error codes for rate-limit and max-use failures. 
Bug: 21607106
Change-Id: Ia0527341f98726bf74c2bfddd9b9a82974fab954
 2015-06-19 09:07:13 -06:00
Abodunrinwa Toki
2140210335 am 07e440b2: Merge "Fix FloatingToolbar flickers." into mnc-dev 
* commit '07e440b2786a5104129a8776a21172539fb4c4a0':
  Fix FloatingToolbar flickers.
 2015-06-19 14:37:39 +00:00
Abodunrinwa Toki
07e440b278 Merge "Fix FloatingToolbar flickers." into mnc-dev 2015-06-19 14:26:11 +00:00
Gustav Sennton
7955100d9b am 1b48a643: Merge "Revert "Load WebView from one out of a list of packages."" into mnc-dev 
* commit '1b48a6430ae503ff2826657ef0d1d4a090f7aa37':
  Revert "Load WebView from one out of a list of packages."
 2015-06-19 13:39:08 +00:00
Gustav Sennton
1b48a6430a Merge "Revert "Load WebView from one out of a list of packages."" into mnc-dev 2015-06-19 13:23:52 +00:00
Gustav Sennton
d973018221 Revert "Load WebView from one out of a list of packages." 
This was not a clean revert!

This reverts commit 2ed6fee15c.
We essentially only revert the functionality for going through a list of
WebView package names and picking the first compatible one.
Except for that functionality we also fetched the name of the shared
library from a flag in WebView and made some minor refactoring in the
initial commit, these changes have been left alone in this revert.

Bug: 21893371
Change-Id: Idb2539dc33cc5f9e2894ecd665c23573c6cba9f3
 2015-06-19 11:38:56 +01:00
Andrei Stingaceanu
26cacca6e9 am 50057943: Merge "Cannot select text after rotation in extract mode" into mnc-dev 
* commit '50057943fbf36c84c220d47115e7cdd13fa01a4c':
  Cannot select text after rotation in extract mode
 2015-06-19 09:40:52 +00:00
Sudheer Shanka
4e4ced24a7 am a408061c: Merge "Use the intent filter icon in ResolveInfo for managed profile." into mnc-dev 
* commit 'a408061cc7b5efaf090ce9efd5fd0ba1d95e9c11':
  Use the intent filter icon in ResolveInfo for managed profile.
 2015-06-19 09:34:58 +00:00
Andrei Stingaceanu
50057943fb Merge "Cannot select text after rotation in extract mode" into mnc-dev 2015-06-19 09:33:04 +00:00
Sudheer Shanka
a408061cc7 Merge "Use the intent filter icon in ResolveInfo for managed profile." into mnc-dev 2015-06-19 09:25:59 +00:00
Shawn Willden
53272e5c33 am 09614808: Merge "Reflect removal of KM_TAG_AEAD_TAG from keymaster." into mnc-dev 
* commit '096148087980ea5a92e1b96579900ea36727fbbc':
  Reflect removal of KM_TAG_AEAD_TAG from keymaster.
 2015-06-19 03:27:23 +00:00
Shawn Willden
0961480879 Merge "Reflect removal of KM_TAG_AEAD_TAG from keymaster." into mnc-dev 2015-06-19 03:16:55 +00:00
Alex Klyubin
42abb74834 Reflect removal of KM_TAG_AEAD_TAG from keymaster. 
This reflects the changes in da89dde9787dfbd8c053119ab52d9e671106b18e
in system/keymaster.

Bug: 19919114
Change-Id: I9cdfc7ce63099c4de29029b1fc112369c4a68eba
 2015-06-18 18:43:45 -07:00
Adam Lesinski
e4186de838 am 8b156e37: Merge "BatteryStats: Update external stats individually." into mnc-dev 
* commit '8b156e37d5238487f1b3742fe9fb8a0632bfd66c':
  BatteryStats: Update external stats individually.
 2015-06-19 01:32:55 +00:00
Adam Lesinski
8b156e37d5 Merge "BatteryStats: Update external stats individually." into mnc-dev 2015-06-19 01:22:53 +00:00
David Srbecky
065075e1f9 Replace --include-cfi with --generate-debug-info. 
This follows a change in dex2oat.

(cherry picked from commit f39477b592)

Bug: 21924613
Change-Id: I46b61298ca00bee2e83080456b180d63efd95b8f
 2015-06-19 02:20:06 +01:00
Adam Lesinski
a7c90c84e4 BatteryStats: Update external stats individually. 
When wifi traffic causes a stats collection, we shouldn't care about
cpu or bluetooth updates.

Bug:21478443
Change-Id: I177dc0fc09951813cb4a702ad0e5d951d69f8c22
 2015-06-18 18:13:36 -07:00
Dianne Hackborn
fdc4e08850 am 0348ba2e: Merge "Fix issue #20494208: Go out of device idle when headset button is pressed" into mnc-dev 
* commit '0348ba2e2303d9dce57a6b5d19cc47ecc5089afe':
  Fix issue #20494208: Go out of device idle when headset button is pressed
 2015-06-19 01:13:03 +00:00
Dianne Hackborn
0348ba2e23 Merge "Fix issue #20494208: Go out of device idle when headset button is pressed" into mnc-dev 2015-06-19 01:01:38 +00:00
Adam Lesinski
2e2da248bd am 00fac635: Merge "BatteryStats: Fix regression in wakelock power distribution" into mnc-dev 
* commit '00fac63575349df5ed8c399b83f1f9c7199ff070':
  BatteryStats: Fix regression in wakelock power distribution
 2015-06-19 01:00:23 +00:00
Dan Sandler
1822d20910 am 11859eba: Merge "Announce chronometers with time-unit words." into mnc-dev 
* commit '11859eba4e0e3c8dc1e2479a83e73dff6536ffc7':
  Announce chronometers with time-unit words.
 2015-06-19 01:00:08 +00:00
Adam Lesinski
00fac63575 Merge "BatteryStats: Fix regression in wakelock power distribution" into mnc-dev 2015-06-19 00:57:47 +00:00
Dan Sandler
11859eba4e Merge "Announce chronometers with time-unit words." into mnc-dev 2015-06-19 00:50:59 +00:00
Dianne Hackborn
b6683c4286 Fix issue #20494208: Go out of device idle when headset button is pressed 
Rework how we record active transitions in battery stats to be
more general, and add an API that others can call in to
DeviceIdleController to request that we go out of idle mode.
use this for VOICE_SEARCH_HANDS_FREE.

Change-Id: Ie58de60e63036a4142881283835961fbcceec892
 2015-06-18 17:40:33 -07:00