Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,778 Commits 3 Branches 0 Tags
7ee8002aabdf96ef8a2e018692489cd43902b169
Commit Graph

29057 Commits

Author SHA1 Message Date
Scott Kennedy
7ee8002aab resolved conflicts for merge of b5d6b3fe to master 
Change-Id: Ib7beb5c22fadd7aae5039d49a819fbc91d355b6b
 2013-04-03 11:15:50 -07:00
Scott Kennedy
b5d6b3fec0 am 688c3344: am 23eda7cd: am 76f9a0a6: am c318dbcf: am 2dd01a0b: am 555c82cd: am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev 
* commit '688c33448572fa3879b1486d8fa1bf16cd946211':
  docs: Typos and other fixes
 2013-04-03 09:42:06 -07:00
Scott Kennedy
688c334485 am 23eda7cd: am 76f9a0a6: am c318dbcf: am 2dd01a0b: am 555c82cd: am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev 
* commit '23eda7cd0a2b80bafcba7c24f49a73a2f11f782f':
  docs: Typos and other fixes
 2013-04-03 09:38:49 -07:00
Scott Kennedy
23eda7cd0a am 76f9a0a6: am c318dbcf: am 2dd01a0b: am 555c82cd: am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev 
* commit '76f9a0a6800d8a8945156a95dea79f16ec704b3d':
  docs: Typos and other fixes
 2013-04-03 09:35:18 -07:00
Scott Kennedy
76f9a0a680 am c318dbcf: am 2dd01a0b: am 555c82cd: am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev 
* commit 'c318dbcf358772ab53b0380edb3e487a773ad2d8':
  docs: Typos and other fixes
 2013-04-03 09:31:32 -07:00
Scott Kennedy
555c82cd43 am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev 
* commit 'f7c06ddbfc79921d389ed6699df17e54c428571e':
  docs: Typos and other fixes
 2013-04-03 09:20:38 -07:00
Scott Kennedy
f7c06ddbfc Merge "docs: Typos and other fixes" into jb-mr1-dev 2013-04-03 16:16:35 +00:00
Lorenzo Colitti
3131580086 am 92871140: am 6c2e8fb4: Merge "Fix LinkProperties\'s equals() method." into jb-mr2-dev 
* commit '92871140e2f667743212bdbe418aa833142b73bb':
  Fix LinkProperties's equals() method.
 2013-04-02 22:35:48 -07:00
Lorenzo Colitti
92871140e2 am 6c2e8fb4: Merge "Fix LinkProperties\'s equals() method." into jb-mr2-dev 
* commit '6c2e8fb4d530c5fb1352e8667449591b39d89c5a':
  Fix LinkProperties's equals() method.
 2013-04-02 22:32:34 -07:00
Lorenzo Colitti
6c2e8fb4d5 Merge "Fix LinkProperties's equals() method." into jb-mr2-dev 2013-04-03 05:28:52 +00:00
Jeff Brown
fc00755627 am 4c20e618: am a4ca8ea0: Fix reference cycle in InputEventReceiver and Sender. 
* commit '4c20e61808a75f217e99b589261821ca453cea1b':
  Fix reference cycle in InputEventReceiver and Sender.
 2013-04-02 20:08:01 -07:00
Jeff Brown
4c20e61808 am a4ca8ea0: Fix reference cycle in InputEventReceiver and Sender. 
* commit 'a4ca8ea0ad14c509d1ced46482e83c1b8a518982':
  Fix reference cycle in InputEventReceiver and Sender.
 2013-04-02 20:05:03 -07:00
Justin Koh
ab089d4870 am 9d4ed1ec: am ddd168d6: Merge "Add global key configuration file" into jb-mr2-dev 
* commit '9d4ed1ec62a392e4b73ab7d3cd548e09bc792ab2':
  Add global key configuration file
 2013-04-02 19:25:27 -07:00
Jeff Brown
a4ca8ea0ad Fix reference cycle in InputEventReceiver and Sender. 
If the receiver or sender was not properly disposed, then
the underlying input channel might be leaked because the
native peer was holding a strong reference to the object.

Switched to using a weak reference.

Also updated Binder to use a new helper created for this purpose.

Change-Id: I19680bf96d0548777bff02aa1d91874d1e8e41da
 2013-04-02 18:59:15 -07:00
Justin Koh
9d4ed1ec62 am ddd168d6: Merge "Add global key configuration file" into jb-mr2-dev 
* commit 'ddd168d65f0bc9644434d18dd82fe6c994670dba':
  Add global key configuration file
 2013-04-02 18:17:01 -07:00
Justin Koh
d378ad74c6 Add global key configuration file 
Add global key configuration file. A global key is one that is handled by
PhoneWindowManager before dispatching and sent to a given component via
broadcast instead of going to the foreground app.
Bug: 8510681

Change-Id: Ic6a8e559680d005613ed22874b27eb78bbfc4499
 2013-04-02 18:09:27 -07:00
