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

106991 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Kralevich
631500ef58 Move VelocityTracker.cpp to target build only 
VelocityTracker.cpp makes reference to property_get, which
doesn't make a lot of sense when compiling for the host.
Compile this file for the target only.

Keyboard.cpp: Remove unnecessary include file.

Change-Id: Iee9edd81953b2e7e815005770ce286a6ec586f20
 2013-05-21 15:04:14 -07:00
Chris Craik
7f43674db3 Merge "Fix DISPLAY_LIST_DEBUG" 2013-05-21 20:30:19 +00:00
Michael Wright
a66c789f61 Merge "Pipe through bounding box information" 2013-05-21 20:03:49 +00:00
Robert Greenwalt
11f33b50bb am 657eb614: am 4c32885c: Merge "Don\'t put up wifi-available note when disabled" into jb-mr2-dev 
* commit '657eb614ef0d5b56dfbfe3669db18f5a59b57c29':
  Don't put up wifi-available note when disabled
 2013-05-21 12:58:00 -07:00
Robert Greenwalt
657eb614ef am 4c32885c: Merge "Don\'t put up wifi-available note when disabled" into jb-mr2-dev 
* commit '4c32885c4249be9b0a9e674b96ebacc78152b47e':
  Don't put up wifi-available note when disabled
 2013-05-21 12:56:04 -07:00
Robert Greenwalt
4c32885c42 Merge "Don't put up wifi-available note when disabled" into jb-mr2-dev 2013-05-21 19:54:39 +00:00
Ying Wang
f910acb314 Merge "Clean up dist files." 2013-05-21 19:44:34 +00:00
Ying Wang
13e3f1ca24 Clean up dist files. 
Change-Id: I921267de67aaab81dbde53751bbea392a862b62b
 2013-05-21 12:38:22 -07:00
Jeff Brown
b631eda39c am cf4339a8: am acad301a: Merge "Update media route picker button assets." into jb-mr2-dev 
* commit 'cf4339a8093f2497437ec4bb8a9ef4a1c279c279':
  Update media route picker button assets.
 2013-05-21 11:43:43 -07:00
Jeff Brown
cf4339a809 am acad301a: Merge "Update media route picker button assets." into jb-mr2-dev 
* commit 'acad301ae7f7d950aa54526c379d0ca605f180ca':
  Update media route picker button assets.
 2013-05-21 11:39:43 -07:00
Jeff Brown
acad301ae7 Merge "Update media route picker button assets." into jb-mr2-dev 2013-05-21 18:37:07 +00:00
Romain Guy
49f2e4098d Merge "Destroy display lists when running complete memory trims Bug #8833153" 2013-05-21 18:25:14 +00:00
Robert Greenwalt
8c77692554 Don't put up wifi-available note when disabled 
With the new scan-always mode we will get scan results when disabled.
Don't tell the user about open AP when they've turned off wifi.

bug:9067982
Change-Id: I7a303c2a6f87a331443eeb54fa8ff5b467c0a1ff
 2013-05-21 11:17:11 -07:00
Jay Shrauner
049219925f am 66d67241: am 34bed420: Merge "Update CALL_PRIVILEGED docs" into jb-mr2-dev 
* commit '66d67241205e857e434bacf1a1e8fb8e3100018d':
  Update CALL_PRIVILEGED docs
 2013-05-21 11:06:05 -07:00
Jay Shrauner
66d6724120 am 34bed420: Merge "Update CALL_PRIVILEGED docs" into jb-mr2-dev 
* commit '34bed4206750eadd69737274dc641b2d1444af3f':
  Update CALL_PRIVILEGED docs
 2013-05-21 11:02:33 -07:00
Jay Shrauner
34bed42067 Merge "Update CALL_PRIVILEGED docs" into jb-mr2-dev 2013-05-21 17:59:25 +00:00
Chris Craik
6045d2b7cd Fix DISPLAY_LIST_DEBUG 
will now log ops

Change-Id: I4e119999af7ceea0558225aa78926e761277fee2
 2013-05-21 10:49:47 -07:00
Dianne Hackborn
01549b001e Merge "Fix build." 2013-05-21 17:48:32 +00:00
Dianne Hackborn
19849d3c9a Fix build. 
Change-Id: I3dc503a3cd30276ac10582db44732d96b68230ee
 2013-05-21 10:47:17 -07:00
Daniel Sandler
75c501747e am 99d1f7f4: am f5ceaf4b: Merge "Archive a copy of each dismissed notification." into jb-mr2-dev 
* commit '99d1f7f41e79157ca61b14a1d61d29b5f51efc73':
  Archive a copy of each dismissed notification.
 2013-05-21 10:39:02 -07:00
