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

160031 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
89a63f02f5 am 0c31d97a: Merge "Switch TextureCache to SkPixelRef::fStableId" into lmp-mr1-dev 
* commit '0c31d97a38909e85e0df6cdc29469dbb1580ed4b':
  Switch TextureCache to SkPixelRef::fStableId
 2014-11-25 15:38:24 +00:00
John Reck
0c31d97a38 Merge "Switch TextureCache to SkPixelRef::fStableId" into lmp-mr1-dev 2014-11-25 15:32:27 +00:00
Natalie Masse
a05d4a4bb3 am 8d9e6434: am 65e51fcd: am d7c7d275: am 77283ec9: Merge "Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation" into lmp-docs 
* commit '8d9e64343decaaf56a7d1fae5ed14ed172e9d7dd':
  Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation
 2014-11-25 11:27:32 +00:00
Natalie Masse
8d9e64343d am 65e51fcd: am d7c7d275: am 77283ec9: Merge "Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation" into lmp-docs 
* commit '65e51fcda25c33cdfa73e8ca3a4f71cf987bd0d2':
  Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation
 2014-11-25 11:22:05 +00:00
Natalie Masse
65e51fcda2 am d7c7d275: am 77283ec9: Merge "Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation" into lmp-docs 
* commit 'd7c7d275e77ffcae7498df7f75142e68e1b5123c':
  Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation
 2014-11-25 11:15:24 +00:00
Natalie Masse
d7c7d275e7 am 77283ec9: Merge "Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation" into lmp-docs 
* commit '77283ec981fc022cd26ced1e44ad21cdc0b2e4ae':
  Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation
 2014-11-25 11:10:09 +00:00
Natalie Masse
77283ec981 Merge "Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation" into lmp-docs 2014-11-25 11:05:52 +00:00
Svet Ganov
48956f266d am f51d7015: Merge "Lockup in the print spooler." into lmp-mr1-dev 
* commit 'f51d7015df585b61d6a4f72f2327df7dcdec8899':
  Lockup in the print spooler.
 2014-11-25 10:42:30 +00:00
Svet Ganov
f51d7015df Merge "Lockup in the print spooler." into lmp-mr1-dev 2014-11-25 10:38:58 +00:00
Dirk Dougherty
be8da57a33 am 5977f7d5: am d23a8692: am 14e40f04: am fd117ff2: Doc change: zh-cn translation of Android L overviews. cherrypick from I56d1ce58e10b83d10d0077cc9dfbeb04f090b861 
* commit '5977f7d52008f9b8dfc429acfde222a6e0afb2a2':
  Doc change: zh-cn translation of Android L overviews. cherrypick from  I56d1ce58e10b83d10d0077cc9dfbeb04f090b861
 2014-11-25 03:03:46 +00:00
Dirk Dougherty
5977f7d520 am d23a8692: am 14e40f04: am fd117ff2: Doc change: zh-cn translation of Android L overviews. cherrypick from I56d1ce58e10b83d10d0077cc9dfbeb04f090b861 
* commit 'd23a8692ac96b7da73949d2dc4c549e73931609c':
  Doc change: zh-cn translation of Android L overviews. cherrypick from  I56d1ce58e10b83d10d0077cc9dfbeb04f090b861
 2014-11-25 02:58:25 +00:00
Dirk Dougherty
d23a8692ac am 14e40f04: am fd117ff2: Doc change: zh-cn translation of Android L overviews. cherrypick from I56d1ce58e10b83d10d0077cc9dfbeb04f090b861 
* commit '14e40f042f17ae9e596ba6db7ff11c230796f193':
  Doc change: zh-cn translation of Android L overviews. cherrypick from  I56d1ce58e10b83d10d0077cc9dfbeb04f090b861
 2014-11-25 02:51:10 +00:00
Dirk Dougherty
14e40f042f am fd117ff2: Doc change: zh-cn translation of Android L overviews. cherrypick from I56d1ce58e10b83d10d0077cc9dfbeb04f090b861 
* commit 'fd117ff2a4a8edd570ccaedd0cd769613ad4ef74':
  Doc change: zh-cn translation of Android L overviews. cherrypick from  I56d1ce58e10b83d10d0077cc9dfbeb04f090b861
 2014-11-25 02:20:36 +00:00
Dirk Dougherty
fd117ff2a4 Doc change: zh-cn translation of Android L overviews. 
cherrypick from  I56d1ce58e10b83d10d0077cc9dfbeb04f090b861

Change-Id: Ic02b747917b11a88c2adf38a73c046dc32af6ce9
 2014-11-24 17:39:14 -08:00
