Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
138,157 Commits 3 Branches 0 Tags
fcab516cd42f5b2455502853cdb24e0beae485eb
Commit Graph

40370 Commits

Author SHA1 Message Date
Ruben Brunk
fcab516cd4 am 37532379: Merge "DNG: Hide unimplemented methods." into lmp-preview-dev 
* commit '37532379e7c770555b140332112a34fe716fed22':
  DNG: Hide unimplemented methods.
 2014-06-04 22:58:48 +00:00
Matthew Williams
4b8bb98d63 Merge "Redact SyncService stuff from master" 2014-06-04 22:45:24 +00:00
Ruben Brunk
35677d1762 Merge "DNG: Hide unimplemented methods." into lmp-preview-dev 2014-06-04 22:25:18 +00:00
Zhijun He
dcb65c3125 am b4f18bf1: Merge "Camera2: Update availableStreamConfigurations for JPEG sizes" into lmp-preview-dev 
* commit 'b4f18bf11d7f0ca574ed9477486fd50e7c923023':
  Camera2: Update availableStreamConfigurations for JPEG sizes
 2014-06-04 22:11:31 +00:00
Elliott Hughes
a2d1454133 am ef3aeeca: am 38a5a257: am 759a8978: Merge "Minor javadoc improvements for PackageManager." 
* commit 'ef3aeecacd4c47f6baeb96d06d69aad1ca4bcb1a':
  Minor javadoc improvements for PackageManager.
 2014-06-04 22:06:28 +00:00
Craig Mautner
a0c808bb75 am d842513c: Merge "Launch document sharing into unique activities" into lmp-preview-dev 
* commit 'd842513c3df5fd3e46a70ab6798b4d3d20c4ef0b':
  Launch document sharing into unique activities
 2014-06-04 22:03:12 +00:00
Elliott Hughes
ef3aeecacd am 38a5a257: am 759a8978: Merge "Minor javadoc improvements for PackageManager." 
* commit '38a5a257a9aaf85606eb7117d943a877dc7d3c93':
  Minor javadoc improvements for PackageManager.
 2014-06-04 22:02:34 +00:00
Zhijun He
d618169619 Merge "Camera2: Update availableStreamConfigurations for JPEG sizes" into lmp-preview-dev 2014-06-04 21:56:27 +00:00
Matthew Williams
5a9decd589 Redact SyncService stuff from master 
This changes the API surface area, deleting things we aren't releasing.
I'll do the internal clean-up at the same time I do the SyncManager
refactor to sit on top of the TaskManager.
Bug: 14997851
Change-Id: Ibefbb246f0e98d3159399151744279902468a23c
 2014-06-04 14:55:53 -07:00
Adam Powell
27f78dc7f2 am 45366a20: Merge "Fix EdgeEffect clipping and AbsListView\'s use of it" into lmp-preview-dev 
* commit '45366a2036483d5beca5b9cffdb5acdae72d787a':
  Fix EdgeEffect clipping and AbsListView's use of it
 2014-06-04 21:32:57 +00:00
Elliott Hughes
759a89782d Merge "Minor javadoc improvements for PackageManager." 2014-06-04 21:26:49 +00:00
Robin Lee
7f2d5162fd am c774caff: am 4891a9f9: am e46e6004: Merge "Assign AID_EVERYONE gid to newly-created processes" 
* commit 'c774caff86d2e5dc5ca3a0008007cb0fd384568b':
  Assign AID_EVERYONE gid to newly-created processes
 2014-06-04 21:13:24 +00:00
Craig Mautner
4c6debb767 Merge "Launch document sharing into unique activities" into lmp-preview-dev 2014-06-04 21:13:06 +00:00
Robin Lee
c774caff86 am 4891a9f9: am e46e6004: Merge "Assign AID_EVERYONE gid to newly-created processes" 
* commit '4891a9f9cfee569c0d362f1781f44493f5e320c0':
  Assign AID_EVERYONE gid to newly-created processes
 2014-06-04 21:09:52 +00:00
Zhijun He
df9b74781a Camera2: Update availableStreamConfigurations for JPEG sizes 
Also Fix some doc issue in availableCapabilities

Bug: 12035686
Change-Id: Ie517a587f4a9e6cd9731fcca042e24adf832d9e3
 2014-06-04 20:56:20 +00:00
Robert Greenwalt
51e0be16b4 am 02006632: Merge "Call a network restricted only if all capabilities are restricted" into lmp-preview-dev 
* commit '02006632ef34d70e196a47a3b11ff344005acbb1':
  Call a network restricted only if all capabilities are restricted
 2014-06-04 20:52:50 +00:00
Robin Lee
e46e600412 Merge "Assign AID_EVERYONE gid to newly-created processes" 2014-06-04 20:51:55 +00:00
Adam Powell
9be22455ac Fix EdgeEffect clipping and AbsListView's use of it 
Make sure that we clip the edge glow against the edges of the view and
not against padding. If we're clipping to padding already, this will
happen automatically.

