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

143339 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sailesh Nepal
9fd4ad318e am 0587043f: Merge "Use main thread for RemoteConnection callbacks" into lmp-dev 
* commit '0587043fcc353d7a9d374c346fa1445f2e57e6da':
  Use main thread for RemoteConnection callbacks
 2014-07-18 21:38:20 +00:00
Deepanshu Gupta
c3a7763b84 am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '918ca12ffc09a96194112edf3540d94c32918a07':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:36:29 +00:00
Deepanshu Gupta
c39916f7da am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '37f54f4c1e2d97b33bdd8abe5f196debecc5437d':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:35:21 +00:00
Jean-Michel Trivi
a3ee6642d8 Unhide Virtualizer.getVirtualizationMode() 
Unhide Virtualizer.getVirtualizationMode() method.
Added note in javadoc about the returned value.
Declared exceptions that can be thrown by the checkStatus(int)
  helper function.

Change-Id: I4da82d1db1e39ca9dae489559bf1fb5de112c26a
 2014-07-18 21:34:39 +00:00
Jim Miller
c61c067042 am 0f6db1e8: Merge "Add DevicePolicyManager flag for fingerprint." into lmp-dev 
* commit '0f6db1e823a96d14ea831ec2bccc435dd321da28':
  Add DevicePolicyManager flag for fingerprint.
 2014-07-18 21:34:07 +00:00
Ye Wen
892d049fa5 am 2c960085: Merge "Unhide MMS APIs for MSIM (1/2)" into lmp-dev 
* commit '2c960085d2780d8c2fc66d6e3b0233ef6d1fbe42':
  Unhide MMS APIs for MSIM (1/2)
 2014-07-18 21:34:03 +00:00
Deepanshu Gupta
c425c438a3 am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '710a55b419908068529a8e95c4eba88297f67e3f':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:32:52 +00:00
Deepanshu Gupta
918ca12ffc am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '10395cbb5cdec35a0ebee1d0b18b58c4803092a1':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:31:33 +00:00
Deepanshu Gupta
37f54f4c1e am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '357ebfc5e43ecb35da9207d78a9a8a6c117a1002':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:31:26 +00:00
Dan Sandler
65d3c1ea3b am 5239e4d2: Don\'t crash if user profile bitmap is null. 
* commit '5239e4d2f5098cfb97b6f94c155e4aa4943f9d87':
  Don't crash if user profile bitmap is null.
 2014-07-18 21:24:59 +00:00
Robert Greenwalt
a58b59b08c am 721252c0: Quit NetworkMonitors at end of life. 
* commit '721252c084d74f0755b4f093fefa5ff13c6f896d':
  Quit NetworkMonitors at end of life.
 2014-07-18 21:20:34 +00:00
Dan Sandler
03dd983bad Don't crash if user profile bitmap is null. 
Bug: 16398850
Change-Id: Ie8ddb0841af255bbde098a213cb0ec1690d14c4c
 2014-07-18 21:18:52 +00:00
Robert Greenwalt
1fd9aeef08 Quit NetworkMonitors at end of life. 
We were creating and orphaning a thread for each network.
Cleanup after ourselves.

bug:16119890
Change-Id: I8c8a9fe471e43f31f712844915992084074e8047
 2014-07-18 21:14:04 +00:00
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
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
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
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
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
781104d874 Merge "Don't apply the ActionBar style to a Toolbar as a result of setActionBar" into lmp-dev 2014-07-18 18:24:25 +00:00
Adam Powell
2aa09a94dd Don't apply the ActionBar style to a Toolbar as a result of setActionBar 
While this is a convenient idea, it effectively means that any styling
directly applied to a Toolbar in a layout gets stomped by the
theme-global ActionBar style. Obey the more local, specific styling
from the Toolbar instead.

Change-Id: Ief6a7cb90052bdced87f1dc0925c1dfbc0df4792
 2014-07-19 16:01:12 -07:00
Baligh Uddin
cbaac81b70 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-18 18:24:25 +00:00
Baligh Uddin
4fc8c66cd4 Import translations. DO NOT MERGE 
Change-Id: I7b6175e9d105f252fd57427b2c15ec31905e6184
Auto-generated-cl: translation import
 2014-07-19 21:41:31 +00:00
Baligh Uddin
68cbf10b56 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-18 18:24:25 +00:00
Baligh Uddin
7bc83dc414 Import translations. DO NOT MERGE 
Change-Id: I179193c20f5362e2c1afb3ea15c623e63e15a688
Auto-generated-cl: translation import
 2014-07-19 21:41:49 +00:00
Baligh Uddin
6b1072e07a Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-18 18:24:25 +00:00
Baligh Uddin
2d3347afed Import translations. DO NOT MERGE 
Change-Id: I99e29201cdc548124a501255a619e709d1697bb3
Auto-generated-cl: translation import
 2014-07-19 21:42:03 +00:00
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