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

37329 Commits

Author SHA1 Message Date
Yorke Lee
b68bf447f6 am d6138017: Merge "API changes per API review for contacts" into lmp-preview-dev 
* commit 'd6138017d9d435b176dff424ff75c8e8ea298d06':
  API changes per API review for contacts
 2014-06-05 15:21:22 +00:00
Yohei Yukawa
bd12056154 Merge "Trivial method renaming for notifyTextCommitted" 2014-06-05 15:20:53 +00:00
Kenny Guy
d0969135aa Merge "Badge notification from managed profiles." 2014-06-05 14:20:35 +00:00
Yohei Yukawa
0297051162 Trivial method renaming for notifyTextCommitted 
This CL does not change existing behavior but only renames
notifyTextCommitted with notifyUserAction so that we can use
not only text commit but also other actions such as just typing
a character will be used as a trigger to update the IME
rotation order for better IME switching experience.

BUG: 7043015
Change-Id: I7f3e13a7226ef0dceee82b67e8a0d8536f7e9807
 2014-06-05 23:07:05 +09:00
Adam Connors
7283f963d3 Merge "API Review: rename FEATURE_MANAGEDPROFILES" 2014-06-05 13:07:12 +00:00
Adam Connors
551c0789bc API Review: rename FEATURE_MANAGEDPROFILES 
To be FEATURE_MANAGED_PROFILES

Bug: 15025371
Change-Id: I2f818b4d8488fe7943fe5ff6051d6b1f84ca9e8c
 2014-06-05 12:13:03 +01:00
Craig Mautner
b6011c1c2a Merge commit '21483b9f' into manualmerge 
Change-Id: If9261cc1625f9f492697fe16c21d2b71c0cc0e11
 2014-06-04 20:59:13 -07:00
Craig Mautner
21483b9f0b am e34fcf8f: Merge "Add callback when ActivityView activities complete" into klp-modular-dev 
* commit 'e34fcf8ff9a023641505a8decdeb1b77232d8a16':
  Add callback when ActivityView activities complete
 2014-06-05 03:31:06 +00:00
Craig Mautner
e34fcf8ff9 Merge "Add callback when ActivityView activities complete" into klp-modular-dev 2014-06-05 03:28:21 +00:00
Eino-Ville Talvala
85e5f85f2e am 4b1b33ef: Merge "Camera2: Invoke onError callbacks for failure to open" into lmp-preview-dev 
* commit '4b1b33eff0eabd17f1078d55188b40e9a27d047a':
  Camera2: Invoke onError callbacks for failure to open
 2014-06-05 02:30:08 +00:00
Yorke Lee
1ca440b38f API changes per API review for contacts 
* Improve documentation for REMOVE_DUPLICATE_ENTRIES
* Hide android.provider.ContactsContract.PinnedPositions, it will be
reworked and improved for L.
* Hide android.provider.ContactsContract.Preferences - we will rework
the various apps that are relying on this to use their own preferences
instead
* Remove inheritance of hidden interfaces in android.provider.Contacts

Bug: 15430304
Change-Id: I0f96e8a506083df21023f9b95655f0ce5244bdce
 2014-06-04 18:16:26 -07:00
Craig Mautner
d94b47f3b6 Add callback when ActivityView activities complete 
Users of ActivityViews can now be informed when there are no more
active activities in ActivityView by registering a callback.

Fixes bug 15330616.

Change-Id: I39d55bdb0db8b0a12ee751cdcb039b7fbb899c85
 2014-06-04 17:25:49 -07:00
Eino-Ville Talvala
7fcb357811 Camera2: Invoke onError callbacks for failure to open 
When the initial attempt to connect to the remote camera device fails,
fire the onError callback as documented, instead of throwing an
exception from open().

Also ensure the correct exception is sent when methods are called
while in the error state, and make sure onClosed() is called correctly
if closing the device after an initial startup error.

Bug: 14413756
Bug: 14413363
Change-Id: I0822261dad52bcd428a0c4556202f00032499990
 2014-06-04 16:52:00 -07:00
Igor Murashkin
2ac6c43312 am 97b2bc9a: Merge "camera2: Change CaptureListener callbacks to include the session (api)" into lmp-preview-dev 
* commit '97b2bc9a05a56dad609360f8fec1e5a51059e656':
  camera2: Change CaptureListener callbacks to include the session (api)
 2014-06-04 23:42:58 +00:00
Igor Murashkin
6e9c5cc617 Merge "camera2: Change CaptureListener callbacks to include the session (api)" into lmp-preview-dev 2014-06-04 23:31:54 +00:00
Igor Murashkin
21547d66a9 camera2: Change CaptureListener callbacks to include the session (api) 
* Also makes CameraDevice an abstract class (API)

Bug: 15428219
Bug: 14964443
Change-Id: I0e8c8309186aad59570aac7e0f998bb615405f0a
 2014-06-04 16:03:32 -07:00
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
64939ae385 DO NOT MERGE Redact SyncService stuff from master 
Cherry-pick over 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: Ieebbbcd3324827098e88b36e45e6e82315a51e65
 2014-06-04 22:46:25 +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
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