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

189269 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
60a6df9b95 Merge "Add Context.MIDI_Service to the public API" 2015-04-23 00:12:57 +00:00
Selim Cinek
5f94c4da75 Merge "Fixed a regression with collapsed notification heights" 2015-04-22 23:53:59 +00:00
Marco Nelissen
1816b396c8 am 75da2176: (-s ours) am 9e05ece7: am 0601a280: Merge "Sometimes the application context is null" 
* commit '75da217605cb401c7cbd5023536a6d5c24a0af70':
  Sometimes the application context is null
 2015-04-22 23:50:25 +00:00
Adam Powell
a1f6211e79 Merge "Cancel a screenshot notification after a share target is chosen." 2015-04-22 23:36:02 +00:00
Adam Lesinski
98c7c1355b Merge "AAPT: Add flag to disable versioning of vector related XML" 2015-04-22 23:10:31 +00:00
Todd Kennedy
acf4698ce6 Merge "Add hardware feature describing a car" 2015-04-22 22:42:14 +00:00
Andy Hung
463cb818ba Merge "Add PlaybackSettings for use with AudioTrack" 2015-04-22 22:36:17 +00:00
Mike Lockwood
ec32ac95dc Add Context.MIDI_Service to the public API 
I forgot this when the rest of MidiManager was made public.

Change-Id: Ic5f8e2674d5b8e13bd88feebf3cf219f7af7fbcc
 2015-04-22 15:33:34 -07:00
Andy Hung
263b4c9782 Add PlaybackSettings for use with AudioTrack 
Change-Id: Ie59686d46869558d489a7600170ddace00e548d5
 2015-04-22 15:27:16 -07:00
Wale Ogunwale
7e0fea3557 Merge "Don't limit fullscreen stack window size to parent window size" 2015-04-22 21:41:44 +00:00
Tor Norbye
891ad60a6f Merge "Add threading annotations" 2015-04-22 21:32:39 +00:00
Todd Kennedy
7f95a00ec0 Add hardware feature describing a car 
We need to define a hardware feature for when Android is running
embedded on a vehicle's headunit. This is not applicable when
running Android on a phone and projecting onto a headunit.

Bug: 20016089
Change-Id: I70e94564f7493afe70a49bf582a627c5ea9f0a60
 2015-04-22 14:28:25 -07:00
Selim Cinek
06a24ebd77 Fixed a regression with collapsed notification heights 
This could lead to collapsed notifications having and intrinsic
height smaller than the collapsed size and notifications
overlapping.

Change-Id: Iabba19033f8069f1f75218280b97d3a1a45a5efb
 2015-04-22 14:22:05 -07:00
Svet Ganov
db30ac84b6 Merge "Make read/write from/to XML persistent state more robust." 2015-04-22 20:44:20 +00:00
Svet Ganov
ba0821ed3b Make read/write from/to XML persistent state more robust. 
When writing critical state to XML an excpetion can lead to creating
a malformed XML that is later parsed and may put the device in a bad
state. Hence, on any error while writing we should bail out and drop
the partially write state on the floor.

Corollary, any error on parsing can lead to having a partially read
state that is not consistent which may lead to writing this bad state
back to disk. Hence, on any error while parsing we should bail as
our current state may be unrecoverable.

Change-Id: Ia050c16198cb583f8a51263ad2035dbb948052b8
 2015-04-22 13:42:54 -07:00
Alan Viverette
3797a788dc Merge "Fix visual styling for Material Spinner background" 2015-04-22 20:41:30 +00:00
John Reck
f7de58130a Merge "GraphicsJNI Canvas cleanup" 2015-04-22 20:00:46 +00:00
Wale Ogunwale
b171abbca8 Don't limit fullscreen stack window size to parent window size 
A previous change limited the size of a window to the parent window
size at max. so that child windows don't extend outside their parent
stack when resized in a multi-window environment. This broke the
wallpaper positioning functionality since the wallpaper is no longer
bigger than it's containing stack so it can't be scrolled. Now, we
only limit the window size to the parent window size if the window
stack is not fullscreen.

Bug: 19434096
Bug: 19225079
Change-Id: I1a8788727e6c4a91da45d8a87850093ef5a24edf
 2015-04-22 12:47:17 -07:00
Marco Nelissen
75da217605 am 9e05ece7: am 0601a280: Merge "Sometimes the application context is null" 
* commit '9e05ece7ab8510fc3dade202a8647de22f4b0906':
  Sometimes the application context is null
 2015-04-22 19:41:57 +00:00
