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

140112 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Ly
2428fe4219 am 54a7b932: am 50f08149: Merge "docs: add whitelisting instructions and new index icons" into klp-modular-dev 
* commit '54a7b9325bfb55d124dd66534a2fdca60093ea7e':
  docs: add whitelisting instructions and new index icons
 2014-06-22 01:16:45 +00:00
Dirk Dougherty
247b896903 am da6b3222: am ceaa57c9: am 39b707c8: am bf66c17e: Merge "remove extraneous tag causing extra spacing between heading/text." into klp-docs 
* commit 'da6b32226a40abaeeca3e00780ddffd3cd554241':
  remove extraneous tag causing extra spacing between heading/text.
 2014-06-22 01:16:39 +00:00
smain@google.com
4c83bf4b03 am 92cb2a75: am e77f41a6: prettier sdk buttons 
* commit '92cb2a75222d4b0055f155ae6f243925a4801403':
  prettier sdk buttons
 2014-06-22 01:16:34 +00:00
smain@google.com
747a2f1913 am 9ea14362: am 941f800a: update Edu pages for launch of Chrome edu apps on play store removes the FAQ and Guidelines docs, redirect to devsite copy will be implemented with separate CL 
* commit '9ea14362554e412564a65821a47762c4f28b87a9':
  update Edu pages for launch of Chrome edu apps on play store removes the FAQ and Guidelines docs, redirect to devsite copy will be implemented with separate CL
 2014-06-22 01:16:29 +00:00
smain@google.com
99d3bd0b95 am 3a4924d4: am 371d68cc: add link back to main dev site home 
* commit '3a4924d417640c13f9418a6dd1d68303b8b21e10':
  add link back to main dev site home
 2014-06-22 01:16:24 +00:00
Michael Kolb
8dab261d81 am c6ffc840: am 270c099f: Merge "Move emulator check & save system properties access" into klp-modular-dev 
* commit 'c6ffc840c4e34a61b537e1fc3e90b111d4150244':
  Move emulator check & save system properties access
 2014-06-22 01:16:19 +00:00
Craig Mautner
5afcd4df22 resolved conflicts for merge of aaadf922 to master 
Change-Id: I8b89a326453fc8827a84eb9516271d2bf3b71e2c
 2014-06-21 18:11:33 -07:00
Deepanshu Gupta
a88738ff52 am 3daec197: Merge "LayoutLib: Better support for compact/elegant fonts." into lmp-preview-dev 
* commit '3daec1972493c1e867c6cac7f4a2a43a157d52b9':
  LayoutLib: Better support for compact/elegant fonts.
 2014-06-21 23:35:51 +00:00
Deepanshu Gupta
4a2ff7a4d8 am f791b120: Merge "Material navigation bar for layoutlib." into lmp-preview-dev 
* commit 'f791b1205192e525590f72c465e7e4c185112eb0':
  Material navigation bar for layoutlib.
 2014-06-21 23:35:43 +00:00
Michael Kolb
c0fcf109f0 am 71f65485: am db9fed74: Merge "Make WindowInsets.isRound work with emulator" into klp-modular-dev 
* commit '71f65485bf47c8bfbae2b3a0a9573b311668b4a2':
  Make WindowInsets.isRound work with emulator
 2014-06-21 20:24:28 +00:00
Joe Fernandez
4bae7d39ff am 82d013d4: am 8b19cdf7: am 845835c7: am 2d7b3ded: Merge "ExoPlayer developer guide" into klp-docs 
* commit '82d013d45ab86ee1a4e1a64960f6ac1260d66a66':
  ExoPlayer developer guide
 2014-06-21 20:24:23 +00:00
Robert Ly
8cadff247f am 5c26b33e: am d8b94456: fix build 
* commit '5c26b33e4abfc820677f6af566bb9952a535efd7':
  fix build
 2014-06-21 20:24:18 +00:00
Robert Ly
8f94d781bf am 9e51442c: am 8c573178: Merge "docs: fix l preview bugs" into klp-modular-dev 
* commit '9e51442ca5ee1bb0ebdae656d45657bdc17f3666':
  docs: fix l preview bugs
 2014-06-21 20:24:12 +00:00
Robert Ly
3ad3a485f3 am 31dde385: am 448f823e: Merge "docs: fix margins and add partners back" into klp-modular-dev 
* commit '31dde385674be85c98add60d020b13572d18de1a':
  docs: fix margins and add partners back
 2014-06-21 20:24:06 +00:00
