Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
127,557 Commits 3 Branches 0 Tags
ed537880408e8040b133b3a88aaa18eedb071520
Commit Graph

37473 Commits

Author SHA1 Message Date
Svetoslav
ed53788040 am 353e0cf7: am 78a06696: am 90119082: am 358eaa78: am fc1d0471: am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev 
* commit '353e0cf71885909ac7062fdb09f42b9682359593':
  PrintSpooler crash if printer is reported to have only one color mode.
 2014-03-14 10:59:36 -07:00
Svetoslav
353e0cf718 am 78a06696: am 90119082: am 358eaa78: am fc1d0471: am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev 
* commit '78a06696b714dd97076b98a415aadcc174fe3af0':
  PrintSpooler crash if printer is reported to have only one color mode.
 2014-03-14 17:53:41 +00:00
Svetoslav
9011908230 am 358eaa78: am fc1d0471: am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev 
* commit '358eaa7825140ee571a7b9d61705fb3adb5b60aa':
  PrintSpooler crash if printer is reported to have only one color mode.
 2014-03-14 16:32:15 +00:00
Svetoslav
358eaa7825 am fc1d0471: am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev 
* commit 'fc1d04714e9042a1b01c7a725fafa1820b8c14fb':
  PrintSpooler crash if printer is reported to have only one color mode.
 2014-03-14 16:27:55 +00:00
Jose Lima
a5b61d39ce am 92703e62: resolved conflicts for merge of 4882ddfa to master 
* commit '92703e62c1dc88a410a32b05c2d44f391c193140':
  Add banner attribute to app manifest
 2014-03-13 21:30:03 -07:00
Jose Lima
92703e62c1 resolved conflicts for merge of 4882ddfa to master 
Change-Id: I179899697c148ac34a67b195e2dbd3df2f9138de
 2014-03-13 21:26:48 -07:00
Adam Powell
6cde6c75b3 am 41685ce9: am 898d6d96: am 7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev 
* commit '41685ce983abd6b4ccbb0ae8043d6a1dc118f7d3':
  Add a config override for ViewConfiguration#hasPermanentMenuKey
 2014-03-13 23:57:19 +00:00
Adam Powell
41685ce983 am 898d6d96: am 7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev 
* commit '898d6d964cb3b650b5c9bed2276310547e5455e0':
  Add a config override for ViewConfiguration#hasPermanentMenuKey
 2014-03-13 23:53:38 +00:00
John Reck
0b55ac30ca am 19caf396: Merge "App compat" 
* commit '19caf39612a574672169402d79be4d161b122290':
  App compat
 2014-03-13 15:09:31 -07:00
John Reck
19caf39612 Merge "App compat" 2014-03-13 22:06:23 +00:00
John Reck
40503f9f8c App compat 
Bug: 13450310

Change-Id: I32d948a243385d1bb9f2615759127f4b13ce01bd
 2014-03-13 14:53:13 -07:00
Ruben Brunk
c803300002 am dba76442: Merge "camera3: Pass vendor tags through binder." 
* commit 'dba764426b1657b84a2fb88690be7be34498bd09':
  camera3: Pass vendor tags through binder.
 2014-03-13 13:20:45 -07:00
Ruben Brunk
dba764426b Merge "camera3: Pass vendor tags through binder." 2014-03-13 20:18:37 +00:00
Ruben Brunk
85c4388de1 camera3: Pass vendor tags through binder. 
Bug: 12134423

Change-Id: Icef3fe9e67160767bdb8244ac49c85b68b497123
 2014-03-13 12:14:49 -07:00
Chad Brubaker
7f68f7f4a1 am f5729a6a: am 1011960c: am decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev 
* commit 'f5729a6a1573ba27f69a5c5dc144be3f8f60b026':
  Add the calling package name to requestRouteToHost
 2014-03-13 18:22:57 +00:00
Chad Brubaker
f5729a6a15 am 1011960c: am decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev 
* commit '1011960c44a4f84d53d05199fe1ca09be9473822':
  Add the calling package name to requestRouteToHost
 2014-03-13 18:18:36 +00:00
Craig Mautner
c5fb32549f am aea74a59: Add Lock Task Mode. 
* commit 'aea74a5977ca9f1054926eb24f247562c3a4a6ba':
  Add Lock Task Mode.
 2014-03-13 11:13:16 -07:00
