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

101748 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
3d8e7cfa3a am b3a41d44: am 098b3ba5: Merge "fix JNI use of incStrong/decStrong" into jb-mr2-dev 
* commit 'b3a41d44274d8d7d6771a008c391dac48a8765c2':
  fix JNI use of incStrong/decStrong
 2013-03-07 17:34:46 +00:00
Mathias Agopian
b3a41d4427 am 098b3ba5: Merge "fix JNI use of incStrong/decStrong" into jb-mr2-dev 
* commit '098b3ba5ef6e472b419c83b5e1d7c79bce05f2f5':
  fix JNI use of incStrong/decStrong
 2013-03-07 17:30:59 +00:00
Mathias Agopian
098b3ba5ef Merge "fix JNI use of incStrong/decStrong" into jb-mr2-dev 2013-03-07 04:52:01 +00:00
Baligh Uddin
7f9c84e0b1 Merge "Import translations. DO NOT MERGE" 2013-03-07 04:22:02 +00:00
Baligh Uddin
65eb98ae85 am 8b0cdba3: (-s ours) am 7409c9d5: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '8b0cdba3d19a2cebc6809dded62f5951ecfe3a49':
  Import translations. DO NOT MERGE
 2013-03-07 03:06:19 +00:00
Baligh Uddin
8b0cdba3d1 am 7409c9d5: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '7409c9d5a2add03b330e2535c89324127f2b3fcb':
  Import translations. DO NOT MERGE
 2013-03-07 03:03:49 +00:00
Baligh Uddin
7409c9d5a2 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-03-07 02:59:20 +00:00
Craig Mautner
9eaab2ec07 Merge "Prepare ActivityManagerService for multiple stacks." 2013-03-07 02:01:03 +00:00
Jim Miller
d698b0f0e5 Merge "Fix keyguard listview widgets for secondary users" 2013-03-07 01:59:19 +00:00
Mathias Agopian
b1d90c8f60 fix JNI use of incStrong/decStrong 
Change-Id: Ia11b404dea483dc19bbc30f4d7bcff516655e180
 2013-03-06 17:48:20 -08:00
Santos Cordon
f9c4c610a3 am c6d1cba4: am e20891e4: Merge "Additional context for sip address types." into jb-mr2-dev 
* commit 'c6d1cba4f0e6091907742433e632a3f05d2820a7':
  Additional context for sip address types.
 2013-03-07 01:19:26 +00:00
Santos Cordon
c6d1cba4f0 am e20891e4: Merge "Additional context for sip address types." into jb-mr2-dev 
* commit 'e20891e4ccdbedc5af9cd94b2fc368dce43c96fb':
  Additional context for sip address types.
 2013-03-07 01:14:50 +00:00
Santos Cordon
e20891e4cc Merge "Additional context for sip address types." into jb-mr2-dev 2013-03-07 01:12:40 +00:00
Jim Miller
3e5105351d Fix keyguard listview widgets for secondary users 
This fixes a bug where secondary user widgets weren't being updated
properly because the system was checking for SYSTEM_UID which no
longer works with keyguard in a separate process.  The symptom was an
app with a listview, like Gmail, would always show an empty list for
secondary users.

Change-Id: I3749a7a0b39f1eb7922966af0fbdcefdd804e41e
 2013-03-06 17:01:35 -08:00
Jeff Sharkey
99438af892 am 73a3754c: am 4861966c: Merge "ArrayUtils.indexOf(), containsAll() with tests." into jb-mr2-dev 
* commit '73a3754c6766b7220878983317b3d56ce7fc6e58':
  ArrayUtils.indexOf(), containsAll() with tests.
 2013-03-07 00:45:14 +00:00
Jeff Sharkey
73a3754c67 am 4861966c: Merge "ArrayUtils.indexOf(), containsAll() with tests." into jb-mr2-dev 
* commit '4861966cb23e2800efaf74a4780d289e00513b12':
  ArrayUtils.indexOf(), containsAll() with tests.
 2013-03-07 00:43:28 +00:00
Jeff Sharkey
4861966cb2 Merge "ArrayUtils.indexOf(), containsAll() with tests." into jb-mr2-dev 2013-03-07 00:40:50 +00:00
Dianne Hackborn
32884c376f am 6fea1665: am 1ab64b81: Merge "Add new sample code for writing a ViewGroup." into jb-mr2-dev 
* commit '6fea1665a91dafa49b78d1c92c53bb0fa1736020':
  Add new sample code for writing a ViewGroup.
 2013-03-07 00:40:44 +00:00
