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

143363 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
6b067c3402 Merge "Measure Toolbar titles last" into lmp-dev 2014-07-18 18:24:25 +00:00
Adam Powell
b606a3a312 Measure Toolbar titles last 
Give the maximum amount of room to "real" content views before taking
up space for the title and subtitle of a toolbar.

Bug 16039951

Change-Id: I10da9cdc39e84e6fb3975ee40958c57031002dd5
 2014-07-19 13:26:16 -07:00
Adam Powell
fba286a056 Merge "Adapt ActionBar.LayoutParams to Toolbar.LayoutParams on demand" into lmp-dev 2014-07-18 18:24:25 +00:00
Adam Powell
eb97f473fc Adapt ActionBar.LayoutParams to Toolbar.LayoutParams on demand 
When Toolbar is acting in the role of an action bar it needs to handle
the case where app code calls setLayoutParams on a custom view with an
ActionBar.LayoutParams instance. Run the newly set LayoutParams
through the check/generate routine normally performed when adding a
child view whenever LayoutParams are set on an existing child to
correct for it.

This might not be a bad thing to generalize someday but it would make
for very confusing compatibility behavior when running code that
was written to expect it on older platform versions.

Bug 16219488

Change-Id: I568a335fe8ebbbaa666690d1f0e95f313abd2f1e
 2014-07-19 11:57:21 -07:00
Jae Seo
31380e8424 Merge "TIF: Add a way to notify whether the current program content is allowed" into lmp-dev 2014-07-18 18:24:25 +00:00
Jae Seo
bbcd206a79 TIF: Add a way to notify whether the current program content is allowed 
Now we have a complete set of API to tell the entire cases (allowed and
blocked), which makes possible for the application to rely more on
actions taken by TV input services transferring the responsibility for
parental control.

Bug: 13172379
Change-Id: I7b0dcf16b870782c76a428a1dac6ef1a528b7d40
 2014-07-18 17:13:07 -07:00
Jean-Michel Trivi
7cdc0b58d6 Merge "Unhide AudioTrack constructor with AudioAttributes, AudioFormat" into lmp-dev 2014-07-18 18:24:25 +00:00
Jean-Michel Trivi
7f6ee760b0 Unhide AudioTrack constructor with AudioAttributes, AudioFormat 
Unhide AudioFormat.Builder
Unhide AudioTrack constructor with AudioAttributes, AudioFormat
Unhide the missing two channels that enable a 7.1 configuration

Change-Id: I60899548da1c688ebe561c25212877e0f3eedb34
 2014-07-18 17:07:04 -07:00
Ihab Awad
3840f33e79 Merge "Fix incomplete move of flags from PhoneAccount to PhoneAccountMetadata" into lmp-dev 2014-07-18 18:24:25 +00:00
Ihab Awad
7522bbd652 Fix incomplete move of flags from PhoneAccount to PhoneAccountMetadata 
Change-Id: I91c0d6be76030117ed3cf6d6d5f7514b4d4802ad
 2014-07-18 16:03:22 -07:00
Yin-Chia Yeh
8f8141e24f Merge "Camera2: add highSpeedVideoConfig wrapper and APIs" into lmp-dev 2014-07-18 18:24:25 +00:00
Yin-Chia Yeh
12da140082 Camera2: add highSpeedVideoConfig wrapper and APIs 
- Add wrapper class for highSpeedVideoConfiguration.
- Add APIs to query high speed video recording configurations in
  StreamConfigurationMap
- Fix ColorSpaceTransform unit test in CameraMetadataTest
- Fix a bug in HashCodeHelper

Change-Id: I192e57f6ab5dfbba6d958571352f067a9eaec7b2
 2014-07-18 16:00:53 -07:00
Andre Eisenbach
b3db5eb4f0 Merge "Reduce GATT logging output" into lmp-dev 2014-07-18 18:24:25 +00:00
Andre Eisenbach
55d19e495e Reduce GATT logging output 
Change-Id: Iefdf101ac849e45bf50c55ce5999364f5fbd24a4
 2014-07-18 14:38:36 -07:00
Youngsang Cho
427f74293b Merge "TIF: Add onInputAdded and onInputRemoved" into lmp-dev 2014-07-18 18:24:25 +00:00
Dan Sandler
92e367ee6f am 7aabcfa3: Merge "Deprecate and stop generating tickerViews." into lmp-dev 
* commit '7aabcfa391a7f0e4955aa5b8f8f396b4dab3579f':
  Deprecate and stop generating tickerViews.
 2014-07-18 18:03:48 +00:00
Dan Sandler
4e5c5b8f25 am 9b557a25: Merge "Actually show secret notifications sometimes." into lmp-dev 
* commit '9b557a250922f1071774fe4b19966b4304875277':
  Actually show secret notifications sometimes.
 2014-07-18 18:03:45 +00:00
Brian Attwell
9013d8b88a am fa15c729: Merge "Mark social APIs stream APIs as deprecated" into lmp-dev 
* commit 'fa15c729359a93bc47337b2204cab3a70588b2c5':
  Mark social APIs stream APIs as deprecated
 2014-07-18 17:52:13 +00:00