Craig Mautner
aea74a5977 Add Lock Task Mode. 
When in lock task mode only the specified task may run. All
attempts to switch to another task are ignored until the task
finishes or a call to stopLockTaskMode() is made.

Change-Id: I6cfe92fe1bcf22cd47b5398c08e23c52a4092dda
 2014-03-13 11:09:13 -07:00
Jose Lima
53ac5ef214 am 91726f4e: Merge "Add banner attribute to app manifest" into klp-modular-dev 
* commit '91726f4ea7b60025490209ccb2637d712e8d75fd':
  Add banner attribute to app manifest
 2014-03-13 18:02:50 +00:00
Alan Viverette
d7cc4bf482 am cf2b65ce: am 9ebe031c: am 6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev 
* commit 'cf2b65ce7a5a1d60755a00ae4da6cd6b1101af8c':
  DO NOT MERGE Quick fix for updating the FastScroller long list property
 2014-03-13 18:02:17 +00:00
Alan Viverette
839321a362 am c25dbb50: am 7b09a4e5: am e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev 
* commit 'c25dbb50c30816c97227b9a26cc46afec4e5318e':
  DO NOT MERGE Check item type before re-binding transient state views
 2014-03-13 18:02:14 +00:00
Alan Viverette
ba3d0fd5fc am af6288b7: am 3c3377a2: am 6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev 
* commit 'af6288b721110ffc4b4e68d55398b5ca31fc32e8':
  DO NOT MERGE Ensure transient state views are temporarily detached
 2014-03-13 18:02:11 +00:00
Adam Powell
4a5c9e941a am 68ec033b: am 75958c29: am 3a153c0d: Merge "Fix a bug in submenu presenter priority handling" into klp-dev 
* commit '68ec033b7c9ea28155bbb007b01d5dbce2239392':
  Fix a bug in submenu presenter priority handling
 2014-03-13 18:02:08 +00:00
Jose Lima
91726f4ea7 Merge "Add banner attribute to app manifest" into klp-modular-dev 2014-03-13 17:40:37 +00:00
Svetoslav
fc1d04714e am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev 
* commit '11b7d9fa6685e742f5b3e3235a8e6e4920dbed02':
  PrintSpooler crash if printer is reported to have only one color mode.
 2014-03-13 17:31:03 +00:00
Svetoslav
11b7d9fa66 Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev 2014-03-13 17:26:44 +00:00
Dianne Hackborn
c43e89a665 am 08fc3a7f: Merge "Fix some uid issues in battery stats." 
* commit '08fc3a7fc24cf16c15f53bab3d061a8c32367655':
  Fix some uid issues in battery stats.
 2014-03-13 10:07:37 -07:00
Dianne Hackborn
08fc3a7fc2 Merge "Fix some uid issues in battery stats." 2014-03-13 17:04:54 +00:00
Dianne Hackborn
bbb7472b8e Fix some uid issues in battery stats. 
Change-Id: I9f7773568ff12603d51b26d50d758add09bedbb2
 2014-03-13 09:50:24 -07:00
Jaewan Kim
cdca5cac5f am 68c9d259: Merge "EthernetDataTracker: Return proper interface name" 
* commit '68c9d2592cf492a37194522aa21ae01d6d7e1f4b':
  EthernetDataTracker: Return proper interface name
 2014-03-13 05:28:49 -07:00
Kenny Guy
4ec6830abe am 4979ff9f: Merge "Show notifications from related users." 
* commit '4979ff9f280727f15a0e4118426fbd4c3ba9cd31':
  Show notifications from related users.
 2014-03-13 05:28:45 -07:00
Jaewan Kim
68c9d2592c Merge "EthernetDataTracker: Return proper interface name" 2014-03-13 12:07:36 +00:00
Kenny Guy
4979ff9f28 Merge "Show notifications from related users." 2014-03-13 11:57:55 +00:00
Alan Viverette
cf2b65ce7a am 9ebe031c: am 6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev 
* commit '9ebe031cdc916646e95ffcd92dde67e1655be7ba':
  DO NOT MERGE Quick fix for updating the FastScroller long list property
 2014-03-13 10:01:39 +00:00
Alan Viverette
c25dbb50c3 am 7b09a4e5: am e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev 
* commit '7b09a4e5df908783a95dbfef3bc9fabda339c3a1':
  DO NOT MERGE Check item type before re-binding transient state views
 2014-03-13 10:01:35 +00:00