Dianne Hackborn
6fea1665a9 am 1ab64b81: Merge "Add new sample code for writing a ViewGroup." into jb-mr2-dev 
* commit '1ab64b819ba3d4b974e63fcae5d21bb73ba5a6a6':
  Add new sample code for writing a ViewGroup.
 2013-03-07 00:38:44 +00:00
Dianne Hackborn
1ab64b819b Merge "Add new sample code for writing a ViewGroup." into jb-mr2-dev 2013-03-07 00:34:55 +00:00
Santos Cordon
a05dd8e5e2 Additional context for sip address types. 
bug: 7285478
Change-Id: I18eb050cbf54ae535b5403e927d352642d726d30
 2013-03-06 16:32:53 -08:00
Jeff Sharkey
94c91dca55 ArrayUtils.indexOf(), containsAll() with tests. 
Change-Id: I040164d4e45126e4a6c1df54bd114f47951da560
 2013-03-06 16:28:36 -08:00
Jeff Sharkey
07cd3f3f01 am 768c5c4d: am 18dd9b94: Merge "Use enabled/enabledSetting from PackageParser." into jb-mr2-dev 
* commit '768c5c4d9d736c55d7ef580142d602850f47a098':
  Use enabled/enabledSetting from PackageParser.
 2013-03-06 23:32:31 +00:00
Jeff Sharkey
768c5c4d9d am 18dd9b94: Merge "Use enabled/enabledSetting from PackageParser." into jb-mr2-dev 
* commit '18dd9b94150bf8960314aa52f2f05e31fd9a7432':
  Use enabled/enabledSetting from PackageParser.
 2013-03-06 23:31:00 +00:00
Jeff Sharkey
18dd9b9415 Merge "Use enabled/enabledSetting from PackageParser." into jb-mr2-dev 2013-03-06 23:24:56 +00:00
Jeff Sharkey
94d7ddb4b5 Use enabled/enabledSetting from PackageParser. 
PackageParser.updateApplicationInfo() has already interpreted the
various COMPONENT_ENABLED flags for us, no need to clobber them.

Bug: 8331767
Change-Id: If1363c5651a2f0326ee60e92517cfc0e6f256699
 2013-03-06 15:10:57 -08:00
Michael Jurka
d0da4c45f3 am 46900709: am 5b532abd: Merge "Fix bug where Recents wasn\'t always properly updated" into jb-mr2-dev 
* commit '469007092f4929e7813066e2b68ae4c489a1f176':
  Fix bug where Recents wasn't always properly updated
 2013-03-06 23:00:31 +00:00
Michael Jurka
469007092f am 5b532abd: Merge "Fix bug where Recents wasn\'t always properly updated" into jb-mr2-dev 
* commit '5b532abdc21eba53b41f50010ff773960ed53796':
  Fix bug where Recents wasn't always properly updated
 2013-03-06 22:57:59 +00:00
Michael Jurka
5b532abdc2 Merge "Fix bug where Recents wasn't always properly updated" into jb-mr2-dev 2013-03-06 22:52:39 +00:00
Jim Miller
a9e81064e9 Merge "Fix widget update issue" 2013-03-06 22:33:22 +00:00
Michael Jurka
0e7757b6a1 Fix bug where Recents wasn't always properly updated 
Also fix bug where icons were sometimes missing

Change-Id: I98fb30242e0f1bbe4f3088b350bd808cd9c3ae67
 2013-03-06 23:29:46 +01:00
Michael Jurka
a3bb886dde am 497c3aff: am 4aab3c8a: Merge "Fix Recents in RTL/landscape mode" into jb-mr2-dev 
* commit '497c3affe1b664a328e5895ab4d4cb0ffd871b43':
  Fix Recents in RTL/landscape mode
 2013-03-06 22:19:29 +00:00
Michael Jurka
497c3affe1 am 4aab3c8a: Merge "Fix Recents in RTL/landscape mode" into jb-mr2-dev 
* commit '4aab3c8a78b492a679cc29037b544b4a5c97cf72':
  Fix Recents in RTL/landscape mode
 2013-03-06 22:17:15 +00:00
Michael Jurka
4aab3c8a78 Merge "Fix Recents in RTL/landscape mode" into jb-mr2-dev 2013-03-06 22:11:58 +00:00
Craig Mautner
d2328958de Prepare ActivityManagerService for multiple stacks. 
- Replace mMainStack with mFocusedStack and mStacks.
- Remove stack from ActivityRecord.
- Add stack to TaskRecord.

Change-Id: I22e9ba34b12c2bd90806b14aafe063d5a2fe66ae
 2013-03-06 13:57:26 -08:00
