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

142747 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Quddus Chong
1a2a9730e6 am f0d8c6fc: Merge "docs: Fixed small typo. bug: 14617866" into klp-modular-docs 
* commit 'f0d8c6fcae7176fd99e9e10bbe9e494c18860cfd':
  docs: Fixed small typo. bug: 14617866
 2014-07-16 18:13:19 +00:00
Chris Smith
23a0b3d9d5 am 211c5844: am 7a047941: docs: Fix minor issues with Wear data events docs. 
* commit '211c58448e21ad210a497658fdf1dd26b0c96faf':
  docs: Fix minor issues with Wear data events docs.
 2014-07-16 18:13:14 +00:00
Chris Smith
211c58448e am 7a047941: docs: Fix minor issues with Wear data events docs. 
* commit '7a04794186dcb679501a7a9383caae8df01428d0':
  docs: Fix minor issues with Wear data events docs.
 2014-07-16 18:09:17 +00:00
Deepanshu Gupta
6c57fc3019 DO NOT MERGE - Fix LayoutLib. 
This fixes a bad merge and contains partial cherrypicks of the following
commits to make LayoutLib working again:
103d40960daa0420995aa12881bef33892a0a2ab
803d77d8904a8fd66f0370cca6ed7f8b7cf68907
6a08225cee197e5baf80dd06dae46988db284122

Bug: 15987446
Change-Id: I41563305206d30ecdbc7f609c4b90d53edb42689
 2014-07-16 10:23:28 -07:00
Robert Ly
82088d62f8 Merge "docs: add EU legal notice" into klp-modular-docs 2014-07-16 16:25:13 +00:00
Robert Ly
d9736032e3 docs: add EU legal notice 
bug 16345613
Change-Id: I96215d7a55bc52bc69a312ba0bb0e1e83dd82d9e
 2014-07-16 12:15:11 -07:00
Quddus Chong
f0d8c6fcae Merge "docs: Fixed small typo. bug: 14617866" into klp-modular-docs 2014-07-16 16:25:13 +00:00
Quddus Chong
133125446d docs: Fixed small typo. 
bug: 14617866

Change-Id: I967be618d805b126a750bb60f8bc26f2dc5a95e9
 2014-07-16 10:28:55 -07:00
Chris Smith
7a04794186 docs: Fix minor issues with Wear data events docs. 
Change-Id: Id6f6c57748e2e51b7a0de6fb6e7912a0c838d987
 2014-07-16 14:49:36 +00:00
Andrew Solovay
c8fcb3bcdb am 57553775: am 63477e67: Merge "cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38" into klp-modular-docs 
* commit '575537759222e0277c3979e33342407aa7ca1a78':
  cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38
 2014-07-16 13:29:08 +00:00
Robert Ly
e104012f1b am 8231174e: am bf42978e: Merge "NDK filesizes and hashes updated" into klp-modular-docs 
* commit '8231174ec5b4d720cde2d1d7abb40ee9bde32c7d':
  NDK filesizes and hashes updated
 2014-07-16 13:29:04 +00:00
Ricardo Cervera
9e4db5b76a am b5cd1976: am c79f3d69: Merge "cherrypick from klp-modular-dev docs: Fix issue with CardView preview docs Bug: 16277161 Change-Id: Iea8cbff81fbf3ac50c9009fbf21dc65c625e71ee" into klp-modular-docs 
* commit 'b5cd197646a18239e976649ffa99d39c6f568d2b':
  cherrypick from klp-modular-dev docs: Fix issue with CardView preview docs Bug: 16277161 Change-Id: Iea8cbff81fbf3ac50c9009fbf21dc65c625e71ee
 2014-07-16 13:29:00 +00:00
Robert Ly
4460bff8b3 am 1374f6ea: am 649e8f9b: Merge "docs: add edu video highlights" into klp-modular-docs 
* commit '1374f6ea86f982e7600b9b2714747bc654243591':
  docs: add edu video highlights
 2014-07-16 13:28:56 +00:00
Andrew Solovay
52f0b5740e am 0791c612: am 3f8d9c9e: Merge "docs: Replaced deprecated fill_parent with match_parent." into klp-modular-docs 
* commit '0791c612b9dff787fa5e081d6bb207116333b21a':
  docs: Replaced deprecated fill_parent with match_parent.
 2014-07-16 13:28:53 +00:00
Quddus Chong
13fc31df3c am b2b1c5fa: am 6a5dd936: docs: Fixed typo in L Preview API Overview. bug: 15696551 
* commit 'b2b1c5fa89a497f8e75cde7011795eae625a1722':
  docs: Fixed typo in L Preview API Overview. bug: 15696551
 2014-07-16 13:28:49 +00:00
Ricardo Cervera
3b0909c49b am 0acf9d2f: am de138276: docs: Fix typos in the L preview docs. Bug: 16240486 
* commit '0acf9d2f9a1c74308db4632530f5b57e6cde5f9d':
  docs: Fix typos in the L preview docs. Bug: 16240486
 2014-07-16 13:28:44 +00:00