Chet Haase
3aff2a0813 Avoid resetting gradient state when not actually rebuilding it 
Previous logic in GradientDrawable around rebuilding the gradient path
was incorrect, but it happened to work because of when it was called
(after ensureValidRect() in the draw() method). Further reliance on this
logic outside of the drawing cycle (in the new getOutline() method) caused
the side-effect to surface as we now clear the dirty flag without actually
rebuilding the gradient.

Fix avoids resetting the flag outside of ensureValidRect() where it belongs.

Issue #15508378 Quantum ui having issues with viewing comments on facebook app

Change-Id: Ia944d3de7e3c0920fed040188e8c1cc1bcce498d
 2014-06-21 08:31:03 -07:00
George Mount
7a73fda47d Merge "API Review: Change View viewName attribute to transitionName." 2014-06-21 03:15:09 +00:00
Craig Mautner
5957d6a889 Merge "Fix frontOfTask assignment." 2014-06-20 21:00:34 +00:00
Danny Baumann
ec4e780e5c Fix frontOfTask assignment. 
If all activities of a given stack were finishing, no activity was
marked as front-of-task. This confused ActivityManager, so make sure
there's always exactly one activity marked as front-of-task.

Change-Id: I087cbe10280d4a60aa5ccfaefe24a223523fb3f2
 2014-06-23 08:43:37 +02:00
Robert Ly
878325b367 Merge "docs: l-preview fixes" into klp-modular-dev 2014-06-20 21:00:34 +00:00
Robert Ly
40895834fa docs: l-preview fixes 
Change-Id: Ib51775739304118df10051f312de35dcca9bf179
 2014-06-22 22:46:21 -07:00
Robert Ly
d7208fdaeb Merge "docs: remove description text for index" into klp-modular-dev 2014-06-20 21:00:34 +00:00
Robert Ly
511db3b1ee docs: remove description text for index 
Change-Id: I750e4d34ff37e52c39eb764131f82a23360e7c28
 2014-06-21 14:05:47 -07:00
Quddus Chong
1aa273e0da Merge "docs: Updated Support page for L Developer Preview." into klp-modular-dev 2014-06-20 21:00:34 +00:00
Quddus Chong
73043d91d9 docs: Updated Support page for L Developer Preview. 
Change-Id: Ib890188994cf4f23b20ec7d037db368bac2b620b
 2014-06-21 12:44:12 -07:00
Robert Ly
50f08149ec Merge "docs: add whitelisting instructions and new index icons" into klp-modular-dev 2014-06-20 21:00:34 +00:00
Robert Ly
bf47a6c4cd docs: add whitelisting instructions and new index icons 
Change-Id: If720e2a5c3cae1d5cceff397d06001e551443fce
 2014-06-21 00:56:48 -07:00
Michael Kolb
db9fed74c2 Merge "Make WindowInsets.isRound work with emulator" into klp-modular-dev 2014-06-20 21:00:34 +00:00
Michael Kolb
437d31390b Make WindowInsets.isRound work with emulator 
Bug: 15775489

Change-Id: I53a14ccd3be776d46c9cea43c0d5d3f41674dd75
 2014-06-20 15:13:09 -07:00
Robert Ly
8c573178df Merge "docs: fix l preview bugs" into klp-modular-dev 2014-06-20 21:00:34 +00:00
Robert Ly
c8590ffdc3 docs: fix l preview bugs 
Change-Id: Ic89fea620ba458c604ccdeeb6da471c807a71fef
 2014-06-20 14:11:29 -07:00
Deepanshu Gupta
b337295654 Merge "LayoutLib: Better support for compact/elegant fonts." into lmp-preview-dev 2014-06-20 21:00:34 +00:00
Michael Kolb
270c099faf Merge "Move emulator check & save system properties access" into klp-modular-dev 2014-06-20 20:43:34 +00:00
Michael Kolb
22dfdcb7ee Move emulator check & save system properties access 
Bug: 15775489

Change-Id: I375aee36b212ae044101a65b65c51e6f889fd263
 2014-06-20 15:39:04 -07:00
Deepanshu Gupta
0a1335d770 Merge "Material navigation bar for layoutlib." into lmp-preview-dev 2014-06-20 20:43:34 +00:00
Ji-Hwan Lee
8865275ebc DO NOT MERGE: Use main looper for PackageMonitor 
This is to work-around the issue that TvInputManagerService does not
receive package change callbacks from PackageMonitor.