Daniel Sandler
99d1f7f41e am f5ceaf4b: Merge "Archive a copy of each dismissed notification." into jb-mr2-dev 
* commit 'f5ceaf4b19362b3cf7882bf8a6d086841f551fed':
  Archive a copy of each dismissed notification.
 2013-05-21 10:37:27 -07:00
Daniel Sandler
f5ceaf4b19 Merge "Archive a copy of each dismissed notification." into jb-mr2-dev 2013-05-21 17:35:17 +00:00
Dirk Dougherty
1a83199666 am 136300bc: am d258b1ef: am 2d31a8e8: am a3d5a7a9: am 0269b3dd: am 6a4214f0: am a963459e: Merge "Doc change: fix doc title." into jb-mr1.1-docs 
* commit '136300bc65bd35b5b87fed1c494aea7c97c9117e':
  Doc change: fix doc title.
 2013-05-21 10:25:57 -07:00
Dirk Dougherty
136300bc65 am d258b1ef: am 2d31a8e8: am a3d5a7a9: am 0269b3dd: am 6a4214f0: am a963459e: Merge "Doc change: fix doc title." into jb-mr1.1-docs 
* commit 'd258b1efe7717272c1e615fbe7884a93de198018':
  Doc change: fix doc title.
 2013-05-21 10:23:23 -07:00
Dirk Dougherty
d258b1efe7 am 2d31a8e8: am a3d5a7a9: am 0269b3dd: am 6a4214f0: am a963459e: Merge "Doc change: fix doc title." into jb-mr1.1-docs 
* commit '2d31a8e85ca9e10c1dca720e89f2caa15dfd6e45':
  Doc change: fix doc title.
 2013-05-21 10:21:34 -07:00
Scott Main
974cfa1a5b am d16004af: am dad413d0: am c7785844: am e6fbd9ed: am 86c25dec: add search tag for swipe view lesson 
* commit 'd16004af9c71bfd2d0da9ec58e1a50e748b1bd62':
  add search tag for swipe view lesson
 2013-05-21 10:20:59 -07:00
Dirk Dougherty
2d31a8e85c am a3d5a7a9: am 0269b3dd: am 6a4214f0: am a963459e: Merge "Doc change: fix doc title." into jb-mr1.1-docs 
* commit 'a3d5a7a90fc9029e82e9e5cb64e789854ef99506':
  Doc change: fix doc title.
 2013-05-21 10:19:39 -07:00
Scott Main
d16004af9c am dad413d0: am c7785844: am e6fbd9ed: am 86c25dec: add search tag for swipe view lesson 
* commit 'dad413d01e08bcd5b709b438a4780a1956c7673e':
  add search tag for swipe view lesson
 2013-05-21 10:17:46 -07:00
Scott Main
dad413d01e am c7785844: am e6fbd9ed: am 86c25dec: add search tag for swipe view lesson 
* commit 'c778584443cfb3af5a4f449959e16997edede266':
  add search tag for swipe view lesson
 2013-05-21 10:15:36 -07:00
Dirk Dougherty
a3d5a7a90f am 0269b3dd: am 6a4214f0: am a963459e: Merge "Doc change: fix doc title." into jb-mr1.1-docs 
* commit '0269b3dde009650192a3a746929e5f4c8b54e0c2':
  Doc change: fix doc title.
 2013-05-21 10:14:58 -07:00
Scott Main
c778584443 am e6fbd9ed: am 86c25dec: add search tag for swipe view lesson 
* commit 'e6fbd9ed6f9bda28d1279d4b762d8f0ab885ab47':
  add search tag for swipe view lesson
 2013-05-21 10:14:03 -07:00
Dirk Dougherty
0269b3dde0 am 6a4214f0: am a963459e: Merge "Doc change: fix doc title." into jb-mr1.1-docs 
* commit '6a4214f065d05e9ec0480929c2ed800d0e3a86f8':
  Doc change: fix doc title.
 2013-05-21 10:12:55 -07:00
Scott Main
e6fbd9ed6f am 86c25dec: add search tag for swipe view lesson 
* commit '86c25decc05bcf9f3085ccbcfb18e31d6d010970':
  add search tag for swipe view lesson
 2013-05-21 10:11:41 -07:00
Dirk Dougherty
6a4214f065 am a963459e: Merge "Doc change: fix doc title." into jb-mr1.1-docs 
* commit 'a963459e3f96f2b27d87e3fccdfa8fb98f0f9ab6':
  Doc change: fix doc title.
 2013-05-21 10:07:03 -07:00