David Friedman
ede1910aa4 am ddf853e0: am 7f6af88e: Fixed a randomly discovered typo and missing hyphen. Change not staged. 
* commit 'ddf853e0ce8a32a7d7e7f070b49f44a4edb2fff0':
  Fixed a randomly discovered typo and missing hyphen. Change not staged.
 2014-07-16 13:28:37 +00:00
Andrew Solovay
5755377592 am 63477e67: Merge "cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38" into klp-modular-docs 
* commit '63477e67eba4e8f3d3c17c3774cd99d23db39456':
  cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38
 2014-07-16 13:22:57 +00:00
Robert Ly
8231174ec5 am bf42978e: Merge "NDK filesizes and hashes updated" into klp-modular-docs 
* commit 'bf42978e14e352984eb5443687fccd5b15dc27a3':
  NDK filesizes and hashes updated
 2014-07-16 13:22:54 +00:00
Ricardo Cervera
b5cd197646 am c79f3d69: Merge "cherrypick from klp-modular-dev docs: Fix issue with CardView preview docs Bug: 16277161 Change-Id: Iea8cbff81fbf3ac50c9009fbf21dc65c625e71ee" into klp-modular-docs 
* commit 'c79f3d696a24ade6017b0e91d92898190c204dd2':
  cherrypick from klp-modular-dev docs: Fix issue with CardView preview docs Bug: 16277161 Change-Id: Iea8cbff81fbf3ac50c9009fbf21dc65c625e71ee
 2014-07-16 13:22:50 +00:00
Robert Ly
1374f6ea86 am 649e8f9b: Merge "docs: add edu video highlights" into klp-modular-docs 
* commit '649e8f9b2b9442fc29570f86a2f92fe5b7538c45':
  docs: add edu video highlights
 2014-07-16 13:22:47 +00:00
Andrew Solovay
0791c612b9 am 3f8d9c9e: Merge "docs: Replaced deprecated fill_parent with match_parent." into klp-modular-docs 
* commit '3f8d9c9e0a67a87009ee42904d3f08fe2f1371c6':
  docs: Replaced deprecated fill_parent with match_parent.
 2014-07-16 13:22:44 +00:00
Quddus Chong
b2b1c5fa89 am 6a5dd936: docs: Fixed typo in L Preview API Overview. bug: 15696551 
* commit '6a5dd93652ffce88891c2bd2dc7a19c764075631':
  docs: Fixed typo in L Preview API Overview. bug: 15696551
 2014-07-16 13:22:44 +00:00
Ricardo Cervera
0acf9d2f9a am de138276: docs: Fix typos in the L preview docs. Bug: 16240486 
* commit 'de138276f1c0a02f91e32f889639c629d883f948':
  docs: Fix typos in the L preview docs. Bug: 16240486
 2014-07-16 13:22:43 +00:00
David Friedman
ddf853e0ce am 7f6af88e: Fixed a randomly discovered typo and missing hyphen. Change not staged. 
* commit '7f6af88e9460b788f68e956c9b104bc68fcfc8c4':
  Fixed a randomly discovered typo and missing hyphen. Change not staged.
 2014-07-16 13:22:43 +00:00
Alan Viverette
e4272bb323 Merge "Fix state list drawable transitions" into lmp-dev 2014-07-16 02:25:05 +00:00
Alan Viverette
d646fa2933 Fix state list drawable transitions 
BUG: 16345178
Change-Id: I3a4f09462ac127bfb2adba6f63f5f44e5d4ea693
 2014-07-16 20:11:53 +00:00
Winson Chung
cc91208963 Merge "Don't clobber intent flags when starting recent activities anew. (Bug 16327074)" into lmp-dev 2014-07-16 02:25:05 +00:00
Winson Chung
dc9b7e7e6a Don't clobber intent flags when starting recent activities anew. (Bug 16327074) 
Change-Id: I3bfee312d5e3167d443be48580da55d8b69b485e
 2014-07-16 18:27:22 +00:00
Chris Smith
93a412ea39 am 23a0b3d9: am 211c5844: am 7a047941: docs: Fix minor issues with Wear data events docs. 
* commit '23a0b3d9d5e77a3fe5d353339c181bf729de4ff8':
  docs: Fix minor issues with Wear data events docs.
 2014-07-16 18:18:59 +00:00
RoboErik
ac17c2a8c9 Merge "Change adjustVolumeBy to adjustVolume" into lmp-dev 2014-07-16 16:25:13 +00:00
RoboErik
1ff5b1648a Change adjustVolumeBy to adjustVolume 
This makes volume adjustments take a direction instead of a number of
steps and renames the API appropriately.

Change-Id: I6a31cbc42d889a38aa63446686a424cb2b8b2270
 2014-07-16 12:03:45 -07:00
RoboErik
8b4bffcac9 Make MediaSession and MediaController constructors public 
This makes the MediaSession/Controller constructors public and registers
with the system behind the scenes.