Brian Colonna
c849fbcf3d resolved conflicts for merge of 5856ee4b to master 
Change-Id: I60ba85bc246b9cf25d467b2099535aad47f82ca7
 2013-04-02 17:16:55 -04:00
Brian Colonna
5856ee4bd6 am 1eccc0cf: Merge "FUL now restarts when flipping tablet 180 (bug 7484464)" into jb-mr2-dev 
* commit '1eccc0cf5f7f33203091c0b475a4ad91570c85cd':
  FUL now restarts when flipping tablet 180 (bug 7484464)
 2013-04-02 13:26:23 -07:00
Brian Colonna
1eccc0cf5f Merge "FUL now restarts when flipping tablet 180 (bug 7484464)" into jb-mr2-dev 2013-04-02 20:19:24 +00:00
Elliott Hughes
435d11205a am 11139563: am dbca824d: Merge "Add DateFormat.getBestDateTimePattern." into jb-mr2-dev 
* commit '1113956349e25bd081590842ec6f6b300765d786':
  Add DateFormat.getBestDateTimePattern.
 2013-04-02 12:25:35 -07:00
Elliott Hughes
1113956349 am dbca824d: Merge "Add DateFormat.getBestDateTimePattern." into jb-mr2-dev 
* commit 'dbca824dc00209c603a956f45bb684e57ee3e478':
  Add DateFormat.getBestDateTimePattern.
 2013-04-02 12:21:48 -07:00
Elliott Hughes
dbca824dc0 Merge "Add DateFormat.getBestDateTimePattern." into jb-mr2-dev 2013-04-02 19:16:17 +00:00
Elliott Hughes
031b581af2 Add DateFormat.getBestDateTimePattern. 
Bug: 8283323
Change-Id: Id8d94456b93555d799229b7dd88fcbcf5c6bf7ff
 2013-04-02 12:00:47 -07:00
Chet Haase
d4c5453464 am 7aab1134: am c99d3c1f: Stop jank from window animations overlapping activity animations 
* commit '7aab1134236a30aa2e595be55fcc7b5c90982413':
  Stop jank from window animations overlapping activity animations
 2013-04-02 11:03:16 -07:00
Chris Craik
92ce5e95b8 am bb3c5e18: am 94d6170b: Merge "Update view\'s alpha and layer docs" into jb-mr2-dev 
* commit 'bb3c5e184a41ec3ad7d11c3a0a66439edda4f74d':
  Update view's alpha and layer docs
 2013-04-02 11:03:09 -07:00
Jeff Brown
76703d8fe5 am 21b41af7: am d42ae93c: Merge "Make MessageQueue and Looper final." into jb-mr2-dev 
* commit '21b41af7ea418be8e0ec94800bb2d0cc12c4965e':
  Make MessageQueue and Looper final.
 2013-04-02 11:03:04 -07:00
Michael Wright
bc15cf55f5 am ef588f73: am 54531f81: Merge "Flush pending input events immediately upon channel dispose" into jb-mr2-dev 
* commit 'ef588f73cf9bf01a693f468f597239e27834c730':
  Flush pending input events immediately upon channel dispose
 2013-04-02 08:26:04 -07:00
Chet Haase
7aab113423 am c99d3c1f: Stop jank from window animations overlapping activity animations 
* commit 'c99d3c1fd618c1f64103b4f39dd95330309be5a3':
  Stop jank from window animations overlapping activity animations
 2013-04-02 08:24:48 -07:00
Chris Craik
bb3c5e184a am 94d6170b: Merge "Update view\'s alpha and layer docs" into jb-mr2-dev 
* commit '94d6170b67bcfb5dc5a0c988752d34e64a5f5272':
  Update view's alpha and layer docs
 2013-04-02 08:24:32 -07:00
Jeff Brown
21b41af7ea am d42ae93c: Merge "Make MessageQueue and Looper final." into jb-mr2-dev 
* commit 'd42ae93c44a28f63d8f266277644864bfd0f4a16':
  Make MessageQueue and Looper final.
 2013-04-02 08:24:15 -07:00
Michael Wright
ef588f73cf am 54531f81: Merge "Flush pending input events immediately upon channel dispose" into jb-mr2-dev 
* commit '54531f819567066fe4a5219eb445a453551be374':
  Flush pending input events immediately upon channel dispose
 2013-04-02 08:23:38 -07:00
Chet Haase
c99d3c1fd6 Stop jank from window animations overlapping activity animations 
Relaunching a running activity will sometimes cause animations in that
activity to run, causing jank due to too much happening (window animations
on that same window running at the same time).

An earlier fix pauses application rendering while window animations are running,
but only the first time the activity comes up. If the window is animated
after that (such as is the case with re-launching it while it is running
in the background), rendering, and therefore animations, happen as usual,
causing the jank.

The fix is to simply broaden the scope of when application rendering is
paused to include anytime the window is animating.

Issue #8472972 Make app animations play nice with window animations

Change-Id: I1dd8da039fcb4d1faf6c0811bae97ef2847deb84
 2013-04-02 07:30:52 -07:00