Dirk Dougherty
a963459e3f Merge "Doc change: fix doc title." into jb-mr1.1-docs 2013-05-21 17:05:08 +00:00
Dirk Dougherty
07340d636d Doc change: fix doc title. 
Change-Id: I2303ef05df89780ab3fa396b248097ea1115bb05
 2013-05-21 10:03:35 -07:00
The Android Open Source Project
d72c371346 am e4753307: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit 'e47533071890836aa1fce70c4e6fb0582d6de5cf':
  Do not report the fake UI automation service to clients.
  Add a time margin for deferred enable.
  Taking into account data change for AbsListView when prefetching node infos.
  Fix off-by-1 error in timing
 2013-05-21 09:02:30 -07:00
The Android Open Source Project
e475330718 Reconcile with jb-mr2-release - do not merge 
Change-Id: I78fc7efc6eaaf9cba14f30d83be55ef494804de0
 2013-05-21 08:59:00 -07:00
The Android Automerger
a348cc55bf merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-21 07:46:48 -07:00
Przemyslaw Szczepaniak
40d51e7003 Make TtsEngines.getDefaultLocale() method public 
TtsEngines is hidden class, it's not a public API.
It's required for tracking system language setting by TTS engines
(Change: Ic4bde97ef7406adb64cc03efbe660275360ba3af )

Bug: 8613986
Change-Id: Iafafcdb244e1520893bee65febd5a137e3556317
 2013-05-21 12:29:28 +00:00
Scott Main
7fb27f74ce am 0000e1c8: am b59cf565: am e205386e: am 66e965dd: am 2377da02: Merge "delete orphaned and obsolete files" into jb-mr1.1-ub-dev 
* commit '0000e1c82e630fbda525619d837beec065a950bf':
  delete orphaned and obsolete files
 2013-05-21 02:36:23 -07:00
Dirk Dougherty
e9114f73d9 am 21bb5ccd: am 9fca910b: am 807582cb: am 45e87f4e: am 0775c1ba: am b3d79b44: am 4a3c5584: Merge "Doc change: fix tiny url." into jb-mr1.1-docs 
* commit '21bb5ccd433820bebb2263decf85ef8a402c1e47':
  Doc change: fix tiny url.
 2013-05-21 02:36:19 -07:00
Scott Main
0000e1c82e am b59cf565: am e205386e: am 66e965dd: am 2377da02: Merge "delete orphaned and obsolete files" into jb-mr1.1-ub-dev 
* commit 'b59cf5659da6279a977282fc39c0c2c3a3dd9f37':
  delete orphaned and obsolete files
 2013-05-21 02:33:44 -07:00
Dirk Dougherty
21bb5ccd43 am 9fca910b: am 807582cb: am 45e87f4e: am 0775c1ba: am b3d79b44: am 4a3c5584: Merge "Doc change: fix tiny url." into jb-mr1.1-docs 
* commit '9fca910be71fb50f45a29b8348cd75e6b23f8c8b':
  Doc change: fix tiny url.
 2013-05-21 02:33:42 -07:00
Scott Main
b59cf5659d am e205386e: am 66e965dd: am 2377da02: Merge "delete orphaned and obsolete files" into jb-mr1.1-ub-dev 
* commit 'e205386e1ef1364977fe9c0aeb5bf0d6dbe0fd44':
  delete orphaned and obsolete files
 2013-05-21 02:31:16 -07:00
Dirk Dougherty
9fca910be7 am 807582cb: am 45e87f4e: am 0775c1ba: am b3d79b44: am 4a3c5584: Merge "Doc change: fix tiny url." into jb-mr1.1-docs 
* commit '807582cbb97d8c2173caaf40d6234e9435734f8a':
  Doc change: fix tiny url.
 2013-05-21 02:31:12 -07:00
Brett Chabot
2251059ee1 Merge "Build native libinput tests using BUILD_NATIVE_TESTS" 2013-05-21 05:00:30 +00:00
Daniel Sandler
26b81d594c Archive a copy of each dismissed notification. 
We don't want to save all the heavyweight stuff, but we
can't lighten the notification in place because there may be
other active references.

Bug: 8839246
Change-Id: Id6dcc1cf5ae196ee3e42908d6b3ec4e928e9f0c5
 2013-05-21 00:58:32 -04:00
Scott Main
86c25decc0 add search tag for swipe view lesson 
Change-Id: I4e880dbe6d77c89eff7e9b56c4ec98d8b7df906d
 2013-05-20 20:54:31 -07:00
Jeff Brown
e9b2f9a069 am 04be10a5: am 36b3b1dd: Merge "Support double-tap home to go to recents." into jb-mr2-dev 
* commit '04be10a5b1053d3d263a5522239f5ff6faf283e4':
  Support double-tap home to go to recents.
 2013-05-20 19:22:56 -07:00