Bug 15020863

Change-Id: I4645c92f2a372d3c9fa8bb5a9fda44c0d82ac4cf
 2014-06-04 13:46:55 -07:00
Ruben Brunk
8e783f7a52 DNG: Hide unimplemented methods. 
Bug: 15112503
Change-Id: I31187a92b610af68fb854a27a564abf7d0635478
 2014-06-04 13:21:04 -07:00
Adrian Roos
b4df2f586a am b2302d43: Merge "Ensure trust agents are only provided by platform packages" into lmp-preview-dev 
* commit 'b2302d437fd636d9973f466062cfad145cdd042d':
  Ensure trust agents are only provided by platform packages
 2014-06-04 20:04:55 +00:00
Michael Wright
713059d4af Merge "Making KEYCODE_PAIRING a wakeup key." 2014-06-04 19:41:59 +00:00
Michael Wright
8ac485a303 Making KEYCODE_PAIRING a wakeup key. 
Bug: 15430207
Change-Id: I4bb862e22d32af1a89741d39a694b790aa52dfcd
 2014-06-04 12:38:18 -07:00
Lorenzo Colitti
ebdba2e678 am 7a3077a9: Merge "Make requests for restricted networks not require unrestricted access." into lmp-preview-dev 
* commit '7a3077a9a7405048b9cd28452efbc28a857acb25':
  Make requests for restricted networks not require unrestricted access.
 2014-06-04 18:46:31 +00:00
Alan Viverette
7820b7bf5d am 4dd60289: Merge "Fix RadialTimePicker styling" into lmp-preview-dev 
* commit '4dd60289af766c9a256b57a3d1a8662131d28230':
  Fix RadialTimePicker styling
 2014-06-04 18:45:24 +00:00
Adam Powell
a649e8def9 am 5519852e: Merge "Implement action bar tab mode for Toolbar-based decor action bars" into lmp-preview-dev 
* commit '5519852e01a646af65efeee30f5b8e80c2cd87e7':
  Implement action bar tab mode for Toolbar-based decor action bars
 2014-06-04 18:45:04 +00:00
Igor Murashkin
da525e542b am 1a68eb96: Merge "camera2: Implement most of CameraCaptureSession" into lmp-preview-dev 
* commit '1a68eb968f77af341a60708b85072ae805e6dc10':
  camera2: Implement most of CameraCaptureSession
 2014-06-04 18:44:46 +00:00
Craig Mautner
f3f8a73a57 am 05cd6c39: Merge "Force all windows to redraw before unblanking screen" into lmp-preview-dev 
* commit '05cd6c39824653e0f7e8641444a7134e8cac72f4':
  Force all windows to redraw before unblanking screen
 2014-06-04 18:44:16 +00:00
Adam Powell
3decd141a5 am ab9906c0: Merge "Support list navigation mode for toolbar action bars" into lmp-preview-dev 
* commit 'ab9906c0735fb22017f3d673207897347edeba92':
  Support list navigation mode for toolbar action bars
 2014-06-04 18:44:02 +00:00
Ruben Brunk
ccee3b158a am c354b069: Merge "DNG: Write out additional fields." into lmp-preview-dev 
* commit 'c354b06955508816af29daefdac5ef9ea9b89fbb':
  DNG: Write out additional fields.
 2014-06-04 18:43:50 +00:00
John Spurlock
7b92af62b8 am 7e127344: Zen: Stateful condition panel. 
* commit '7e12734486152ee4f6467e13e6b4cdd3a9c7bf8d':
  Zen: Stateful condition panel.
 2014-06-04 18:43:37 +00:00
Alan Viverette
22b893fde1 Merge commit '096d52fb' into manualmerge 
Conflicts:
	api/current.txt

Change-Id: Iaf1f9172a73e74885475c30ffefcb7d0e32a5883
 2014-06-04 11:42:06 -07:00
Adrian Roos
14830a332f Merge "Hide TrustAgentService in lmp-preview - DO NOT MERGE" into lmp-preview-dev 2014-06-04 18:10:03 +00:00
Alan Viverette
1fa8b11d93 am cd5b044e: Merge "Fix drawable cache, add quantum assets to preload list" into lmp-preview-dev 
* commit 'cd5b044eaf38cc1fad926dff5d5d1b35c3c8b6a3':
  Fix drawable cache, add quantum assets to preload list
 2014-06-04 18:09:14 +00:00
Craig Mautner
2c60de3f6d Launch document sharing into unique activities 
If the same item is shared twice (or more) a new activity for
sharing will be launched each time. Previously the first sharing
activity would be reused.

Fixes bug 14903271.

Change-Id: Ib9e618f3d42079836529e86c138a6c999350cac5
 2014-06-04 11:06:42 -07:00
