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

218665 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Seigo Nonaka
f03d7994bd Merge "Reduce the number of TextAppearanceSpan objects for highlighting." 2015-09-30 04:39:26 +00:00
Deepanshu Gupta
cd4b26c8a9 am 3dde4493: am 4e27221d: Merge "Support databinding in listitem layouts." into mnc-ub-dev 
* commit '3dde44935df567f840de2600a3e408f9ba7c7b1f':
  Support databinding in listitem layouts.
 2015-09-30 00:56:57 +00:00
Deepanshu Gupta
3dde44935d am 4e27221d: Merge "Support databinding in listitem layouts." into mnc-ub-dev 
* commit '4e27221d49151ba91af59029659e666fa756b645':
  Support databinding in listitem layouts.
 2015-09-30 00:51:02 +00:00
Deepanshu Gupta
4e27221d49 Merge "Support databinding in listitem layouts." into mnc-ub-dev 2015-09-30 00:45:52 +00:00
Deepanshu Gupta
e91096c03d Support databinding in listitem layouts. 
Add a wrapper around the PullParser to support stripping out databinding
parts.

Bug: http://b.android.com/187428
Change-Id: I88080d8f4108cb5ae27a137ad20c5dd7d516f3ea
 2015-09-29 17:07:53 -07:00
Adam Lesinski
eda63f4bf9 am 67ee88e8: am 8b7beaec: am 8197e2de: am ffc6ce00: Merge "Fix asymmetry in parceling/unparceling code for BatteryStats summary" into mnc-dr-dev 
* commit '67ee88e8ad19f0dc67add174903f24a7c479e74f':
  Fix asymmetry in parceling/unparceling code for BatteryStats summary
 2015-09-29 23:51:23 +00:00
Adam Lesinski
67ee88e8ad am 8b7beaec: am 8197e2de: am ffc6ce00: Merge "Fix asymmetry in parceling/unparceling code for BatteryStats summary" into mnc-dr-dev 
* commit '8b7beaecffde9a98b50cd33be893b7944f2ab271':
  Fix asymmetry in parceling/unparceling code for BatteryStats summary
 2015-09-29 23:45:28 +00:00
Adam Lesinski
8b7beaecff am 8197e2de: am ffc6ce00: Merge "Fix asymmetry in parceling/unparceling code for BatteryStats summary" into mnc-dr-dev 
* commit '8197e2de06bb96b0076469528a44b36a080ec9e1':
  Fix asymmetry in parceling/unparceling code for BatteryStats summary
 2015-09-29 23:39:08 +00:00
Filip Gruszczynski
0daf2102a2 Fix leaking the first activity while preserving windows. 
This is achieved by not having the decor view hold onto the activity
context. Instead, we are wrapping application context, so that we can
have theme support and also have a special instance of window manager
that is aware of the phone window (the same way as activity do).

This reverts commit a5ffea3b7d323cb57c0f9872468dd5c2e2ec66bb.

Change-Id: I924f4c7ef8f0d20e9174bd7b3e00ec00b44443b9
 2015-09-29 16:31:40 -07:00
Adam Lesinski
8197e2de06 am ffc6ce00: Merge "Fix asymmetry in parceling/unparceling code for BatteryStats summary" into mnc-dr-dev 
* commit 'ffc6ce000568c08a50f7b538bd4cd7729e64c229':
  Fix asymmetry in parceling/unparceling code for BatteryStats summary
 2015-09-29 23:30:27 +00:00
Adam Lesinski
ffc6ce0005 Merge "Fix asymmetry in parceling/unparceling code for BatteryStats summary" into mnc-dr-dev 2015-09-29 23:22:59 +00:00
Winson Chung
8aefdb4881 Merge "Update task bounds for recents enter animation." 2015-09-29 22:58:01 +00:00
Keisuke Kuroyanagi
2c53a07597 Merge "Consolidate native methods for text measurement." 2015-09-29 21:31:56 +00:00
Chong Zhang
fdb5d2f7ce Merge "Carry over app token when preserving window" 2015-09-29 21:11:36 +00:00
Chong Zhang
a8be1b99ec Carry over app token when preserving window 
Otherwise the token in the window's attr will be null after relaunch.
When this attr is updated with WindowManagerGlobal, setStoppedState()
will no longer find the view from the token.