Alan Viverette
2bae3789da am ada19e6d: Merge "Update action bar insets on sw600dp to match Material spec" into lmp-mr1-dev 
* commit 'ada19e6de6bbad9a11a8db6ee44eb923709153b5':
  Update action bar insets on sw600dp to match Material spec
 2014-11-25 00:56:15 +00:00
Alan Viverette
0e8aabd6c9 am 662039c6: Merge "Update IME selection dialog layout for Material" into lmp-mr1-dev 
* commit '662039c68768890d4f5a818067542be51e89255c':
  Update IME selection dialog layout for Material
 2014-11-25 00:56:10 +00:00
Alan Viverette
df188d4137 am d30f6fba: Merge "Cannot set Pivot X,Y values from setPivotX, setPivotY API" into lmp-mr1-dev 
* commit 'd30f6fba8ba15198a448d12d35e70872dcdf3589':
  Cannot set Pivot X,Y values from setPivotX, setPivotY API
 2014-11-25 00:56:05 +00:00
Adam Lesinski
9f692b5202 am 9be305d1: Merge "Make the Context service constant for UsageStats public" into lmp-mr1-dev 
* commit '9be305d146fb422a0e65e5284af2ce081cdc6a69':
  Make the Context service constant for UsageStats public
 2014-11-25 00:56:00 +00:00
Alan Viverette
cda2dafd36 am 27fdbc60: Merge "Ensure calling mutate() on DrawableContainer creates a new state" into lmp-mr1-dev 
* commit '27fdbc60736d2aced3fac01476851d6f130c392f':
  Ensure calling mutate() on DrawableContainer creates a new state
 2014-11-25 00:55:55 +00:00
Alan Viverette
44c09f2919 am 27fbf676: Merge "Update documentation for DatePicker to reflect the new mode" into lmp-mr1-dev 
* commit '27fbf67644bed5d0d590458ad89cee38d8fddeaa':
  Update documentation for DatePicker to reflect the new mode
 2014-11-25 00:55:49 +00:00
Alan Viverette
ada19e6de6 Merge "Update action bar insets on sw600dp to match Material spec" into lmp-mr1-dev 2014-11-25 00:54:05 +00:00
Alan Viverette
662039c687 Merge "Update IME selection dialog layout for Material" into lmp-mr1-dev 2014-11-25 00:53:43 +00:00
Alan Viverette
d30f6fba8b Merge "Cannot set Pivot X,Y values from setPivotX, setPivotY API" into lmp-mr1-dev 2014-11-25 00:53:08 +00:00
Adam Lesinski
9be305d146 Merge "Make the Context service constant for UsageStats public" into lmp-mr1-dev 2014-11-25 00:51:10 +00:00
Alan Viverette
27fdbc6073 Merge "Ensure calling mutate() on DrawableContainer creates a new state" into lmp-mr1-dev 2014-11-25 00:50:55 +00:00
Alan Viverette
27fbf67644 Merge "Update documentation for DatePicker to reflect the new mode" into lmp-mr1-dev 2014-11-25 00:50:50 +00:00
John Reck
71d08a0718 Switch TextureCache to SkPixelRef::fStableId 
Bug: 18245805
Change-Id: I08e6792dbeed86b13e569c7f2137de0e50dc2763
 2014-11-24 15:24:02 -08:00
Alan Viverette
505e3abb8d Update IME selection dialog layout for Material 
Also cleans up simple_list_item_2.xml formatting.

BUG: 18314215
Change-Id: I12b6ff19fca891524da7137b85dd576f85ee266a
 2014-11-24 15:22:11 -08:00
Tom Taylor
bd3b00004c am 4cd3e47e: Merge "Issues with messaging apps on non-primary user account" into lmp-mr1-dev 
* commit '4cd3e47e584fb1508db8f0e559f1167ab07c68c3':
  Issues with messaging apps on non-primary user account
 2014-11-24 23:20:11 +00:00
Ruben Brunk
c02cdf00e5 am 8791a1e8: Merge "Camera2: Ignore unsupported face detection results in LEGACY." into lmp-mr1-dev 
* commit '8791a1e81a5a07b10b2be05fc6f3d94a71139c96':
  Camera2: Ignore unsupported face detection results in LEGACY.
 2014-11-24 23:16:03 +00:00
Tom Taylor
4cd3e47e58 Merge "Issues with messaging apps on non-primary user account" into lmp-mr1-dev 2014-11-24 23:14:42 +00:00
Ruben Brunk
8791a1e81a Merge "Camera2: Ignore unsupported face detection results in LEGACY." into lmp-mr1-dev 2014-11-24 23:11:33 +00:00
Jeff Sharkey
f07a99f9b9 am 07aca15b: Merge "Better am error when SELinux blocking access." into lmp-mr1-dev 
* commit '07aca15b96806b48a46b9c92096a35d4443fa5dd':
  Better am error when SELinux blocking access.
 2014-11-24 23:10:01 +00:00