Marco Nelissen
9e05ece7ab am 0601a280: Merge "Sometimes the application context is null" 
* commit '0601a280e5db18ff2c084a0785504f959c2ff92f':
  Sometimes the application context is null
 2015-04-22 19:31:26 +00:00
Mady Mellor
73d74680b7 Merge "Enable stylus scale by default for apps targeting MNC+" 2015-04-22 19:21:36 +00:00
destradaa
4fbc845b68 Merge "Avoid performing work in the platform when GPS HAL does not support a feature. b/19271554" 2015-04-22 19:17:08 +00:00
Marco Nelissen
0601a280e5 Merge "Sometimes the application context is null" 2015-04-22 19:06:47 +00:00
Mady Mellor
7c36a685fe Enable stylus scale by default for apps targeting MNC+ 
Bug: 20467919
Change-Id: Icadd45c8031e362d8101419c298133d59165939b
 2015-04-22 11:52:31 -07:00
Steve McKay
a56104d74d Merge "Reduce code duplication between DocumentsActivity and StandaloneActivity." 2015-04-22 18:13:21 +00:00
Todd Kennedy
4ff2617265 Merge "update api files" 2015-04-22 18:08:52 +00:00
Todd Kennedy
89902b9040 update api files 
Bug: 20410696
Change-Id: I3a9d14e4031b0746b2527ad2b0ff1c8521c64e1d
 2015-04-22 11:07:28 -07:00
Adam Skory
26d68e50fa Merge "nullcheck Activity.getIntent() for AssistContent" 2015-04-22 17:59:34 +00:00
Quddus Chong
967d2057e9 am a5617d07: am 8408cbe3: cherrypick from lmp-docs docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. Original Change-Id: I0fab71be55f5c3c6d017ba585b92f8493050274a bug: 20304402 
* commit 'a5617d07623d773a03230866c95712a795149b33':
  cherrypick from lmp-docs docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. Original Change-Id: I0fab71be55f5c3c6d017ba585b92f8493050274a bug: 20304402
 2015-04-22 17:51:25 +00:00
Kris Giesing
1aa5fb9619 am 6ea4f936: (-s ours) am 0ab9655a: (-s ours) Merge "DO NOT MERGE Revert "Load libraries directly from apk"" into lmp-mr1-ub-docs 
* commit '6ea4f9361e644e371c2f49454d2832c451648ebd':
  DO NOT MERGE Revert "Load libraries directly from apk"
 2015-04-22 17:51:18 +00:00
Kris Giesing
d516650495 am 2a0c4a3a: (-s ours) am 6cf2d35d: (-s ours) Merge "DO NOT MERGE Revert "Add android.net.IpPrefix#contains()"" into lmp-mr1-ub-docs 
* commit '2a0c4a3ae091c4a922a1dec040a56c2edcc5e588':
  DO NOT MERGE Revert "Add android.net.IpPrefix#contains()"
 2015-04-22 17:51:12 +00:00
Kris Giesing
834678ed8b am b3ebc0f8: am 663cdc5c: Tweak wording on release notes for Leanback. 
* commit 'b3ebc0f8f3cfc3efbd5cda42a303046aa9c71af1':
  Tweak wording on release notes for Leanback.
 2015-04-22 17:51:05 +00:00
Rich Slogar
20a5478af7 am ac66e2aa: am 1c6c22d3: docs: support library 22.1 updates 
* commit 'ac66e2aa292f2bf9924e7189b14813b76ab16304':
  docs: support library 22.1 updates
 2015-04-22 17:50:56 +00:00
Ryosuke Matsuuchi
fd48dcca5f am 12651970: am 2fb3dc2f: doc: Add Korean version of DAC/distribute/ page. 
* commit '12651970876f8829d87f2075b0719c766f31dd73':
  doc: Add Korean version of DAC/distribute/ page.
 2015-04-22 17:50:49 +00:00
Dirk Dougherty
fad1c48161 am a136b544: am 7e75d3ec: Doc change: distribute landing page. 
* commit 'a136b5442f0dd3cd088e4a2995cb507df1ad604d':
  Doc change: distribute landing page.
 2015-04-22 17:50:42 +00:00
Joe Fernandez
c6820220e4 am c3afa452: am 7ce1ab5f: Merge "docs: studio remove gradle tasks dialog" into lmp-mr1-ub-docs 
* commit 'c3afa452b913304232d61ab96d1e2ffe77af1f54':
  docs: studio remove gradle tasks dialog
 2015-04-22 17:50:35 +00:00
