drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
158,707 Commits 1 Branch 0 Tags
Commit Graph

9157 Commits

Author SHA1 Message Date
Jim Miller
260efa2fd5 am 1d7f775c: am bb9e9c7b: am 2dfada6c: Merge "Cleanup - Change name of confirm credentials method after API review" into lmp-dev 
* commit '1d7f775cca1def096906bd96f60d8767e15cbaf2':
  Cleanup - Change name of confirm credentials method after API review
 2014-09-05 22:09:47 +00:00
Eino-Ville Talvala
76bc0395b6 am 4b570b11: am a42873d6: am 8a52744d: Merge "Camera2: Final API revisions" into lmp-dev 
* commit '4b570b11d7835ea1e71e6134a932ecc6f4c15e70':
  Camera2: Final API revisions
 2014-09-05 22:09:42 +00:00
Derek Tan
274baa73c5 Remove setCdmaSubscription API. 
Bug: 17255752
Change-Id: I0adc5c3d1b690d86f538c084d17d239f7ffccfca
 2014-09-05 14:48:11 -07:00
Nancy Chen
cf2858d363 Merge "Rename listener to callback for ConferenceManager and rename strings 1/4" into lmp-dev 2014-09-05 21:46:27 +00:00
RoboErik
b59eacf5fe resolved conflicts for merge of a41f48f8 to master 
Change-Id: Ida37d1eacf32a391cd1963e31f8fd76d97e9869a
 2014-09-05 14:29:31 -07:00
Jae Seo
7492a4c1f4 Merge "API review: android.media.tv" into lmp-dev 2014-09-05 21:00:26 +00:00
Nancy Chen
1d834f51df Rename listener to callback for ConferenceManager and rename strings 1/4 
Updates for items from API review. See bug for details.

Bug: 17390175
Change-Id: I716a12b763766a385b08f8731d9533589639f467
 2014-09-05 13:59:11 -07:00
Jim Miller
fd5bf4ea77 Merge "Cleanup - Change name of confirm credentials method after API review" into lmp-dev 2014-09-05 20:58:17 +00:00
Eino-Ville Talvala
71aa8ab5d7 Merge "Camera2: Final API revisions" into lmp-dev 2014-09-05 20:43:52 +00:00
Jae Seo
2778f5a7bd API review: android.media.tv 
TvInputInfo
- Renamed getIntentForSettingsActivity to createSettingsIntent.
- Renamed getIntentForSetupActivity to createSetupIntent.
- Changed the value of EXTRA_INPUT_ID from inputId to
  android.media.tv.extra.INPUT_ID.
- Removed @hiden from CREATOR.

TvInputManager
- Renamed TvInputListener to TvInputCallback.
- Renamed registerListener to registerCallback.
- Renamed unregisterListener to unregisterCallback.
- Changed the value of ACTION_BLOCKED_RATINGS_CHANGED from
  android.media.tv.TvInputManager.ACTION_BLOCKED_RATINGS_CHANGED
  to android.media.tv.action.BLOCKED_RATINGS_CHANGED.
- Changed the value of ACTION_PARENTAL_CONTROLS_ENABLED_CHANGED from
  android.media.tv.TvInputManager.ACTION_PARENTAL_CONTROLS_ENABLED_CHANGED
  to android.media.tv.action.PARENTAL_CONTROLS_ENABLED_CHANGED.
- Changed the value of ACTION_QUERY_CONTENT_RATING_SYSTEMS from
  android.media.tv.TvInputManager.ACTION_QUERY_CONTENT_RATING_SYSTEMS
  to android.media.tv.action.QUERY_CONTENT_RATING_SYSTEMS.
- Changed the value of META_DATA_CONTENT_RATING_SYSTEMS from
  android.media.tv.TvInputManager.META_DATA_CONTENT_RATING_SYSTEMS
  to android.media.tv.metadata.CONTENT_RATING_SYSTEMS.

