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

169364 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
chh
3ec380d365 am fc545733: Merge "Remove unused variables and functions, don\'t warn about unused parameters" 
* commit 'fc54573373ff965aa40cccdc1ab11c1c880c8930':
  Remove unused variables and functions, don't warn about unused parameters
 2014-11-25 00:41:06 +00:00
chh
fc54573373 Merge "Remove unused variables and functions, don't warn about unused parameters" 2014-11-25 00:37:12 +00:00
Chih-hung Hsieh
43ea037b4c am 481c4b64: Merge "Fix class vs. struct mismatch" 
* commit '481c4b641ea7d210396f16478c486cabf51db879':
  Fix class vs. struct mismatch
 2014-11-25 00:24:23 +00:00
Chih-hung Hsieh
481c4b641e Merge "Fix class vs. struct mismatch" 2014-11-25 00:20:03 +00:00
Bernhard Rosenkränzer
99d61edfda Fix class vs. struct mismatch 
Don't refer to classes as structs and view versa -- causes warnings in
clang (in code built with -Werror)

Change-Id: I4d7f461bcf6fe4e43a14ad2f28ee0e0ddea95abc
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
 2014-11-24 16:18:15 -08:00
Chih-hung Hsieh
6cc39a475d am 613d2066: Merge "Fix unused variables." 
* commit '613d20668a28f9dc970949c9efd2ca7f61bed6f4':
  Fix unused variables.
 2014-11-25 00:00:22 +00:00
Chih-hung Hsieh
613d20668a Merge "Fix unused variables." 2014-11-24 23:53:36 +00:00
Bernhard Rosenkränzer
9c1c90e92e Fix unused variables. 
The return value of jniRegisterNativeMethods is checked only in
LOG_FATAL_IF, which defines to nothing in the LOG_NDEBUG
case.

Fake a use of the 'res' variable to shut off warnings when LOG_NDEBUG.

Change-Id: I8263610f327c56897f76796fe1fbc2b325b0559f
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
 2014-11-24 15:42:11 -08: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
Chih-hung Hsieh
73780ac392 am 38cc84de: Merge "Remove unused variable" 
* commit '38cc84deceaf7bc9fab898cbcb37523cfba2bb66':
  Remove unused variable
 2014-11-24 22:20:34 +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
Chih-hung Hsieh
38cc84dece Merge "Remove unused variable" 2014-11-24 22:15:42 +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
Jeff Davidson
6fdf2a1709 am 6ea4e11d: Merge "Don\'t enforce control permission when preparing consented VPN." into lmp-mr1-dev 
* commit '6ea4e11d9817d85eb5c0ff445154985e4eb0c534':
  Don't enforce control permission when preparing consented VPN.
 2014-11-24 21:25:41 +00:00
Jinsuk Kim
c27f5baaeb am 51cb7aa7: Merge "CEC: Do not issue non-effective <Routing Change>" into lmp-mr1-dev 
* commit '51cb7aa774cf6ab7727928d136052c61325a8031':
  CEC: Do not issue non-effective <Routing Change>
 2014-11-24 21:21:12 +00:00
Jeff Davidson
6ea4e11d98 Merge "Don't enforce control permission when preparing consented VPN." into lmp-mr1-dev 2014-11-24 21:19:56 +00:00
Geoff Mendal
6a0ec6e606 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-24 21:15:29 +00:00
Jinsuk Kim
51cb7aa774 Merge "CEC: Do not issue non-effective <Routing Change>" into lmp-mr1-dev 2014-11-24 21:14:02 +00:00