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

143753 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Makoto Onuki
a3d816886f am 38bfa1ba: Merge "Use "current" cp2 from telephony" into lmp-dev 
* commit '38bfa1ba0bedde690d6e3d8c8dd5ed4b91e1e647':
  Use "current" cp2 from telephony
 2014-07-18 21:03:41 +00:00
ztenghui
4be2d3d6d5 am f101ebb0: Fix FIT_XY scaleType issue on VectorDrawable 
* commit 'f101ebb0f4c88053a8b1ca2295b7a6afe8540127':
  Fix FIT_XY scaleType issue on VectorDrawable
 2014-07-18 20:45:07 +00:00
ztenghui
9d59a76dd0 Fix FIT_XY scaleType issue on VectorDrawable 
bug:16019658

Change-Id: I8b6ac23bf14de5427d3029436acf76bd1161f0ea
 2014-07-18 20:39:35 +00:00
ztenghui
2b8b2a84c9 am 22fd0f85: Fix caching in VectorDrawable to pass the CTS test 
* commit '22fd0f851e46cd8292553f96d93a7ebfaf537186':
  Fix caching in VectorDrawable to pass the CTS test
 2014-07-18 20:12:13 +00:00
ztenghui
670689af43 Fix caching in VectorDrawable to pass the CTS test 
bug:16380401

Change-Id: I573f4cc782707c6ef3484597ddc621a7a6353898
 2014-07-18 20:07:21 +00:00
Andrew Lee
056ef84d63 am 5ff4ea7c: am f72fa887: Merge "Add comments for RemoteCallVideoClient and RemoteCallVideoProvider." into lmp-dev 
* commit '5ff4ea7cc55dd46decb1f57753c4126e5d7ad24c':
  Add comments for RemoteCallVideoClient and RemoteCallVideoProvider.
 2014-07-18 19:46:23 +00:00
Andrew Lee
bd463b2c25 am f72fa887: Merge "Add comments for RemoteCallVideoClient and RemoteCallVideoProvider." into lmp-dev 
* commit 'f72fa88707287317d42510090e927f212cdcbb23':
  Add comments for RemoteCallVideoClient and RemoteCallVideoProvider.
 2014-07-18 19:42:57 +00:00
Andre Eisenbach
49ddceef7e am 92adbade: am 99e79902: LE: Add connection parameter update request API (4/4) 
* commit '92adbade49f741888b69691981e9367aef357b45':
  LE: Add connection parameter update request API (4/4)
 2014-07-18 19:38:28 +00:00
Andre Eisenbach
8831dfe6ec am 99e79902: LE: Add connection parameter update request API (4/4) 
* commit '99e79902fbf036d2a69ce99ed4f4f51b62b419f3':
  LE: Add connection parameter update request API (4/4)
 2014-07-18 19:35:11 +00:00
Christopher Tate
4e6d105b0e am 0f5b9306: am 74ec3d59: Merge "Tear down agents properly at EOD in full restore" into lmp-dev 
* commit '0f5b9306328af0c476bb71eed78e63a65e0898ac':
  Tear down agents properly at EOD in full restore
 2014-07-18 19:23:09 +00:00
Christopher Tate
657439d52c am 74ec3d59: Merge "Tear down agents properly at EOD in full restore" into lmp-dev 
* commit '74ec3d599b4a2d7dcf0d723af0366af73b87eda0':
  Tear down agents properly at EOD in full restore
 2014-07-18 19:16:47 +00:00
Andre Eisenbach
6ce4db0acf LE: Add connection parameter update request API (4/4) 
Change-Id: Ifb531a1b7ab05888817b96fcc89f85e17df7ffe2
 2014-07-18 12:13:46 -07:00
Winson Chung
c489b66b4d am 4fb60be9: am 61d52679: Fixing issue where we weren\'t restoring touch state on dismissed Task cards. (Bug 16322100) 
* commit '4fb60be98d2e43bb4dc745321865c219aef96984':
  Fixing issue where we weren't restoring touch state on dismissed Task cards. (Bug 16322100)
 2014-07-18 19:05:59 +00:00
Youngsang Cho
5bebd95959 am 2ec6fb80: am e94cfccd: Merge "TIF: Add unblock content" into lmp-dev 
* commit '2ec6fb8085f78dceda26d1f1634f6e27b630166a':
  TIF: Add unblock content
 2014-07-18 19:00:10 +00:00