TvView
- Renamed TvInputListener to TvInputCallback.
- Renamed setTvInputListener to setCallback.

Bug: 17389538
Change-Id: I3dceee3db67862d77b183aef0da4fd3a8681ab1b
 2014-09-05 13:43:27 -07:00
RoboErik
7d0db3c364 am 8fe00fb8: am a21df8dd: am 52dcc8a1: Merge "rename add/removeCallback to register/unregisterCallback" into lmp-dev 
* commit '8fe00fb8658c49a4bfd6e5bb4665d91f3879fcf6':
  rename add/removeCallback to register/unregisterCallback
 2014-09-05 20:32:32 +00:00
RoboErik
88d98d3aab am 8fe56085: am 8c47737f: am fa8c8c3a: Merge "rename SERVICE_ACTION to SERVICE_INTERFACE" into lmp-dev 
* commit '8fe5608598eefe7213fb978cad77981011773a26':
  rename SERVICE_ACTION to SERVICE_INTERFACE
 2014-09-05 20:32:22 +00:00
Amith Yamasani
7bdb80e811 am 6de6199a: am 6b71eada: am 221281ce: Merge "Rename getLocalApprovalIntent to createLocalApprovalIntent" into lmp-dev 
* commit '6de6199a7a9df4f5c495a7a038a71b67e29acb93':
  Rename getLocalApprovalIntent to createLocalApprovalIntent
 2014-09-05 20:32:18 +00:00
Michael Wright
f415d8243d am 798d3953: am 58f5f69b: am e252525f: Merge "Add extra to ASSIST intent to indicate potential input type" into lmp-dev 
* commit '798d39533c258411e0c879961c7c54a76bbb99bc':
  Add extra to ASSIST intent to indicate potential input type
 2014-09-05 20:32:12 +00:00
RoboErik
d89025f505 Merge "Minor tweaks to MediaBrowser" into lmp-dev 2014-09-05 19:49:46 +00:00
RoboErik
dfafca7691 Merge "rename add/removeCallback to register/unregisterCallback" into lmp-dev 2014-09-05 19:49:36 +00:00
RoboErik
845755d6e7 Merge "rename SERVICE_ACTION to SERVICE_INTERFACE" into lmp-dev 2014-09-05 19:45:44 +00:00
Amith Yamasani
4b278afa0d Merge "Rename getLocalApprovalIntent to createLocalApprovalIntent" into lmp-dev 2014-09-05 19:43:44 +00:00
Eino-Ville Talvala
fd887436bd Camera2: Final API revisions 
- Rename listeners to callbacks. Listeners are single-method and are interfaces,
  while callbacks are abstract may get more methods in the future.
- Use register/unregister for registering callbacks, not add/remove.

Bug: 17389922
Change-Id: Ic6b46ad79cb43a43a85e2a4b63f059d3af99798b
 2014-09-05 12:43:11 -07:00
Michael Wright
57b4ad9f5a Merge "Add extra to ASSIST intent to indicate potential input type" into lmp-dev 2014-09-05 19:36:47 +00:00
Jim Miller
2f2ebcd688 Cleanup - Change name of confirm credentials method after API review 
Fixes bug 17288988

Change-Id: I3d69b52e7ffc9f0268fb4dc9647f8704453668b7
 2014-09-05 12:11:48 -07:00
RoboErik
5dfa0a5f7a Minor tweaks to MediaBrowser 
-A swapped the param order on MediaBrowser.MediaItem constructor
-Added a missing aidl file for MediaItem

bug:17205016
Change-Id: I61538d76f76a993ed5a47b881e0d291fef1d8db3
 2014-09-05 11:40:34 -07:00
RoboErik
14f717a506 rename add/removeCallback to register/unregisterCallback 
bug:17390821
Change-Id: Id610b481083686dba2a28b6c7c47b747f89eef4f
 2014-09-05 11:40:33 -07:00