RoboErik
a903102564 am d9bb296b: Merge "Delay calling onConnected until a session is set in MediaBrowser" into lmp-mr1-dev 
* commit 'd9bb296b56f1107674fd6370295e0bc1010848ba':
  Delay calling onConnected until a session is set in MediaBrowser
 2014-11-24 23:09:56 +00:00
Jeff Sharkey
07aca15b96 Merge "Better am error when SELinux blocking access." into lmp-mr1-dev 2014-11-24 23:05:08 +00:00
RoboErik
d9bb296b56 Merge "Delay calling onConnected until a session is set in MediaBrowser" into lmp-mr1-dev 2014-11-24 23:04:59 +00:00
Jeff Sharkey
dbea3cd118 Better am error when SELinux blocking access. 
Bug: 18479882
Change-Id: I0732e54838c4e04d9d727e7c5fd9d7e7bacbaa1f
 2014-11-24 14:51:34 -08:00
Alan Viverette
3c9012b9ba Update action bar insets on sw600dp to match Material spec 
BUG: 18482784
Change-Id: Ic9dbca11e9fbf850ad017e1a4c7b72030bf35ddc
 2014-11-24 14:37:46 -08:00
Jeff Sharkey
117c549b86 am 0f667f58: Merge "Ignore spammy package logs when dumping." into lmp-mr1-dev 
* commit '0f667f5855bff7432002dba2ef0d393fe2ad955f':
  Ignore spammy package logs when dumping.
 2014-11-24 22:26:10 +00:00
Jeff Sharkey
ce7a0e6cc7 am 7038c390: Merge "Move Documents action bar update even later." into lmp-mr1-dev 
* commit '7038c39012c039aafcf4ac7931a087bfff42e125':
  Move Documents action bar update even later.
 2014-11-24 22:26:04 +00:00
Jeff Sharkey
0f667f5855 Merge "Ignore spammy package logs when dumping." into lmp-mr1-dev 2014-11-24 22:21:27 +00:00
Jeff Sharkey
7038c39012 Merge "Move Documents action bar update even later." into lmp-mr1-dev 2014-11-24 22:18:51 +00:00
Svet Ganov
c80814e70a Lockup in the print spooler. 
A recent change modified the way we destroy the remote renderer from
asynchronous to synchronous. This caused problems since it was possible
that the remote rendering service is unbound while we are reading the
contents of a rendered page. As a result the reader was blocking on I/O
and the print spooler was getting into a locked state that required a
restart of its process.  Now the remote renderer is destroyed
asynchronously.

bug:18498626

Change-Id: I1312bf808f30430728b4038dd4be43c55d2be825
 2014-11-24 22:12:34 +00:00
Alan Viverette
d25eb9fbb9 Update documentation for DatePicker to reflect the new mode 
BUG: 18508605
Change-Id: I23d45bf1cd7783fa6f397c15f0ba6802e4069d6b
 2014-11-24 14:07:24 -08:00
Alan Viverette
0d05788fd0 am 760cfb02: Merge "Check for null drawable in theme-less getDrawable()" into lmp-mr1-dev 
* commit '760cfb02de1e547b2823bf2b9621ef5b953cc5bd':
  Check for null drawable in theme-less getDrawable()
 2014-11-24 22:05:44 +00:00
Alan Viverette
760cfb02de Merge "Check for null drawable in theme-less getDrawable()" into lmp-mr1-dev 2014-11-24 21:57:51 +00:00
Adam Lesinski
aa6076701d Make the Context service constant for UsageStats public 
This was an oversight in L, where we did not make this
service constant public.

Change-Id: I42e38cb5ef8420cadc1a4a6705821189d911ccfe
 2014-11-24 13:53:57 -08:00
Jean-Michel Trivi
213472d738 am 8c816096: Merge "Add support for audio focus locking" into lmp-mr1-dev 
* commit '8c81609616498b382d61d08371c547d644fa0709':
  Add support for audio focus locking
 2014-11-24 21:44:21 +00:00
Jeff Sharkey
962bd4a691 Ignore spammy package logs when dumping. 
Bug: 18390552
Change-Id: Ie333f57d46d6ab3f4b9daa17f98b1e94a236e959
 2014-11-24 13:43:45 -08:00
Jean-Michel Trivi
8c81609616 Merge "Add support for audio focus locking" into lmp-mr1-dev 2014-11-24 21:39:30 +00:00