Lorenzo Colitti
213f98b6fe Fix LinkProperties's equals() method. 
LinkProperties's equals() method was broken by the addition of
stacked interfaces. The reason was that equals() was checking
the equality of mStackedInterfaces.keys(), which is just an
enumeration, instead of mStackedInterfaces.keySet(), which
actually contains the keys. The test was failing, but I didn't
notice.

Fix the bug and make the test check the objects more in depth
so it can give more detailed error messages when equals() fails.

Bug: 8276725
Change-Id: Ie990bd75f641c28e63e54d953dcd0f4de13f7c9f
 2013-04-02 10:08:59 +09:00
Chris Craik
94d6170b67 Merge "Update view's alpha and layer docs" into jb-mr2-dev 2013-04-02 01:04:30 +00:00
Chris Craik
16ecda5317 Update view's alpha and layer docs 
bug:8501661

Makes the performance issues and interaction with layer type/paint
more clear.

Additionally, corrects change from 47ab7d6612
to still allow displayList alpha to override layer paint

Change-Id: Ic94d75865700820489370461cd8ac9f9077a8d90
 2013-04-01 17:21:35 -07:00
Jeff Brown
d42ae93c44 Merge "Make MessageQueue and Looper final." into jb-mr2-dev 2013-04-01 23:39:11 +00:00
Jeff Brown
67fc67cf3e Make MessageQueue and Looper final. 
Applications already cannot subclass these classes because
their constructors are not visible.

Change-Id: Id979d86dd05f7bcc888fe4ea499ab9b95d3d5dde
 2013-04-01 14:27:57 -07:00
Michael Wright
54531f8195 Merge "Flush pending input events immediately upon channel dispose" into jb-mr2-dev 2013-04-01 21:20:16 +00:00
Michael Wright
ef17e8710e Flush pending input events immediately upon channel dispose 
Change-Id: I949326423f733376aa8d3121bfed24fd76ca0784
 2013-04-01 13:15:55 -07:00
Amith Yamasani
bb49e8573e resolved conflicts for merge of 15935aad to master 
Change-Id: I9664186a62cf7b11844c6a14967f5b8c2b67c289
 2013-03-30 19:26:37 -07:00
Amith Yamasani
15935aad3d am 42bc734b: Merge "Block access to accounts for limited users." into jb-mr2-dev 
* commit '42bc734b302f1fe68c031e013513535bed4c24f1':
  Block access to accounts for limited users.
 2013-03-30 18:34:57 -07:00
Amith Yamasani
42bc734b30 Merge "Block access to accounts for limited users." into jb-mr2-dev 2013-03-31 01:32:39 +00:00
Amith Yamasani
27db46850b Block access to accounts for limited users. 
Make sure that apps that have access to restricted accounts can see them.
If they don't have access, they shouldn't be able to add a new account either.
Show an error message in the account picker if the user/app is not authorized.

Change-Id: I117c0b14d7d06c5ac4e66506df156b174567f5f3
 2013-03-30 18:25:49 -07:00
Geremy Condra
1ad4ce693f am cac0e0b1: Merge "Add SELinux updater and Settings-based enforcement switch." into jb-mr2-dev 
* commit 'cac0e0b11ba3f9f73ddb0ab18e136d61f700c356':
  Add SELinux updater and Settings-based enforcement switch.
 2013-03-30 15:11:18 -07:00
Geremy Condra
cac0e0b11b Merge "Add SELinux updater and Settings-based enforcement switch." into jb-mr2-dev 2013-03-30 22:08:20 +00:00
Amith Yamasani
8d01846130 am 5c98b904: am 9e8ba8f2: Merge "Improve RestrictionEntry API" into jb-mr2-dev 
* commit '5c98b9046506cc69b261dd6ac2ae39b2de0afacb':
  Improve RestrictionEntry API
 2013-03-29 18:52:58 -07:00
Amith Yamasani
5c98b90465 am 9e8ba8f2: Merge "Improve RestrictionEntry API" into jb-mr2-dev 
* commit '9e8ba8f27316c793578e68fcc6632a6ea6240f4a':
  Improve RestrictionEntry API
 2013-03-29 18:51:14 -07:00
Amith Yamasani
9e8ba8f273 Merge "Improve RestrictionEntry API" into jb-mr2-dev 2013-03-30 01:47:33 +00:00
Fabrice Di Meglio
cfa775447e am 68951ee9: am 83390182: Merge "Optimize ViewGroup.MarginLayoutParams memory and fix ViewDebug" into jb-mr2-dev 
* commit '68951ee958e72319facc267289ca363622758e0a':
  Optimize ViewGroup.MarginLayoutParams memory and fix ViewDebug
 2013-03-29 18:02:42 -07:00
Fabrice Di Meglio
68951ee958 am 83390182: Merge "Optimize ViewGroup.MarginLayoutParams memory and fix ViewDebug" into jb-mr2-dev 
* commit '83390182bfe50a3611d78b57ab2f3a8558ede2aa':
  Optimize ViewGroup.MarginLayoutParams memory and fix ViewDebug
 2013-03-29 18:01:07 -07:00