Jeff Sharkey
cb1919278e am d64f08ff: am 27264229: am a32e4e6b: Merge "Allow badging updates to install sessions." into lmp-dev 
* commit 'd64f08ff18f7943890b2940b178313e8c00ae410':
  Allow badging updates to install sessions.
 2014-09-05 18:22:23 +00:00
Jeff Sharkey
43a2d06166 Merge "Allow badging updates to install sessions." into lmp-dev 2014-09-05 17:56:39 +00:00
Chris Craik
631c340194 am c9f885ee: am c11d202a: am 96b6b3df: Merge "Hide color filter mutability" into lmp-dev 
* commit 'c9f885ee1efe3eca7aef68ebb4249c4df6f5ff99':
  Hide color filter mutability
 2014-09-05 17:52:44 +00:00
George Mount
9ee0ca2744 am 4b97ca76: am a0031cbc: am 1377fe31: Merge "API Review: Improve javadoc." into lmp-dev 
* commit '4b97ca7682cde8eeec281efd488189b46ca4c986':
  API Review: Improve javadoc.
 2014-09-05 17:52:27 +00:00
Amith Yamasani
51a0e5b546 Rename getLocalApprovalIntent to createLocalApprovalIntent 
Based on API review.

Bug: 17389920
Change-Id: I84674f25a84d317f017473b6f4ac19c849079323
 2014-09-05 10:51:13 -07:00
Svetoslav
de5684b5a7 am 35c2aca2: am 1d85c1a4: am 4c8c9ac0: Merge "Update FrameStats API per api-council request." into lmp-dev 
* commit '35c2aca25a56efc9479f03094052f16cf7f94219':
  Update FrameStats API per api-council request.
 2014-09-05 17:35:27 +00:00
Svetoslav
13daae1862 am 170ace43: am 35952bf0: am 6f0cf112: Merge "Addressing API council comments for UserManager." into lmp-dev 
* commit '170ace439d91cb86f7b5b6f8129d44e2e5c40d61':
  Addressing API council comments for UserManager.
 2014-09-05 17:35:22 +00:00
Chris Craik
0edfd0be15 Merge "Hide color filter mutability" into lmp-dev 2014-09-05 17:30:50 +00:00
George Mount
0ff16cf43a Merge "API Review: Improve javadoc." into lmp-dev 2014-09-05 17:29:29 +00:00
George Mount
f9557619a7 API Review: Improve javadoc. 
Bug 17189781
Also rename PatternMotion to PatternPathMotion

Change-Id: I1c4dcbdd65e33cf9de1504277e31f9f7ede0380d
 2014-09-05 10:27:27 -07:00
Jeff Sharkey
199f51ce30 am be5a66f7: am b4733a8d: am e7bea8e5: Merge "Move Size parceling to Bundle." into lmp-dev 
* commit 'be5a66f706fdffe5eb0e9e744b94a5cd73d58e4a':
  Move Size parceling to Bundle.
 2014-09-05 17:19:40 +00:00
Amith Yamasani
d47b185a4e am 4a73cfc4: am e7d2fe20: am 5c605494: Merge "Fix current.txt (fixes build)" into lmp-dev 
* commit '4a73cfc46eca86105de27ed75dbc19dcd43b14a8':
  Fix current.txt (fixes build)
 2014-09-05 17:19:26 +00:00
Evan Charlton
dfa1ee5242 am c50011c0: am a42cdf2a: am 2b70dbb4: Merge "Add a constant for CHANGE_PHONE_ACCOUNTS action" into lmp-dev 
* commit 'c50011c0903c79a32d375a533c590b8616e57fa5':
  Add a constant for CHANGE_PHONE_ACCOUNTS action
 2014-09-05 17:19:11 +00:00
Robert Greenwalt
683aba53f8 am 9d869562: am b6b07686: am a155ef81: Merge "Fix networking API per scripting checks." into lmp-dev 
* commit '9d869562cbcb9cabcba58320fdc3f6f5632809a9':
  Fix networking API per scripting checks.
 2014-09-05 17:18:46 +00:00