Youngsang Cho
e670d86ff9 am 7c8bbd53: am c28a86ff: Merge "TIF: Add onInputAdded and onInputRemoved" into lmp-dev 
* commit '7c8bbd53c6622248377794a7ea6289b1c952a2f6':
  TIF: Add onInputAdded and onInputRemoved
 2014-07-18 19:00:05 +00:00
Dan Sandler
cfa9259a62 am f9845011: am 7aabcfa3: Merge "Deprecate and stop generating tickerViews." into lmp-dev 
* commit 'f984501170f7449a38c6785675dd9f460f5bffa4':
  Deprecate and stop generating tickerViews.
 2014-07-18 18:59:38 +00:00
Dan Sandler
e9381b5e9b am e7dc5140: am 9b557a25: Merge "Actually show secret notifications sometimes." into lmp-dev 
* commit 'e7dc51401bb6a0341c34ccc4b5b04902f0ba997d':
  Actually show secret notifications sometimes.
 2014-07-18 18:59:31 +00:00
Brian Attwell
a683b2a29c am a08e00c7: am fa15c729: Merge "Mark social APIs stream APIs as deprecated" into lmp-dev 
* commit 'a08e00c7026c6b093fc927a03c168d2ed3b11986':
  Mark social APIs stream APIs as deprecated
 2014-07-18 18:59:27 +00:00
Winson Chung
f1d15dd2ff am 61d52679: Fixing issue where we weren\'t restoring touch state on dismissed Task cards. (Bug 16322100) 
* commit '61d5267986f21ae7b657d9ba1cf6bff9344aa6e1':
  Fixing issue where we weren't restoring touch state on dismissed Task cards. (Bug 16322100)
 2014-07-18 18:54:55 +00:00
Winson Chung
3e3365babd Fixing issue where we weren't restoring touch state on dismissed Task cards. (Bug 16322100) 2014-07-18 18:49:53 +00:00
Youngsang Cho
8cc5a4b0bb am e94cfccd: Merge "TIF: Add unblock content" into lmp-dev 
* commit 'e94cfccd48ac07ec718b280e7793623da46c61e9':
  TIF: Add unblock content
 2014-07-18 18:46:15 +00:00
Youngsang Cho
159b768b83 am c28a86ff: Merge "TIF: Add onInputAdded and onInputRemoved" into lmp-dev 
* commit 'c28a86ff8054bd5be6adaaff4a51609bcda76211':
  TIF: Add onInputAdded and onInputRemoved
 2014-07-18 18:46:11 +00: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
332bf0e2cd am ce4384aa: am d2cb9213: Merge "Make back button work in CaptivePortalLogin app like a web browser." into lmp-dev 
* commit 'ce4384aa1aa4e94967f9a81ac740f2e435d1ba37':
  Make back button work in CaptivePortalLogin app like a web browser.
 2014-07-18 17:40:43 +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
59ac42915a am 012f470a: am 42c4a935: Merge "Wire up multi-SIM experience (1/4)" into lmp-dev 
* commit '012f470a9036b2e6c6a222c6dbd718326efaba70':
  Wire up multi-SIM experience (1/4)
 2014-07-18 17:25:43 +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
d373c004b0 am 3b29a424: am 8ebfdcbc: Merge "Fix broken locale related assumptions in TextServicesManager." into lmp-dev 
* commit '3b29a42453c798bbaa8a37ce415cd72ca7b1a2c6':
  Fix broken locale related assumptions in TextServicesManager.
 2014-07-18 16:38:01 +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
c6a267028f am 15b4f0e0: am d81c4869: Update RecyclerView scroll listener to the new API 
* commit '15b4f0e09ed2a21230a7591618adc4772570f031':
  Update RecyclerView scroll listener to the new API
 2014-07-18 16:23:23 +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
d66f900acb am 9a35945f: am 8fe5ff89: Merge "New TtsSpan builders for types measure, time, date, digits and verbatim." into lmp-dev 
* commit '9a35945f774b94abfadff485e6f90de49938c402':
  New TtsSpan builders for types measure, time, date, digits and verbatim.
 2014-07-18 15:58:42 +00:00
John Spurlock
7fc4c2fc89 am fc785e85: am 59371a77: Merge "Volume: Dismiss shade when launching settings from rocker." into lmp-dev 
* commit 'fc785e857dc417538a41acec3befbea4dec2aef3':
  Volume: Dismiss shade when launching settings from rocker.
 2014-07-18 15:58:38 +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