Dianne Hackborn
44920907ce am 95529f73: am f6fcea60: Merge "Fix issue #8325007: EyeEm app crashes on launch- NPE at..." into jb-mr2-dev 
* commit '95529f730ccd7dfafb4bc2024aa156928db3c04c':
  Fix issue #8325007: EyeEm app crashes on launch- NPE at...
 2013-03-06 21:48:39 +00:00
Dianne Hackborn
7caab0ff2d Add new sample code for writing a ViewGroup. 
Change-Id: Id6714b062884c9ed60703e5c199f16683c00a800
 2013-03-06 13:47:04 -08:00
Dianne Hackborn
95529f730c am f6fcea60: Merge "Fix issue #8325007: EyeEm app crashes on launch- NPE at..." into jb-mr2-dev 
* commit 'f6fcea602750bbc0eb7d394f4daf3848ffaaed7d':
  Fix issue #8325007: EyeEm app crashes on launch- NPE at...
 2013-03-06 21:44:09 +00:00
Dianne Hackborn
f6fcea6027 Merge "Fix issue #8325007: EyeEm app crashes on launch- NPE at..." into jb-mr2-dev 2013-03-06 21:40:56 +00:00
Michael Jurka
237ebdf528 am e6052518: am 652b7915: Merge "Improve swipe performance in Recents" into jb-mr2-dev 
* commit 'e60525181d830b18f29c3cdf3bb77481a46aef0e':
  Improve swipe performance in Recents
 2013-03-06 21:05:26 +00:00
Michael Jurka
e9c90271ac Fix Recents in RTL/landscape mode 
The normal LTR Recents interface in landscape
actually scrolls/behaves like a RTL interface,
so we hardcode the layout to stay the same in both
modes

Change-Id: I57e5e76de3260c6de1dd9e939797b7e1c23cca03
 2013-03-06 22:04:05 +01:00
Michael Jurka
e60525181d am 652b7915: Merge "Improve swipe performance in Recents" into jb-mr2-dev 
* commit '652b79153f78033494bd6c77e3418cefff2ff48a':
  Improve swipe performance in Recents
 2013-03-06 21:03:10 +00:00
Michael Jurka
652b79153f Merge "Improve swipe performance in Recents" into jb-mr2-dev 2013-03-06 21:00:42 +00:00
Dianne Hackborn
474690caf8 Fix issue #8325007: EyeEm app crashes on launch- NPE at... 
...android.view.ViewGroup.measureChildWithMargins

The app is doing grungy stuff with trying to insert its own
views inside the window decor.  This new custom layout of the
action bar was assuming it would get fitSystemWindows() called
at which point it would retrieve all of its child views...  but
with the app doing this, it blocks the call down to
fitSystemWindows() and breaks us.  So we now make the layout
manager more robust and ensure it has retrieved its children
when measuring.

Also fix an issue where the xlarge layouts were not updated.

Change-Id: I6c69f26f26b59a6aa8fa1e5788288ffce0b490ca
 2013-03-06 11:33:26 -08:00
Craig Mautner
3f0bc9af04 am db6c556d: am cc947fdc: Merge "Add window leak check and possible recovery." into jb-mr2-dev 
* commit 'db6c556daea9fcf8aaeea8cacb5d8c29d0b406e7':
  Add window leak check and possible recovery.
 2013-03-06 18:46:21 +00:00
Craig Mautner
db6c556dae am cc947fdc: Merge "Add window leak check and possible recovery." into jb-mr2-dev 
* commit 'cc947fdc2decb83a70484bd0f831c58cc0346657':
  Add window leak check and possible recovery.
 2013-03-06 18:43:55 +00:00
Craig Mautner
cc947fdc2d Merge "Add window leak check and possible recovery." into jb-mr2-dev 2013-03-06 18:40:48 +00:00
John Spurlock
4a682c2c8f Merge "Quick typo fix to View.java docs." 2013-03-06 18:39:33 +00:00
Amith Yamasani
adb8e146a5 am 3eb3774f: am 67df64b3: Shared accounts and sharing of apps 
* commit '3eb3774f8e54a6f43dcf4f27e1b7a62676791ff6':
  Shared accounts and sharing of apps
 2013-03-06 18:37:32 +00:00
Amith Yamasani
3eb3774f8e am 67df64b3: Shared accounts and sharing of apps 
* commit '67df64b3a48a8157d08a98fa90135d0ac0ee621c':
  Shared accounts and sharing of apps
 2013-03-06 18:36:10 +00:00