Paul Jensen
139d894741 am d2cb9213: Merge "Make back button work in CaptivePortalLogin app like a web browser." into lmp-dev 
* commit 'd2cb92132896bc63c6a0906a385a35b1e5f474a9':
  Make back button work in CaptivePortalLogin app like a web browser.
 2014-07-18 17:33:47 +00:00
Ihab Awad
1bb820a9a9 am 42c4a935: Merge "Wire up multi-SIM experience (1/4)" into lmp-dev 
* commit '42c4a935466ad2909f1e7f1bc6f38682847d9840':
  Wire up multi-SIM experience (1/4)
 2014-07-18 17:19:09 +00:00
Narayan Kamath
81244e1d57 am 8ebfdcbc: Merge "Fix broken locale related assumptions in TextServicesManager." into lmp-dev 
* commit '8ebfdcbce191ec6d6203df727225584798ebe90b':
  Fix broken locale related assumptions in TextServicesManager.
 2014-07-18 16:33:41 +00:00
Yigit Boyar
193c9f5439 am d81c4869: Update RecyclerView scroll listener to the new API 
* commit 'd81c4869401b42bec84c935a1223134862089547':
  Update RecyclerView scroll listener to the new API
 2014-07-18 16:17:59 +00:00
Yigit Boyar
753c114d84 Update RecyclerView scroll listener to the new API 
Bug: 16054949
Change-Id: I264a701e8b298a08f09bb30284099734054d518c
 2014-07-18 16:13:14 +00:00
Niels Egberts
966ab8c674 am 8fe5ff89: Merge "New TtsSpan builders for types measure, time, date, digits and verbatim." into lmp-dev 
* commit '8fe5ff8954a8d08f488a313dd6b6cc28b3447121':
  New TtsSpan builders for types measure, time, date, digits and verbatim.
 2014-07-18 15:53:48 +00:00
John Spurlock
8b758e0399 am 59371a77: Merge "Volume: Dismiss shade when launching settings from rocker." into lmp-dev 
* commit '59371a77eeede48b98d51c5914e8ffd290f630ff':
  Volume: Dismiss shade when launching settings from rocker.
 2014-07-18 15:53:44 +00:00
Jean-Michel Trivi
2b91e29364 am 9319d51e: Merge "Unhide audio virtualizer capability query methods" into lmp-dev 
* commit '9319d51ea80f562b176ced9559d69b5ba4652de4':
  Unhide audio virtualizer capability query methods
 2014-07-18 15:33:12 +00:00
Niels Egberts
6d21020c58 am bfe7d019: Merge "Add builders for TtsSpans of type ordinal, decimal and fraction." into lmp-dev 
* commit 'bfe7d01977db5e2ebd27694d17ee9b32c4b93795':
  Add builders for TtsSpans of type ordinal, decimal and fraction.
 2014-07-18 15:28:15 +00:00
Narayan Kamath
5729e6c217 am c2819ea1: Merge "Unhide." into lmp-dev 
* commit 'c2819ea18c06d729dc3b3454c5a80135ca62bf5c':
  Unhide.
 2014-07-18 14:04:08 +00:00
Dan Sandler
58c3276e41 am ef247c27: Merge "Shrink user profile bitmaps to 48dp^2." into lmp-dev 
* commit 'ef247c27a250fd0f529ee214b5a95fe184749ab0':
  Shrink user profile bitmaps to 48dp^2.
 2014-07-18 13:53:20 +00:00
Ji-Hwan Lee
59a0107000 am 57b300cd: Fix android_system_stubs build 
* commit '57b300cd0fda909e8e59eb9df730be72942b523a':
  Fix android_system_stubs build
 2014-07-18 12:54:42 +00:00
Ji-Hwan Lee
d811af223e Fix android_system_stubs build 
Change-Id: I52c42b5d781b5c07481cdce598d2ebc340d57850
 2014-07-18 21:39:57 +09:00
Christoph Studer
e7e70cb7c0 am c6a6ae78: Merge "Cancel notification group children when summary is canceled" into lmp-dev 
* commit 'c6a6ae78af611dacc51a481f83d878a8e3fba7cb':
  Cancel notification group children when summary is canceled
 2014-07-18 11:22:42 +00:00
Bryan Mawhinney
5e16a639c4 am d82b7ec9: Merge "Default MediaStyled notifications to CATEGORY_TRANSPORT" into lmp-dev 
* commit 'd82b7ec93136bf0ba5c5f66e1542d33979a76e00':
  Default MediaStyled notifications to CATEGORY_TRANSPORT
 2014-07-18 11:22:33 +00:00
Dongwon Kang
cf851a4397 am 0e02f53c: TIF: introduce TvContract.buildChannelUriForPassthroughTvInput() 
* commit '0e02f53cea21c90ec63cfb2a2f8c3ee81a3848fe':
  TIF: introduce TvContract.buildChannelUriForPassthroughTvInput()
 2014-07-18 11:22:23 +00:00