bug: 24404382
Change-Id: Ib6935b03346a84dd023e224f72896041fda9dcd5
 2015-09-29 13:58:46 -07:00
Keisuke Kuroyanagi
536afe6ef7 Consolidate native methods for text measurement. 
Bug: 24505153

Change-Id: I6a00b0516442f7d6108ed0598516365310bd85e8
 2015-09-29 13:52:45 -07:00
Winson
ec417e4cc0 Update task bounds for recents enter animation. 
- Follow up to ag/778718, with the resources split up, we can now update
  the task bounds before starting recents.
- Also removing the multi-window check for transitions in/out of recents

Change-Id: Id4a6d4cfa9d98ca3ecf5f237573bf240f232de54
 2015-09-29 13:15:24 -07:00
Keisuke Kuroyanagi
57bbbaca0b Merge "Add tests for Paint#getTextRunAdvances" 2015-09-29 20:07:25 +00:00
Keisuke Kuroyanagi
2779b5978f Add tests for Paint#getTextRunAdvances 
Bug: 24308179
Change-Id: Ic979e67c10fb18c1333963d8b27352968977f28f
 2015-09-29 12:37:26 -07:00
Abodunrinwa Toki
66e47b6aa1 Merge "FloatingToolbarEspressoUtils + more TextView selection by touch tests" 2015-09-29 18:44:41 +00:00
Wale Ogunwale
e5ec210bb1 Merge "Inform activity manager of stack/task rotation bounds changes in WM" 2015-09-29 18:14:08 +00:00
Winson Chung
8c8db072b5 Merge "Moving resources out of ResourceConfiguration." 2015-09-29 17:06:54 +00:00
Filip Gruszczynski
23c0cc974f Merge "Refactoring: create method for marking display as needing layout." 2015-09-29 16:50:30 +00:00
Filip Gruszczynski
e92179d676 Refactoring: create method for marking display as needing layout. 
Change-Id: Ib040d053bf5011587d4383e89c6206a783387b72
 2015-09-29 09:49:57 -07:00
Alan Viverette
7141cba640 Merge "Clear stack trace from re-thrown inflater exceptions" 2015-09-29 16:25:42 +00:00
Alan Viverette
9dccff0878 Merge "Unhide PopupWindow.getMaxAvailableHeight(View, int, boolean)" 2015-09-29 16:24:42 +00:00
Baligh Uddin
615480f079 am 8c30514c: (-s ours) am d412cc05: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '8c30514c0edd3ba244d842f11e2887d27dceaa95':
  Import translations. DO NOT MERGE
 2015-09-29 15:04:11 +00:00
Baligh Uddin
1910bc6d9b am 981d8118: (-s ours) am 756bd429: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '981d81180e7fada8638253f0b2750ebb04fe434b':
  Import translations. DO NOT MERGE
 2015-09-29 15:04:00 +00:00
Baligh Uddin
a8862962d6 am 9dd38f3f: (-s ours) am 6f2bb3a3: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '9dd38f3f12e84399ba3c901ca94569db81a26570':
  Import translations. DO NOT MERGE
 2015-09-29 15:03:33 +00:00
Baligh Uddin
b0bdf697ca am 40359e03: (-s ours) am ae442baf: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '40359e0322822cab3b6a00f3ce30a3cf0e7d7a6f':
  Import translations. DO NOT MERGE
 2015-09-29 15:03:26 +00:00
Baligh Uddin
b0697e2ae1 am e3e11d6d: (-s ours) am e2c9b91f: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit 'e3e11d6dac4b0ac43a9da028d1c0759081cbd425':
  Import translations. DO NOT MERGE
 2015-09-29 15:03:18 +00:00
Baligh Uddin
8c30514c0e am d412cc05: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit 'd412cc0584143fa72e044b57c7ea377626a169ee':
  Import translations. DO NOT MERGE
 2015-09-29 14:57:48 +00:00
