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

104215 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
6c825d49b7 am 52706c6c: am 4a745e78: Merge "Change the dither texture\'s swizzling" into jb-mr2-dev 
* commit '52706c6cc0d8ded20cfa8d46f200ca38f1009468':
  Change the dither texture's swizzling
 2013-04-09 14:26:10 -07:00
Chiao Cheng
24fafc4cf5 am 3e41c7c9: am 2355d131: Adding public api support for finding contact changes. 
* commit '3e41c7c9baf58f49f06aec1bb9c3dcaf614e616e':
  Adding public api  support for finding contact changes.
 2013-04-09 14:26:06 -07:00
Jonathan Dixon
9a1d8c544a am a9b33346: am f38b070b: Merge "Hide PlusinsEnabled/PluginsPath methods" into jb-mr2-dev 
* commit 'a9b33346885a60aa1e8f36dded20fe0ca4c06882':
  Hide PlusinsEnabled/PluginsPath methods
 2013-04-09 14:25:56 -07:00
Robert Greenwalt
74a2a5dae0 am 27370393: am dbf500aa: Merge "Turn back on global proxy support." into jb-mr2-dev 
* commit '273703935d185b82e5d5e8a0ae2363743558227f':
  Turn back on global proxy support.
 2013-04-09 14:25:20 -07:00
Scott Main
3aa5aaa4ee am 92bc5d5c: am b4c13c4b: am 405c6e2d: am d3724e02: am 2568d7f0: am 0bf013fd: am f417fc4a: fix xml error in sample 
* commit '92bc5d5c7da286553d606679058e23858dbb4b94':
  fix xml error in sample
 2013-04-09 14:25:13 -07:00
Romain Guy
52706c6cc0 am 4a745e78: Merge "Change the dither texture\'s swizzling" into jb-mr2-dev 
* commit '4a745e78bb1a3fdb4d28e71ddccd9709df7db4b1':
  Change the dither texture's swizzling
 2013-04-09 14:20:05 -07:00
Chiao Cheng
3e41c7c9ba am 2355d131: Adding public api support for finding contact changes. 
* commit '2355d13154d50687c0d8d74ea1c0e41ab9d88e7e':
  Adding public api  support for finding contact changes.
 2013-04-09 14:20:02 -07:00
Romain Guy
4a745e78bb Merge "Change the dither texture's swizzling" into jb-mr2-dev 2013-04-09 21:18:46 +00:00
Chiao Cheng
2355d13154 Adding public api support for finding contact changes. 
DeletedContacts holds a log of deleted contacts which will be pruned
after a certain amount of time.

A timestamp field has been added to contacts so clients can query
for changes.

Bug: 8182147
Change-Id: Ic6e56e567892712da3c3941400dfb3ddc565aaac
 2013-04-09 14:12:31 -07:00
Jonathan Dixon
a9b3334688 am f38b070b: Merge "Hide PlusinsEnabled/PluginsPath methods" into jb-mr2-dev 
* commit 'f38b070b31269e974298ec9e644814bcc2663c91':
  Hide PlusinsEnabled/PluginsPath methods
 2013-04-09 13:15:27 -07:00
Jonathan Dixon
f38b070b31 Merge "Hide PlusinsEnabled/PluginsPath methods" into jb-mr2-dev 2013-04-09 20:09:29 +00:00
Dianne Hackborn
875422153d resolved conflicts for merge of e9b4ee69 to master 
Change-Id: Id752ae94f63a66b2ec200f68c73bf0d7b04b249f
 2013-04-09 11:56:06 -07:00
Robert Greenwalt
273703935d am dbf500aa: Merge "Turn back on global proxy support." into jb-mr2-dev 
* commit 'dbf500aaafd0889aa3ac9bf0fb2b2be4e0c3ebbf':
  Turn back on global proxy support.
 2013-04-09 11:19:34 -07:00
Robert Greenwalt
dbf500aaaf Merge "Turn back on global proxy support." into jb-mr2-dev 2013-04-09 18:15:06 +00:00
Scott Main
92bc5d5c7d am b4c13c4b: am 405c6e2d: am d3724e02: am 2568d7f0: am 0bf013fd: am f417fc4a: fix xml error in sample 
* commit 'b4c13c4b045f4d96c377ba1fb9d834c111412a8c':
  fix xml error in sample
 2013-04-09 10:53:13 -07:00