This also adds a bit about needing to call setActive(true) to start receiving
commands in MediaSession's docs.

Change-Id: If882d229b54c36bf0831aca0255052dda667a2bc
 2014-07-16 12:03:45 -07:00
ztenghui
0d12785dfb Merge "Add more reverse support to AnimatedVD" into lmp-dev 2014-07-16 00:46:50 +00:00
ztenghui
7bc6a3f023 Add more reverse support to AnimatedVD 
bug:16162242

Change-Id: Ie0b7618beeb65ebeb65db41600165837524bcee4
 2014-07-16 19:26:26 +00:00
RoboErik
71940885f2 Merge "Make MediaSession and MediaController constructors public" into lmp-dev 2014-07-16 13:12:22 +00:00
Narayan Kamath
ce83a28c24 Merge "Dexopt for Context.createPackageContext when code is included." into lmp-dev 2014-07-16 01:00:53 +00:00
Narayan Kamath
2053168eb4 Dexopt for Context.createPackageContext when code is included. 
The package manager now keeps track of per ISA dex-opt state.

There are two important things to keep in mind here :

- dexopt can potentially be very slow. In cases where the target
  package hasn't been dexopted yet, this can take multiple seconds
  and may cause an ANR in the caller if the context is being
  created from the main thread.
- We will need to remove the constraint that dexopt can only be
  requested by the system (or root). Apps will implicitly be
  requesting dexopt by asking for package contexts with code included.
  It's important to note that unlike dalvik, the dexopt stage in ART
  isn't optional. ART cannot load classes directly from dex files.

bug: 15313272
Change-Id: I0bd6c323a9c1f62f1c08f6292b7f0f7f08942726
 2014-07-16 19:23:52 +01:00
Yorke Lee
95a18a8f96 Merge "Make ContactPreferences use SharedPreferences instead of System settings (1/5)" into lmp-dev 2014-07-16 00:46:50 +00:00
Jean-Michel Trivi
5d06ef49b1 Merge "MediaPlayer factory method with audio attributes and session ID" into lmp-dev 2014-07-16 02:18:09 +00:00
Jean-Michel Trivi
d70ad7a128 MediaPlayer factory method with audio attributes and session ID 
Change-Id: I4e7f633c84c90581e849af2865f5be84a026f32f
 2014-07-16 18:36:20 +00:00
Quddus Chong
564ddefc57 am 6743f1ea: am 1a2a9730: am f0d8c6fc: Merge "docs: Fixed small typo. bug: 14617866" into klp-modular-docs 
* commit '6743f1ea92e8c1516774d38469511d189a1bf5eb':
  docs: Fixed small typo. bug: 14617866
 2014-07-16 18:23:27 +00:00
Bill Yi
96f6a1a9e7 DO NOT MERGE - Fix build issue isScreenOn 
Change-Id: I8821efd561d375c32702be55903fe401ab719e80
 2014-07-15 22:50:55 +00:00
Ricardo Cervera
5a19dd522f am 35396800: Merge "docs: Added note on disabling debugging for WebView apps. Bug: 16232761" into klp-modular-dev 
* commit '3539680063e039f5d543677805de7f4639575b1e':
  docs: Added note on disabling debugging for WebView apps. Bug: 16232761
 2014-07-15 21:05:38 +00:00
Ricardo Cervera
3539680063 Merge "docs: Added note on disabling debugging for WebView apps. Bug: 16232761" into klp-modular-dev 2014-07-15 20:39:52 +00:00
Eric Laurent
015b123a8a Merge "AudioService: Use device specific mode to open SCO audio" into lmp-dev 2014-07-15 20:35:01 +00:00
Liejun Tao
f4e51d82d2 AudioService: Use device specific mode to open SCO audio 
Bluetooth carkit may need specific mode to open SCO
channel. Add a settings value using BT device's MAC address
to store the SCO mode and use it to open SCO. In case no value
is stored, use default mode: Virtual Voice Call.

Change-Id: Iea31a48be0e8f3bd2d8689635fd8ce6f6d6da15a
 2014-07-16 15:50:54 -07:00
Fabrice Di Meglio
ef7d656d44 Fix bug #16353909 Preferences RTL support is sometimes broken 
- use start/end instead of left/right ...

Change-Id: I5e6bd49c10f9730e297694ceeb7a6996a732e3a0
 2014-07-16 22:40:22 +00:00
Christopher Tate
c295a44336 Merge "Always call finishBackup() if performFullBackup() succeeded" into lmp-dev 2014-07-16 16:25:13 +00:00
Christopher Tate
a176d22110 Always call finishBackup() if performFullBackup() succeeded 
Even if we later get an error from sendBackupData() we need to give
the transport its teardown callback.  This simplifies the transport
logic considerably.

Change-Id: Ib8c0e210d4a876ee6b083a4d619dfccc462da4e5
 2014-07-16 13:10:58 -07:00