Rich Slogar
3ee60bb0a3 am a2fb6d63: am 6b1b71c9: docs: hierarchyviewer updates 
* commit 'a2fb6d63d8b4e18c302e4b08f02c4c7737345d24':
  docs: hierarchyviewer updates
 2015-04-22 17:50:29 +00:00
Dianne Hackborn
f45e16f2da Merge "Work on issue #20401752: device idle and alarms." 2015-04-22 17:49:39 +00:00
Ben Kwa
4b1ebb4f4f Merge "Disable copying from Recents." 2015-04-22 17:46:19 +00:00
Todd Kennedy
cf5715eb30 Merge "Unhide SignalStrength#getLevel()" 2015-04-22 17:37:50 +00:00
Ben Kwa
c5979d98cf Disable copying from Recents. 
Recents view contains a whole bunch of content aggregated from
potentially many different sources.  Dealing with all these in a single
copy operation can be complex, so for simplicity, copying from recents
view is disabled.

BUG=20487641

Change-Id: I6052e62ee0446da7741f13abfed97044e147dd7d
 2015-04-22 10:33:53 -07:00
Adam Skory
4aaed145f8 nullcheck Activity.getIntent() for AssistContent 
Nothing stopping an Activity from giving us a
null Intent, and the Intent copy constructor
requires a non-null arg.

Bug: 20419159
Change-Id: I8b12a127431869394697e947e2298d4dbbe08604
 2015-04-22 11:29:31 -06:00
Quddus Chong
a5617d0762 am 8408cbe3: cherrypick from lmp-docs docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. Original Change-Id: I0fab71be55f5c3c6d017ba585b92f8493050274a bug: 20304402 
* commit '8408cbe3adc8b0df4ae279a2e8689d1066972744':
  cherrypick from lmp-docs docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. Original Change-Id: I0fab71be55f5c3c6d017ba585b92f8493050274a bug: 20304402
 2015-04-22 17:18:32 +00:00
Kris Giesing
6ea4f9361e am 0ab9655a: (-s ours) Merge "DO NOT MERGE Revert "Load libraries directly from apk"" into lmp-mr1-ub-docs 
* commit '0ab9655ae1a84d1f4dd79c964b655555cf684bbd':
  DO NOT MERGE Revert "Load libraries directly from apk"
 2015-04-22 17:18:28 +00:00
Kris Giesing
2a0c4a3ae0 am 6cf2d35d: (-s ours) Merge "DO NOT MERGE Revert "Add android.net.IpPrefix#contains()"" into lmp-mr1-ub-docs 
* commit '6cf2d35d3b8bb2bf707098b84d16e3135f8ba498':
  DO NOT MERGE Revert "Add android.net.IpPrefix#contains()"
 2015-04-22 17:18:24 +00:00
Kris Giesing
b3ebc0f8f3 am 663cdc5c: Tweak wording on release notes for Leanback. 
* commit '663cdc5cfdcff532f0ae43d851cce3172fa5da54':
  Tweak wording on release notes for Leanback.
 2015-04-22 17:18:17 +00:00
Rich Slogar
ac66e2aa29 am 1c6c22d3: docs: support library 22.1 updates 
* commit '1c6c22d3a92b1446eb548b2aca77758534c7d814':
  docs: support library 22.1 updates
 2015-04-22 17:18:06 +00:00
Ryosuke Matsuuchi
1265197087 am 2fb3dc2f: doc: Add Korean version of DAC/distribute/ page. 
* commit '2fb3dc2f965db595b6bf2c8c17a170552ccd15e7':
  doc: Add Korean version of DAC/distribute/ page.
 2015-04-22 17:17:59 +00:00
Dirk Dougherty
a136b5442f am 7e75d3ec: Doc change: distribute landing page. 
* commit '7e75d3ec4b966442a46f16cf09a54ab541141bc8':
  Doc change: distribute landing page.
 2015-04-22 17:17:55 +00:00
Joe Fernandez
c3afa452b9 am 7ce1ab5f: Merge "docs: studio remove gradle tasks dialog" into lmp-mr1-ub-docs 
* commit '7ce1ab5ffbc7c43013b2cf07ca4eb64152679d2b':
  docs: studio remove gradle tasks dialog
 2015-04-22 17:17:50 +00:00