Scott Main
b4c13c4b04 am 405c6e2d: am d3724e02: am 2568d7f0: am 0bf013fd: am f417fc4a: fix xml error in sample 
* commit '405c6e2d656b628262ff3e3d0b79f58a46c839ec':
  fix xml error in sample
 2013-04-09 10:50:29 -07:00
Scott Main
405c6e2d65 am d3724e02: am 2568d7f0: am 0bf013fd: am f417fc4a: fix xml error in sample 
* commit 'd3724e02d898b66a5b94cf0f2d3bbfaec5295b32':
  fix xml error in sample
 2013-04-09 10:47:50 -07:00
Scott Main
d3724e02d8 am 2568d7f0: am 0bf013fd: am f417fc4a: fix xml error in sample 
* commit '2568d7f0cb9ee568309a0347805a12b9e771b689':
  fix xml error in sample
 2013-04-09 10:43:38 -07:00
Baligh Uddin
9b5ebe453d am 0e45086d: am 5660b484: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '0e45086dffacca8b3ae8c09ee2e940ff7d09b25a':
  Import translations. DO NOT MERGE
 2013-04-09 10:42:59 -07:00
Dianne Hackborn
e9b4ee692c am 558a3c1b: Merge "Kill processes when permissions are revoked." into jb-mr2-dev 
* commit '558a3c1b7b40eb9356f8c4446ca63af8cf16bd91':
  Kill processes when permissions are revoked.
 2013-04-09 10:42:09 -07:00
Scott Main
2568d7f0cb am 0bf013fd: am f417fc4a: fix xml error in sample 
* commit '0bf013fdbd11a18c010147aed5899034172feb9a':
  fix xml error in sample
 2013-04-09 10:41:03 -07:00
Baligh Uddin
0e45086dff am 5660b484: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '5660b4843ed1471b3b5318b77367dda7960596a1':
  Import translations. DO NOT MERGE
 2013-04-09 10:38:37 -07:00
Scott Main
0bf013fdbd am f417fc4a: fix xml error in sample 
* commit 'f417fc4a4f6aa577e0af08776825aa4569638f51':
  fix xml error in sample
 2013-04-09 10:38:18 -07:00
Dianne Hackborn
558a3c1b7b Merge "Kill processes when permissions are revoked." into jb-mr2-dev 2013-04-09 17:38:00 +00:00
Baligh Uddin
5a45bfe8c9 Merge "Import translations. DO NOT MERGE" 2013-04-09 17:34:58 +00:00
Baligh Uddin
5660b4843e Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-04-09 17:34:24 +00:00
Scott Main
f417fc4a4f fix xml error in sample 
Change-Id: I59ca15028c52e0be081f4e65308f88e06115f7fd
 2013-04-09 10:29:00 -07:00
Raph Levien
38de72a2c5 am d2773b5c: am 37605412: Merge "Update Droid Serif" into jb-mr2-dev 
* commit 'd2773b5cf872e27214970be8778bfbd41d2b5940':
  Update Droid Serif
 2013-04-09 10:19:13 -07:00
Raph Levien
d2773b5cf8 am 37605412: Merge "Update Droid Serif" into jb-mr2-dev 
* commit '376054121edc62e88b2e3f69ce3397fac557bc64':
  Update Droid Serif
 2013-04-09 10:14:58 -07:00
Romain Guy
032d47af73 Change the dither texture's swizzling 
This is a more elegant way to sample from a float alpha texture.
Instead of sampling from the red channel in the fragment shader
we can set the alpha channel swizzle to redirect it to the
red channel. This lets us sample from the alpha channel in the
fragment shader and get the correct value.

Change-Id: I95bbf7a82964e1bf42c0fee1b782b6bdbbcef618
 2013-04-09 10:12:47 -07:00
Raph Levien
376054121e Merge "Update Droid Serif" into jb-mr2-dev 2013-04-09 17:10:56 +00:00
Daniel Sandler
8be8d6e8b9 am 800d99f6: am 9fa49cc3: Merge "Fix [-] buttons in the notification builder test." into jb-mr2-dev 
* commit '800d99f6b557b8684fbdbfc882bc9789ccd3d21f':
  Fix [-] buttons in the notification builder test.
 2013-04-09 07:43:27 -07:00
Daniel Sandler
800d99f6b5 am 9fa49cc3: Merge "Fix [-] buttons in the notification builder test." into jb-mr2-dev 
* commit '9fa49cc3308f6af593d780581121afc3c1d7e046':
  Fix [-] buttons in the notification builder test.
 2013-04-09 07:40:22 -07:00