In ATV emulator build, the background thread is blocked at
android_location_GpsLocationProvider_init(), and PackageMonitor that uses
background thread fails to handle broadcast intent.

Bug: 15767453
Change-Id: Ieef00cedf1357d57e4217ec202d50655ba3aa35a
 2014-06-21 06:31:12 +09:00
Ji-Hwan Lee
0ceb7e4755 Register PackageMonitor when system services are ready 
Bug: 15767453
Change-Id: I191b20dfa31eee0e37ba7df67cbf906ccbfc0f4e
 2014-06-21 06:30:49 +09:00
Dan Albert
a642a9ea3b am d24f5577: Merge "Use openssl\'s SHA1 instead of bionic\'s." 
* commit 'd24f557798d04bdd50f2a45e48b70b009a205b4a':
  Use openssl's SHA1 instead of bionic's.
 2014-06-20 19:53:36 +00:00
Brian Carlstrom
0547ce55eb Treat missing package usage data as a separate case 
Bug: 15520936
Change-Id: I8e1c6921973f84af7ee94de91721cc4a3436ebaf
 2014-06-20 12:53:19 -07:00
Baligh Uddin
1c74e20db1 am 1b3a5217: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '1b3a52170ab0f2ec82532a689d271eaf8b8997f9':
  Import translations. DO NOT MERGE
 2014-06-20 19:48:52 +00:00
Robert Ly
149c1b09ee am c9334fb1: fix typo on lmp-prev page 
* commit 'c9334fb1b884031ad0f522085542e80e71f73685':
  fix typo on lmp-prev page
 2014-06-20 19:48:48 +00:00
Robert Ly
f6c5ee4079 am 3323e554: Merge "add new image and landing page for l-preview" into klp-modular-dev 
* commit '3323e554391e7cf5ddba03d9f468c8acfb35ee0e':
  add new image and landing page for l-preview
 2014-06-20 19:48:40 +00:00
Nicolas Prevot
f5fb7035c4 Merge "Show the icon of the personal space." 2014-06-20 18:26:34 +00:00
Nicolas Prevot
88cc346d06 Show the icon of the personal space. 
In an intent disambiguation dialog from a managed profile,
when the intent can be forwarded to the personal space:
show the icon of the parent next to "Personal apps".
And put it at the bottom of the dialog.

Change-Id: I523222aac5dde9653e784eb26cf23cdaf018b86c
 2014-06-23 12:25:07 +01:00
Robert Ly
2fe74af91c am 12426cff: am 878325b3: Merge "docs: l-preview fixes" into klp-modular-dev 
* commit '12426cff730ec2e691005407b911ebe71fbb268d':
  docs: l-preview fixes
 2014-06-23 10:40:23 +00:00
Robert Ly
aac10712f1 am 2061f0a2: am 0cff6256: docs: more auto updates 
* commit '2061f0a2dfdda9a9bf36d99d0b67f8d3821cdef7':
  docs: more auto updates
 2014-06-23 10:40:14 +00:00
George Mount
125578a863 API Review: Change View viewName attribute to transitionName. 
Bug 15548520

Change-Id: I4009458d83dbffb20ff0100aaa42eea44d943378
 2014-06-20 11:01:01 -07:00
Elliott Hughes
19597647f9 am ff6b0e24: am f1896106: Merge "Fixed VM memory leak in AudioSystem JNI interface" 
* commit 'ff6b0e24725c642f0681e214f143a8151e4e6bea':
  Fixed VM memory leak in AudioSystem JNI interface
 2014-06-20 16:34:36 +00:00
Elliott Hughes
ff6b0e2472 am f1896106: Merge "Fixed VM memory leak in AudioSystem JNI interface" 
* commit 'f18961066b7029652dacb9016bacbf192a6cf73d':
  Fixed VM memory leak in AudioSystem JNI interface
 2014-06-20 16:30:40 +00:00
smain@google.com
4d30b1e663 make buttons "primary" red 
Change-Id: Ife5f2b565f52621df953593b9b3bd7cc05500f81
 2014-06-19 22:33:50 -07:00
Alexandra Gherghina
aeb0ed7467 Merge "Adds cross-profile intent filters for the Settings app" 2014-06-20 04:43:13 +00:00