Dharmesh Mokani
140616a89c am 6feba6b6: am 0b230ea6: am efd4ea01: Merge "Address API review comment:AlwaysOnHotwordDetector" into lmp-dev 
* commit '6feba6b61ecddcb93a2b33a2ea52daad6cf70bd5':
  Address API review comment:AlwaysOnHotwordDetector
 2014-09-05 17:18:26 +00:00
Evan Charlton
6de978d017 am 0142b522: am 3b1f8394: am 55533d6a: Merge "Add a way to fetch the current connection manager" into lmp-dev 
* commit '0142b5226f593aa8869d83e63683b45bb7ff14c4':
  Add a way to fetch the current connection manager
 2014-09-05 17:18:21 +00:00
Marcin Kosiba
7dcb4e6c3e am 9257e8e4: am e9c1cb95: am 210d7b22: Merge "Rename WebResourceRequest.hasUserGestureInsecure to hasGesture." into lmp-dev 
* commit '9257e8e46234095a09c8678dc5cb4eefc09afedf':
  Rename WebResourceRequest.hasUserGestureInsecure to hasGesture.
 2014-09-05 17:18:11 +00:00
Shishir Agrawal
6ac9a8d601 am bd026736: am f6b053a5: am e90b1315: Merge "IccOpenLogicalChannelResponse: Adding final to fa few constants." into lmp-dev 
* commit 'bd026736b81ec9236d421f8d7702e84d2df4dc74':
  IccOpenLogicalChannelResponse: Adding final to fa few constants.
 2014-09-05 17:17:58 +00:00
Esteban Talavera
d8dd59afd8 am 07dfb259: am 4414705e: am 2c6aa357: Merge "Changed value of EXTRAs to match constant name in code." into lmp-dev 
* commit '07dfb259b5af6921ec80588df2d01f28805e8b15':
  Changed value of EXTRAs to match constant name in code.
 2014-09-05 17:17:53 +00:00
Jeff Sharkey
ec9bad2015 Allow badging updates to install sessions. 
For the system restore use-case, an installer may need to enqueue
their sessions quickly before badging details, like icons, have been
downloaded.  This change relaxes to allow an installer to update
their session badging after the session has been created.  Notify
observers when badging changes.

Rename callback registration methods to match style guide.  Relax
constraint that observers are home app.  Fix bug around internal
progress reporting.

Bug: 17376797, 17389236, 17334199
Change-Id: I5fb88508baea2f08e89a1504fcf5ef972afad4a7
 2014-09-05 10:15:15 -07:00
Svetoslav
53dcd394aa Update FrameStats API per api-council request. 
bug:17390382

Change-Id: I50518834569f4d0ec394709294537256f03530e0
 2014-09-05 10:07:02 -07:00
Svetoslav
c7d62f02b8 Addressing API council comments for UserManager. 
bug:17390424

Change-Id: I498d2541289915cb7db16e5c3249ccc7a7dc5ee6
 2014-09-05 10:07:02 -07:00
Jeff Sharkey
d3cc74cac2 Merge "Move Size parceling to Bundle." into lmp-dev 2014-09-05 16:46:00 +00:00
Amith Yamasani
450592d37c Merge "Fix current.txt (fixes build)" into lmp-dev 2014-09-05 16:28:19 +00:00
Amith Yamasani
229a125fa2 Fix current.txt (fixes build) 
Change-Id: Iaa9272d6f32b1562c7d1fbd41e8031c0f9050953
 2014-09-05 16:28:03 +00:00
Evan Charlton
c69bfe24a8 Merge "Add a constant for CHANGE_PHONE_ACCOUNTS action" into lmp-dev 2014-09-05 16:27:59 +00:00
Robert Greenwalt
a0843f4967 Merge "Fix networking API per scripting checks." into lmp-dev 2014-09-05 16:17:26 +00:00