Daniel Sandler
9fa49cc330 Merge "Fix [-] buttons in the notification builder test." into jb-mr2-dev 2013-04-09 14:34:20 +00:00
Daniel Sandler
72dcb91393 Fix [-] buttons in the notification builder test. 
(Broken by change I9fae5a4a).

Bug: 8564511
Change-Id: I0d5b65e6678018630c812c5616e9b3f068029e66
 2013-04-09 13:34:04 +00:00
Michael Jurka
d2c6dd012d am 7449844f: am 104ca45a: Merge "Fix janky icon fade-in animation in Recents" into jb-mr2-dev 
* commit '7449844f692baa1aa461c5174e09a1e4eff55217':
  Fix janky icon fade-in animation in Recents
 2013-04-08 23:13:21 -07:00
Michael Jurka
7449844f69 am 104ca45a: Merge "Fix janky icon fade-in animation in Recents" into jb-mr2-dev 
* commit '104ca45a046cf6f056d84799f6a161c8befe7522':
  Fix janky icon fade-in animation in Recents
 2013-04-08 23:10:14 -07:00
Michael Jurka
104ca45a04 Merge "Fix janky icon fade-in animation in Recents" into jb-mr2-dev 2013-04-09 06:04:36 +00:00
Dianne Hackborn
f1b782427f Kill processes when permissions are revoked. 
Some permissions are associated with gids, so we need to
kill any running processes if their permission is revoked.
We will do this for any permission being revoked, since
the association between gids and permissions can change
over time.

Change-Id: Ieb7408e032539c4f21eb089d65a7a7e6c289f010
 2013-04-08 22:28:59 -07:00
Ying Wang
b1026046c6 am d9574cb1: am cf5ccb8f: Fix tests build. 
* commit 'd9574cb12896ed639f1c220f646c2dc5e8017841':
  Fix tests build.
 2013-04-08 19:15:33 -07:00
Eric Rowe
675d389f6f am fa67c5ad: am 3c09715c: Merge "Change dropbox tag for native crashes." into jb-mr2-dev 
* commit 'fa67c5ada25643953144895f961c9ce0f8cc31e7':
  Change dropbox tag for native crashes.
 2013-04-08 19:15:19 -07:00
Jeff Brown
8140b05f1e am 9acc8c9c: am 97b968b6: Merge "Fix trackball interpretation of precision." into jb-mr2-dev 
* commit '9acc8c9c53a4d3adcf3e3f220ea5e4529c3e60a4':
  Fix trackball interpretation of precision.
 2013-04-08 19:15:13 -07:00
Jeff Brown
b437a79b05 resolved conflicts for merge of 21dffd5d to master 
Change-Id: I37c48dee471c9d43f19c1fe4a01f70db53e2441f
 2013-04-08 19:05:15 -07:00
Ying Wang
d9574cb128 am cf5ccb8f: Fix tests build. 
* commit 'cf5ccb8f81f038112e13ce2c9ff73602005595f7':
  Fix tests build.
 2013-04-08 19:05:04 -07:00
Ying Wang
cf5ccb8f81 Fix tests build. 
Change-Id: I24d65c18018a8d6df6fa3414306fc0d586d4cfa2
 2013-04-08 19:02:01 -07:00
Michael Jurka
e0523f7c80 Fix janky icon fade-in animation in Recents 
Change-Id: I15d2274add8903820dac3da0fa47c9e54f6ec97d
 2013-04-08 18:20:20 -07:00
Eric Rowe
fa67c5ada2 am 3c09715c: Merge "Change dropbox tag for native crashes." into jb-mr2-dev 
* commit '3c09715cedc737cc6e36c201d9f9188c3615e9a5':
  Change dropbox tag for native crashes.
 2013-04-08 17:15:33 -07:00
Eric Rowe
3c09715ced Merge "Change dropbox tag for native crashes." into jb-mr2-dev 2013-04-09 00:11:51 +00:00
Marco Nelissen
574215e1f3 am d563cede: am c4ad3cb0: Merge "Add support for common encryption" into jb-mr2-dev 
* commit 'd563cede5cf4ca2647dcf00775dd0ed1dd08e792':
  Add support for common encryption
 2013-04-08 17:06:03 -07:00
Kenny Root
c21e2cb672 am b3be67ce: am 0eee410e: Merge "Check outInfo is not null" into jb-mr2-dev 
* commit 'b3be67ce34966dfccfccf4918ee5c93c4971a6d0':
  Check outInfo is not null
 2013-04-08 17:05:50 -07:00