Alan Viverette
af6288b721 am 3c3377a2: am 6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev 
* commit '3c3377a2290764937548de5a49ca8ec28dc98153':
  DO NOT MERGE Ensure transient state views are temporarily detached
 2014-03-13 10:01:30 +00:00
Adam Powell
68ec033b7c am 75958c29: am 3a153c0d: Merge "Fix a bug in submenu presenter priority handling" into klp-dev 
* commit '75958c298477a3d1e556c4fe36e516b9e828c311':
  Fix a bug in submenu presenter priority handling
 2014-03-13 10:01:15 +00:00
Jose Lima
f78e312db2 Add banner attribute to app manifest 
Change-Id: I28b0dc6dee9623ec7534bb0e741b88f439b48c9f
 2014-03-12 18:07:38 -07:00
Jeff Brown
825dd9dd38 am 73bd57f7: Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev 
* commit '73bd57f7abdb9eaf9239aa13945990acc6c97cd2':
  Retain display when creating specialized contexts. (DO NOT MERGE)
 2014-03-13 00:15:19 +00:00
Jeff Brown
73bd57f7ab Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev 2014-03-13 00:12:53 +00:00
Yohei Yukawa
f183c4b46a am de69575d: Merge "Preserve the order of InputMethodManager method calls" 
* commit 'de69575dd1bdafabda8afda8b4251b830ba0c551':
  Preserve the order of InputMethodManager method calls
 2014-03-12 15:28:39 -07:00
Yohei Yukawa
de69575dd1 Merge "Preserve the order of InputMethodManager method calls" 2014-03-12 22:26:31 +00:00
Svetoslav
b628dd825b PrintSpooler crash if printer is reported to have only one color mode. 
bug:11993304

Change-Id: I4932cf1b5b9b89f0cbf97011782ede037e7d814c
(cherry picked from commit b0d97b87ba)
 2014-03-12 14:20:27 -07:00
RoboErik
306c46884e am ca9eef62: b/12068020 Make kb layouts only unique to vendor/product. Do not merge 
* commit 'ca9eef6203b7cfb0084f8305d4dcc5d70a7a25cd':
  b/12068020 Make kb layouts only unique to vendor/product. Do not merge
 2014-03-12 21:12:26 +00:00
RoboErik
ca9eef6203 b/12068020 Make kb layouts only unique to vendor/product. Do not merge 
This is a cherry-pick of https://googleplex-android-review.git.corp.google.com/#/c/399886/

Instead of storing a kb layout per device descriptor (which is expected
to be unique), store it for each vendor/product. This way we can keep
a consistent layout between identical but physically different keyboards.

There are some corner cases this is expected to fail on, namely devices
that incorrectly have the same vendor/product id. Devices that don't
define a vendor/product id will continue to use the descriptor to store
layout files.

Change-Id: I1f2508561992080459310d5a644dad65a9c24f1a
 2014-03-12 13:21:08 -07:00
Fabrice Di Meglio
7211da3401 am a7124cdd: Merge "Cleanup ContextThemeWrapper" 
* commit 'a7124cdd83723027f5880fa96f0c285a7615f3fa':
  Cleanup ContextThemeWrapper
 2014-03-12 13:07:34 -07:00
Justin Koh
d35c96f98c am c8dbd29f: am c65caed6: am c48701a1: am 641d8aff: Merge "Fix possible invalid pointer index in swipe dismiss." into klp-modular-dev 
* commit 'c8dbd29fc9b22ab0715dbe6181d53b24fa366332':
  Fix possible invalid pointer index in swipe dismiss.
 2014-03-12 13:03:58 -07:00
Fabrice Di Meglio
a7124cdd83 Merge "Cleanup ContextThemeWrapper" 2014-03-12 20:02:48 +00:00
Justin Koh
c8dbd29fc9 am c65caed6: am c48701a1: am 641d8aff: Merge "Fix possible invalid pointer index in swipe dismiss." into klp-modular-dev 
* commit 'c65caed6dabe9eed3551c412427df81cd881496a':
  Fix possible invalid pointer index in swipe dismiss.
 2014-03-12 19:57:14 +00:00
Kenny Guy
3a7c4a5669 Show notifications from related users. 
When filtering notifications for user include those for users that
are related to the current user.
Pipe through user id so we know which user the notification is for.

Change-Id: I4e2657c23bd7b611d450be5a1f9457824bc062cb
 2014-03-12 19:51:03 +00:00