Wonsik Kim
b1c978b724 am 5fec7afe: Merge "TIF: change onCreateSession() method signature" into lmp-dev 
* commit '5fec7afe3b1bb24c9382ab59a25f5c7eb87e6344':
  TIF: change onCreateSession() method signature
 2014-07-18 11:22:02 +00:00
Youngsang Cho
10fe6bc6f7 am ad67fc6f: Fix a build breakage 
* commit 'ad67fc6fe2994c72bd31896de25dceb0adacd3cb':
  Fix a build breakage
 2014-07-18 11:21:53 +00:00
Dongwon Kang
eea9743ba5 TIF: introduce TvContract.buildChannelUriForPassthroughTvInput() 
This change adds a way to get a dummy channel for starting pass-through
TV inputs which don't have real channels in TvProvider.
Bug: 15496325

Change-Id: I7a6b99964319f12a0f8692b4e307e03480119a69
 2014-07-18 16:24:57 +09:00
Jaewan Kim
8e6b51b0fb TIF: Add onInputAdded and onInputRemoved 
Bug: 16166859
Change-Id: I51bd87aded3e8619e36be200009e924e73cd348e
 2014-07-18 15:35:25 +09:00
Youngsang Cho
3b0f928475 Fix a build breakage 
Updated current.txt.

Change-Id: Ib1434da2345aa349e5fc3112bf38dbba9955c885
 2014-07-17 21:27:00 -07:00
Youngsang Cho
49d4ba0707 am d81f1075: Merge "TIF: Change the parameter of TvInputInfo.loadLabel/Icon" into lmp-dev 
* commit 'd81f1075c0aa5623a3fd64150e8ca5f6d04907c8':
  TIF: Change the parameter of TvInputInfo.loadLabel/Icon
 2014-07-18 03:34:53 +00:00
Youngsang Cho
2f51324a86 am aa5dbe63: Merge "TIF: Hide TvContract.Channels.COLUMN_BROWSABLE" into lmp-dev 
* commit 'aa5dbe6370213b9c18e6f34d812c055645696f58':
  TIF: Hide TvContract.Channels.COLUMN_BROWSABLE
 2014-07-18 03:34:49 +00:00
Youngsang Cho
b2990d8d20 am 57df5b3d: Merge "TIF: Add a notification for surface change from TvView to TvInputService" into lmp-dev 
* commit '57df5b3db54f627345d8fe16c51fc3561f563f9e':
  TIF: Add a notification for surface change from TvView to TvInputService
 2014-07-18 03:34:45 +00:00
Guang Zhu
f59ce46880 am b477fc6c: Merge "add command to enable bt snoop log" into klp-modular-dev 
* commit 'b477fc6c2fcd04e6952a7eec856d30b64fd95e0c':
  add command to enable bt snoop log
 2014-07-18 03:31:43 +00:00
Jae Seo
94cdcaf7a1 am cd12bfc7: TIF: Add a method to get TvInputInfo for a given TV input 
* commit 'cd12bfc7259cd7f38986f8a135764ab42d81e30a':
  TIF: Add a method to get TvInputInfo for a given TV input
 2014-07-18 03:30:31 +00:00
John Spurlock
ec181ef2e1 am 5690da98: Merge "Volume: Rocker animation + style updates." into lmp-dev 
* commit '5690da980040eb4b1a89ea903733f0cc8d247c5e':
  Volume: Rocker animation + style updates.
 2014-07-18 03:30:28 +00:00
Jae Seo
86617605ce am 27d12ca6: TIF: Add buildInputId() 
* commit '27d12ca6b4966d6dd520fb72fb0058619a87d448':
  TIF: Add buildInputId()
 2014-07-18 03:30:23 +00:00
Jae Seo
d2d179c3ca am 3245f3d7: Merge "TIF: Add TvParentalControlManager" into lmp-dev 
* commit '3245f3d76cc92899091f113e701a32a7eb819591':
  TIF: Add TvParentalControlManager
 2014-07-18 03:26:23 +00:00
Jae Seo
b375805f3b TIF: Add a method to get TvInputInfo for a given TV input 
This is going to be needed by applications to get information about the
inputs that are just added thus not included in the previously retrieved
input list.

Bug: 16166859, Bug: 15838097
Change-Id: Icecd03fcea208a0c4d41caab1eec64e574f40877
 2014-07-17 20:25:01 -07:00
Jae Seo
5507bd7688 TIF: Add buildInputId() 
A recent change mandated that we should provide "input ID" instead of
ComponentName when building URIs for channels/programs while there is no
direct way to get one to use with. This CL added a method to build an ID
from a ComponentName.

Change-Id: Ia7f868cf241bb44ca0d4f689dc15326ce6944468
 2014-07-17 20:23:52 -07:00
Jeff Brown
99aa4d3ec3 am ce75065c: Merge "Add glance sensor for doze mode." into lmp-dev 
* commit 'ce75065cff02b83f153306c2c2ec7e1cc3ef262b':
  Add glance sensor for doze mode.
 2014-07-18 03:08:27 +00:00