Hector Dearman
13d6cfb3b5 Merge "Removes bad comment from CookieManager" 2014-06-04 17:12:36 +00:00
Robert Greenwalt
9fcabfee51 Merge "Call a network restricted only if all capabilities are restricted" into lmp-preview-dev 2014-06-04 16:44:54 +00:00
Adrian Roos
b803ad3c2c Hide TrustAgentService in lmp-preview - DO NOT MERGE 
Bug: 15287044
Change-Id: Iba0d53b87bcb4bddccec89cf943ed65491aa9d76
 2014-06-04 15:04:19 +00:00
Adrian Roos
1e9021aef8 Merge "Ensure trust agents are only provided by platform packages" into lmp-preview-dev 2014-06-04 13:18:40 +00:00
Lorenzo Colitti
ea1984fd3b Call a network restricted only if all capabilities are restricted 
When guessing whether a network is restricted or not (e.g., when
constructing a NetworkCapabilities object from an APN type, or
when constructing a request using startUsingNetworkFeature),
only assume the network is restricted if all the capabilities it
provides are typically provided by restricted networks (e.g.,
IMS, FOTA, etc.).

Previous code would conclude a network was restricted even if it
supported one "restricted" capability, so for example an APN
that provides both Internet connectivity and FOTA was marked as
restricted. This caused it to become ineligible to provide the
default Internet connection, because that must be unrestricted.

Also expand the list of restricted APN types a bit.

Bug: 15417453
Change-Id: I8c385f2cc83c695449dc8cf943d918321716fe58
 2014-06-04 20:04:38 +09:00
Sander Alewijnse
1b8737ee18 Merge "Remove enableSystemApp() and enableSystemAppWithInten()." 2014-06-04 10:11:46 +00:00
Przemyslaw Szczepaniak
e3abed72d6 Add missing #isSpeaking to TTS API V2 
TextToSpeech#isSpeaking queries TTS engine if it's
currently outputting any audio, it was present in the
TTS API V1.

Change-Id: Iee4a91976b9b80653811fb458ac48d75418752cf
 2014-06-04 09:16:55 +00:00
Yuncheol Heo
41eca132b2 Merge "Add API definition for WebSettings.setVideoOverlayForEmbeddedEncryptedVideoEnabled." 2014-06-04 05:12:55 +00:00
Lorenzo Colitti
4077acbecc Make requests for restricted networks not require unrestricted access. 
Currently, calling startUsingNetworkFeature for a restricted APN
type (e.g., IMS or FOTA) will create a request that requires
NET_CAPABILITY_NOT_RESTRICTED. Because these APNs are restricted,
when we bring them up we conclude that it does not match the
unrestricted requirement, and we tear them down.

1. Clear the NET_CAPABILITY_NOT_RESTRICTED capability when
   creating requests in startUsingNetworkFeature.
2. Refactor the code to a common function so this cannot happen
   again.

Bug: 15191336
Change-Id: Id1ec79c58ff79b1a83457ffaecc57d50b61ed4e4
 2014-06-04 12:20:06 +09:00
Alan Viverette
eb1d3798e3 Fix RadialTimePicker styling 
Also sneaks in some whitespace cleanup for PhoneWindow!

Change-Id: I1bc8a889a59d69ae80b6cfbf54d57cd7f8ad4a36
 2014-06-03 18:36:03 -07:00
Adam Powell
bc1ff4dd7e Merge "Implement action bar tab mode for Toolbar-based decor action bars" into lmp-preview-dev 2014-06-04 01:17:06 +00:00
Igor Murashkin
c6b4d9b8d1 Merge "camera2: Implement most of CameraCaptureSession" into lmp-preview-dev 2014-06-04 01:00:06 +00:00
Adam Powell
e002c2fb39 Implement action bar tab mode for Toolbar-based decor action bars 
Coordinate between the stacked row, etc. Also fix a silly bug in
Toolbar child views with Gravity.BOTTOM.

Bug 15332084

Change-Id: Ie91b7d5255c63d9befcc65d7939c1523e018809f
 2014-06-03 17:58:22 -07:00
Craig Mautner
4021b3ba74 Merge "Force all windows to redraw before unblanking screen" into lmp-preview-dev 2014-06-04 00:21:01 +00:00
Craig Mautner
8a0da0184f Force all windows to redraw before unblanking screen 
The screen turning on would show windows as they were when the screen
turned off. This fix forces all showing windows to redraw first and
only then allow the screen to turn on.

Fixes bug 15092354.

Change-Id: I52c3f47438176a5ac00ba9a4d5205b56a5aa48f9
 2014-06-03 17:08:02 -07:00
Adam Powell
0b4da0c4f2 Merge "Support list navigation mode for toolbar action bars" into lmp-preview-dev 2014-06-03 23:56:43 +00:00