Baligh Uddin
981d81180e am 756bd429: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '756bd429bd6cf2d23e7132de09e61953cb7abc47':
  Import translations. DO NOT MERGE
 2015-09-29 14:57:42 +00:00
Baligh Uddin
4023373962 am 5ca3191a: (-s ours) am 755e95a4: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '5ca3191a30430ffd3b86cee9c044bd93536aa0cb':
  Import translations. DO NOT MERGE
 2015-09-29 14:52:06 +00:00
Baligh Uddin
4d6e75cbfd am 22a0c0e3: (-s ours) am 0fb5f9f3: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '22a0c0e3dc4198acab5828687a306d291288ad25':
  Import translations. DO NOT MERGE
 2015-09-29 14:51:59 +00:00
Baligh Uddin
cd3b1d77c5 am 9b552e34: (-s ours) am 0d8e091e: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '9b552e34004747166ad3d0f0789fb54f3a7f3094':
  Import translations. DO NOT MERGE
 2015-09-29 14:51:52 +00:00
Baligh Uddin
52520375ff am dbb9f370: (-s ours) am 0010f09a: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit 'dbb9f370b2ebc5f1f0276fd0af2f4bd93ab25594':
  Import translations. DO NOT MERGE
 2015-09-29 14:51:43 +00:00
Baligh Uddin
6fdb924cbe am 514650d8: (-s ours) am 67162a22: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '514650d8a6283694e6050b5aca69cd543e1dfa06':
  Import translations. DO NOT MERGE
 2015-09-29 14:51:35 +00:00
Baligh Uddin
eee7532552 am 89176d5d: (-s ours) am 19efc9e5: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '89176d5d00efa49c2a25e6bd2280408fd94d0280':
  Import translations. DO NOT MERGE
 2015-09-29 14:51:27 +00:00
Baligh Uddin
bb431e7441 am ab38b8e5: (-s ours) am 42e73a82: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit 'ab38b8e5ea4149dcc8447f90dcaf6d5c250da416':
  Import translations. DO NOT MERGE
 2015-09-29 14:51:19 +00:00
Baligh Uddin
9dd38f3f12 am 6f2bb3a3: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '6f2bb3a3c0697cbff6cf3b3ffde0c06cd911b9a9':
  Import translations. DO NOT MERGE
 2015-09-29 14:50:06 +00:00
Baligh Uddin
40359e0322 am ae442baf: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit 'ae442bafad49c8fa889b41771b0a8a505a427988':
  Import translations. DO NOT MERGE
 2015-09-29 14:49:59 +00:00
Baligh Uddin
e3e11d6dac am e2c9b91f: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit 'e2c9b91f53dc17ea62f5fa5ac9be1f4fff91203b':
  Import translations. DO NOT MERGE
 2015-09-29 14:49:53 +00:00
Baligh Uddin
d412cc0584 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-09-29 14:47:24 +00:00
Baligh Uddin
756bd429bd Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-09-29 14:47:22 +00:00
Baligh Uddin
5ca3191a30 am 755e95a4: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '755e95a463559475a60c6360768175ec844104ec':
  Import translations. DO NOT MERGE
 2015-09-29 14:43:06 +00:00
Baligh Uddin
22a0c0e3dc am 0fb5f9f3: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '0fb5f9f337292bd7ac4e380be72ffbaf9dccf51b':
  Import translations. DO NOT MERGE
 2015-09-29 14:42:58 +00:00
Baligh Uddin
9b552e3400 am 0d8e091e: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '0d8e091ee615fd8580d52e238070e26c3b41c594':
  Import translations. DO NOT MERGE
 2015-09-29 14:42:52 +00:00
Baligh Uddin
dbb9f370b2 am 0010f09a: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '0010f09a52532244939221392e8bf649cf0794ed':
  Import translations. DO NOT MERGE
 2015-09-29 14:42:45 +00:00
Baligh Uddin
514650d8a6 am 67162a22: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '67162a220cd4b7272b8b65f42f633b8a8065d185':
  Import translations. DO NOT MERGE
 2015-09-29 14:42:40 +00:00