OSDN Git Service
Jorim Jaggi [Fri, 5 Jun 2015 22:09:15 +0000 (22:09 +0000)]
am
c554b77b: Skip first frame for app transitions when possible
* commit '
c554b77b7392b97e0f455d8276b739e16147d6df':
Skip first frame for app transitions when possible
Jorim Jaggi [Thu, 4 Jun 2015 23:07:57 +0000 (16:07 -0700)]
Skip first frame for app transitions when possible
In most of our standard app transitions, the first frame of a
transition results in the same contents on the screen. This is
inefficient, as we can directly skip to the second frame of the
transition, introduce no jank, but execute the transition 16ms
faster.
Change-Id: If58337eae5558eae3acced691ae01c769f0ec2b9
Wei Wang [Fri, 5 Jun 2015 21:44:57 +0000 (21:44 +0000)]
am
a73c8b6f: Merge "add gps gid to system_server" into mnc-dev
* commit '
a73c8b6fbf9ef2091db7300d0f290335024e4af5':
add gps gid to system_server
Wei Wang [Fri, 5 Jun 2015 21:34:00 +0000 (21:34 +0000)]
Merge "add gps gid to system_server" into mnc-dev
Makoto Onuki [Fri, 5 Jun 2015 21:32:49 +0000 (21:32 +0000)]
am
fba7f5d7: Merge "Fix crash on simplified Chinese." into mnc-dev
* commit '
fba7f5d73cce893860faa3af9df7b4099a8565a1':
Fix crash on simplified Chinese.
Kevin Tang [Tue, 23 Jul 2013 17:16:48 +0000 (10:16 -0700)]
add gps gid to system_server
system_server hosts gps service, it should pocess gps
gid, so it can communicate with native gps daemons.
Change-Id: I59d7e99ec996891b19fa15a3ed66e055e6bccad8
Makoto Onuki [Fri, 5 Jun 2015 21:18:16 +0000 (21:18 +0000)]
Merge "Fix crash on simplified Chinese." into mnc-dev
Jorim Jaggi [Fri, 5 Jun 2015 20:29:19 +0000 (20:29 +0000)]
am
537bb5fc: Fix vibration for assist gesture
* commit '
537bb5fce785c3433540e047c0ccaae3b286f55e':
Fix vibration for assist gesture
Jorim Jaggi [Fri, 5 Jun 2015 20:29:13 +0000 (20:29 +0000)]
am
3bb96c7b: Merge "Refinements for app transitions" into mnc-dev
* commit '
3bb96c7b3bbaa54f584ffff515f348178c79825e':
Refinements for app transitions
Jorim Jaggi [Fri, 5 Jun 2015 00:38:20 +0000 (17:38 -0700)]
Fix vibration for assist gesture
Bug:
21549531
Change-Id: I038dd29228646ce6d08da8543c59823cfbb21167
Jorim Jaggi [Fri, 5 Jun 2015 20:19:35 +0000 (20:19 +0000)]
Merge "Refinements for app transitions" into mnc-dev
Chris Wren [Fri, 5 Jun 2015 20:16:01 +0000 (20:16 +0000)]
am
dfa4af2d: Merge "remove obsolete notification visibility log" into mnc-dev
* commit '
dfa4af2dfafa6c99525ff5af8012f80dadb46e0a':
remove obsolete notification visibility log
Adam Powell [Fri, 5 Jun 2015 20:15:56 +0000 (20:15 +0000)]
am
cedc7b3b: Merge "Use real rounding in ImageView bounds configuration" into mnc-dev
* commit '
cedc7b3ba4449da497f9e81c66ff7700c2a364fc':
Use real rounding in ImageView bounds configuration
Chris Wren [Fri, 5 Jun 2015 20:13:46 +0000 (20:13 +0000)]
Merge "remove obsolete notification visibility log" into mnc-dev
Chris Wren [Fri, 5 Jun 2015 20:12:18 +0000 (16:12 -0400)]
remove obsolete notification visibility log
Bug:
21248682
Change-Id: I8656a924514dd01ebc003f3cc81b1a9316919321
Adam Powell [Fri, 5 Jun 2015 20:04:00 +0000 (20:04 +0000)]
Merge "Use real rounding in ImageView bounds configuration" into mnc-dev
Amith Yamasani [Fri, 5 Jun 2015 18:46:19 +0000 (18:46 +0000)]
am
8fa24e91: Merge "Fix permission check in DPM.getPermissionGrantState" into mnc-dev
* commit '
8fa24e91c4dbe8a6533e99eeea4d8b200437d92a':
Fix permission check in DPM.getPermissionGrantState
Jorim Jaggi [Wed, 3 Jun 2015 00:07:39 +0000 (17:07 -0700)]
Refinements for app transitions
- Use refined interpolator for most of the transitions which respond
to touch faster than a normal fast_out_slow_in interpolator.
- Tune clip reveal animation: Get rid of horizontal movement, only do
slight vertical movement, and make horizontal reveal animation faster
so there is a more staggered animation to resemble an opening paper
Change-Id: Id94328906f9b194fb97d702e9b102c7aeef96bb8
Amith Yamasani [Fri, 5 Jun 2015 18:36:06 +0000 (18:36 +0000)]
Merge "Fix permission check in DPM.getPermissionGrantState" into mnc-dev
Amit Mahajan [Fri, 5 Jun 2015 18:32:41 +0000 (18:32 +0000)]
am
48cf298c: Merge "Change to hide BEARER_BITMASK." into mnc-dev
* commit '
48cf298cb8ded48dbec8e977412815e61953b74f':
Change to hide BEARER_BITMASK.
Chris Wren [Fri, 5 Jun 2015 18:32:37 +0000 (18:32 +0000)]
am
b1e0438c: Merge "add a log for notification alerts." into mnc-dev
* commit '
b1e0438ce316c95df2f08864f0c773d46f3f5e51':
add a log for notification alerts.
Amit Mahajan [Fri, 5 Jun 2015 18:24:03 +0000 (18:24 +0000)]
Merge "Change to hide BEARER_BITMASK." into mnc-dev
Chris Wren [Fri, 5 Jun 2015 18:22:20 +0000 (18:22 +0000)]
Merge "add a log for notification alerts." into mnc-dev
Jorim Jaggi [Fri, 5 Jun 2015 18:19:59 +0000 (18:19 +0000)]
am
853cbe38: Don\'t play lock sound when just resetting Keyguard
* commit '
853cbe38c9aa80671a2e7e616f48a6160c722eea':
Don't play lock sound when just resetting Keyguard
Jae Seo [Fri, 5 Jun 2015 18:19:54 +0000 (18:19 +0000)]
am
5f185270: Merge "TIF: Add more explanation for notifyChannelRetuned" into mnc-dev
* commit '
5f185270375e55a53ddb57982827ec0ac3edcf85':
TIF: Add more explanation for notifyChannelRetuned
Jorim Jaggi [Thu, 4 Jun 2015 23:31:54 +0000 (16:31 -0700)]
Don't play lock sound when just resetting Keyguard
Bug:
21595440
Change-Id: I9bd470d051f4851dcde83099f1ba1f0a9bae429a
Jae Seo [Fri, 5 Jun 2015 18:06:43 +0000 (18:06 +0000)]
am
c3426128: Merge "TIF: Remove unused imports" into mnc-dev
* commit '
c3426128fe2e263140f6977a0f28ba5bd3a7d906':
TIF: Remove unused imports
Jae Seo [Fri, 5 Jun 2015 18:05:32 +0000 (18:05 +0000)]
Merge "TIF: Add more explanation for notifyChannelRetuned" into mnc-dev
Jae Seo [Fri, 5 Jun 2015 17:58:26 +0000 (17:58 +0000)]
Merge "TIF: Remove unused imports" into mnc-dev
Jae Seo [Fri, 5 Jun 2015 17:51:52 +0000 (10:51 -0700)]
TIF: Remove unused imports
Change-Id: I1419a8e44d82fa009ccd6170d9048c3e24f51a2b
Chris Wren [Fri, 5 Jun 2015 15:23:44 +0000 (11:23 -0400)]
add a log for notification alerts.
Bug:
21242827
Change-Id: I1b8beee5cc12a9cd23e81554f7f2236ddc29e2b6
Makoto Onuki [Thu, 4 Jun 2015 23:38:48 +0000 (16:38 -0700)]
Fix crash on simplified Chinese.
They use the standard A/B sizes in China too.
Bug
20340812
Change-Id: Ia0842f8ddbdcb4cb2738b746509c60de25b64966
Alan Viverette [Fri, 5 Jun 2015 17:39:49 +0000 (17:39 +0000)]
am
4034e0ec: Merge "Fix inverse subhead color" into mnc-dev
* commit '
4034e0ecc30f0c198e308cd6c7b7eb121b9f9c2b':
Fix inverse subhead color
Jae Seo [Fri, 5 Jun 2015 17:34:20 +0000 (10:34 -0700)]
TIF: Add more explanation for notifyChannelRetuned
Bug:
21277081
Change-Id: Ia4de27bc0ecdf49bcad83cfcd396e8d55dc8343a
Alan Viverette [Fri, 5 Jun 2015 17:29:39 +0000 (17:29 +0000)]
Merge "Fix inverse subhead color" into mnc-dev
Alan Viverette [Fri, 5 Jun 2015 17:27:24 +0000 (17:27 +0000)]
am
a06b41b0: Merge "Avoid NPE when drawable fails to load" into mnc-dev
* commit '
a06b41b06e5bbcf5bf02741a765ebad5367c14de':
Avoid NPE when drawable fails to load
Alan Viverette [Fri, 5 Jun 2015 17:27:18 +0000 (17:27 +0000)]
am
42cc892b: Merge "Account for margins in ScrollView onMeasure() when filling viewport" into mnc-dev
* commit '
42cc892be135ed5be6f98f5f70bb6739bfaecaad':
Account for margins in ScrollView onMeasure() when filling viewport
Alan Viverette [Fri, 5 Jun 2015 17:26:03 +0000 (10:26 -0700)]
Fix inverse subhead color
Bug:
21650211
Change-Id: Ie1b8ecff4ff0c6b0e6e9b321c76cbb56c277e264
Alan Viverette [Fri, 5 Jun 2015 17:19:30 +0000 (17:19 +0000)]
Merge "Avoid NPE when drawable fails to load" into mnc-dev
Alan Viverette [Fri, 5 Jun 2015 17:18:45 +0000 (17:18 +0000)]
Merge "Account for margins in ScrollView onMeasure() when filling viewport" into mnc-dev
Alan Viverette [Fri, 5 Jun 2015 17:17:21 +0000 (10:17 -0700)]
Avoid NPE when drawable fails to load
Bug:
17760671
Change-Id: I99364e915e318b3e49fc758811784939a937de7c
Filip Gruszczynski [Fri, 5 Jun 2015 17:09:20 +0000 (17:09 +0000)]
am
eb974d5a: Merge "resolved conflicts for merge of
f6a04305 to mnc-dev" into mnc-dev
* commit '
eb974d5ac4b8733e4788066ec9ac6cf2bfb75c9b':
More inclusive rules for using outsets.
Filip Gruszczynski [Fri, 5 Jun 2015 16:59:44 +0000 (16:59 +0000)]
Merge "resolved conflicts for merge of
f6a04305 to mnc-dev" into mnc-dev
ztenghui [Fri, 5 Jun 2015 16:51:05 +0000 (16:51 +0000)]
am
e1352de6: Merge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev
* commit '
e1352de673423264c00c71c0ec1597bbdad6fd03':
Setup the animation callback for AnimatedVectorDrawable
Filip Gruszczynski [Fri, 5 Jun 2015 16:43:06 +0000 (09:43 -0700)]
resolved conflicts for merge of
f6a04305 to mnc-dev
Change-Id: I92e666bfd6d8ad051bdee7dce5712b9cb8e6a01d
ztenghui [Fri, 5 Jun 2015 16:37:09 +0000 (16:37 +0000)]
Merge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev
Clara Bayarri [Fri, 5 Jun 2015 16:31:57 +0000 (16:31 +0000)]
am
3e85c1ed: Merge "Fix Select All should not be shown when everything is already selected" into mnc-dev
* commit '
3e85c1ed0cce70164dfe6f8ffa4bf3695c4ce0ba':
Fix Select All should not be shown when everything is already selected
Clara Bayarri [Fri, 5 Jun 2015 16:19:29 +0000 (16:19 +0000)]
Merge "Fix Select All should not be shown when everything is already selected" into mnc-dev
Mady Mellor [Fri, 5 Jun 2015 16:01:06 +0000 (16:01 +0000)]
am
0f2f9f7a: Merge "Stylus scale - API review feedback" into mnc-dev
* commit '
0f2f9f7a51a43ef8ca1d977f62cf649d08d6ec84':
Stylus scale - API review feedback
Adam Powell [Thu, 4 Jun 2015 19:56:00 +0000 (12:56 -0700)]
Use real rounding in ImageView bounds configuration
While a useful tactic in previous years, the (int) (float + 0.5f)
trick is inaccurate in some cases. Tradeoffs have changed; do the real
thing now.
Bug
20145160
Change-Id: I8af31bcb1945dc113fd36e094f5970ebd4ec0304
Mady Mellor [Fri, 5 Jun 2015 15:50:48 +0000 (15:50 +0000)]
Merge "Stylus scale - API review feedback" into mnc-dev
Chet Haase [Fri, 5 Jun 2015 14:55:27 +0000 (14:55 +0000)]
am
e790c977: Hide View.getBackgroundColor() prior to removal
* commit '
e790c97787dbc05930ad0c4a708fad7cd7d3f2b9':
Hide View.getBackgroundColor() prior to removal
Chet Haase [Thu, 4 Jun 2015 21:01:29 +0000 (14:01 -0700)]
Hide View.getBackgroundColor() prior to removal
Issue #
21572678 API Review: android.view.View.getBackgroundColor()
Change-Id: Ia4fa9e207db3af6e076581bf23747eba6e56bb69
Jason Monk [Fri, 5 Jun 2015 14:31:57 +0000 (14:31 +0000)]
am
44fdcf26: Merge "Update no wifi networks string" into mnc-dev
* commit '
44fdcf26421c4c2a59888739fa003a14e09e8391':
Update no wifi networks string
Jason Monk [Fri, 5 Jun 2015 14:22:15 +0000 (14:22 +0000)]
Merge "Update no wifi networks string" into mnc-dev
Jason Monk [Fri, 5 Jun 2015 14:15:02 +0000 (10:15 -0400)]
Update no wifi networks string
Bug:
21530009
Change-Id: I910b2c062252c69f71e29744f6029c6e2557947d
Selim Cinek [Fri, 5 Jun 2015 13:36:27 +0000 (13:36 +0000)]
am
e067ff43: Merge "Removed Log message when expanding from HUN" into mnc-dev
* commit '
e067ff4357f0990cc96996a50b24e41c94c5d287':
Removed Log message when expanding from HUN
Selim Cinek [Fri, 5 Jun 2015 13:36:19 +0000 (13:36 +0000)]
am
1ceee65c: Merge "Removed the arrow from the hint animation" into mnc-dev
* commit '
1ceee65c20426ee4da721ea8c21fe62c66c718ed':
Removed the arrow from the hint animation
Selim Cinek [Fri, 5 Jun 2015 13:36:02 +0000 (13:36 +0000)]
am
c699b871: Merge "Fixed a bug with HUNS and dreams" into mnc-dev
* commit '
c699b8713080e73be7e479530ea38bf06d0882bb':
Fixed a bug with HUNS and dreams
Selim Cinek [Fri, 5 Jun 2015 13:29:34 +0000 (13:29 +0000)]
Merge "Removed Log message when expanding from HUN" into mnc-dev
Selim Cinek [Fri, 5 Jun 2015 13:28:55 +0000 (13:28 +0000)]
Merge "Removed the arrow from the hint animation" into mnc-dev
Selim Cinek [Fri, 5 Jun 2015 13:27:47 +0000 (13:27 +0000)]
Merge "Fixed a bug with HUNS and dreams" into mnc-dev
Zoltan Szatmary-Ban [Fri, 5 Jun 2015 10:07:30 +0000 (10:07 +0000)]
am
c92550e4: Merge "Replace renamed reference to NetworkStats in javadoc" into mnc-dev
* commit '
c92550e4b44da843a530dcde0ed26f221d3df0fc':
Replace renamed reference to NetworkStats in javadoc
Zoltan Szatmary-Ban [Fri, 5 Jun 2015 09:59:01 +0000 (09:59 +0000)]
Merge "Replace renamed reference to NetworkStats in javadoc" into mnc-dev
Lorenzo Colitti [Fri, 5 Jun 2015 08:02:55 +0000 (08:02 +0000)]
am
a34af2c0: Merge "Remove "returning Blocked NetworkInfo" logspam." into mnc-dev
* commit '
a34af2c0d7bbce6469b0c6ab578f6e2c9cd38cfb':
Remove "returning Blocked NetworkInfo" logspam.
Lorenzo Colitti [Fri, 5 Jun 2015 07:50:41 +0000 (07:50 +0000)]
Merge "Remove "returning Blocked NetworkInfo" logspam." into mnc-dev
Zhijun He [Fri, 5 Jun 2015 03:44:26 +0000 (03:44 +0000)]
am
16ed7e70: Merge "Camera2: fix doc build" into mnc-dev
* commit '
16ed7e70c869e12eae4721d6b4380c05c3423c78':
Camera2: fix doc build
Zhijun He [Fri, 5 Jun 2015 03:33:58 +0000 (03:33 +0000)]
Merge "Camera2: fix doc build" into mnc-dev
Zhijun He [Fri, 5 Jun 2015 03:21:23 +0000 (20:21 -0700)]
Camera2: fix doc build
Bug:
21645842
Change-Id: Ibd4ce455d9906da858b98f17fd7859016c1730c3
Abodunrinwa Toki [Fri, 5 Jun 2015 03:18:50 +0000 (03:18 +0000)]
am
4741f6a4: Merge "TextView: Make sure the contentRect is within visibile bounds." into mnc-dev
* commit '
4741f6a4c7c7d705d6b7907798a3bb89b2501e9b':
TextView: Make sure the contentRect is within visibile bounds.
Abodunrinwa Toki [Fri, 5 Jun 2015 03:08:08 +0000 (03:08 +0000)]
Merge "TextView: Make sure the contentRect is within visibile bounds." into mnc-dev
Johnson Hsieh [Fri, 5 Jun 2015 03:07:42 +0000 (03:07 +0000)]
am
997f3cca: Merge "Fix build: documentation error in AlarmClock.java." into mnc-dev
* commit '
997f3ccad33394fabe62a6a388e701e07a52e408':
Fix build: documentation error in AlarmClock.java.
Johnson Hsieh [Fri, 5 Jun 2015 02:58:40 +0000 (02:58 +0000)]
Merge "Fix build: documentation error in AlarmClock.java." into mnc-dev
Johnson Hsieh [Fri, 5 Jun 2015 02:51:27 +0000 (19:51 -0700)]
Fix build: documentation error in AlarmClock.java.
Change-Id: I3f64df1857c516d4c6a4ed56094a27f489eddef3
John Reck [Fri, 5 Jun 2015 02:40:43 +0000 (02:40 +0000)]
am
30ff6523: am
06ae68aa: am
902ec1c7: Merge "Fix framestats docs ordering" into mnc-preview-docs
* commit '
30ff6523a791dc66b9c93f1cb7822071c20da454':
Fix framestats docs ordering
David Friedman [Fri, 5 Jun 2015 02:35:19 +0000 (02:35 +0000)]
am
fe216bd2: am
cae82287: am
6bffab80: Merge "Docs: Fixes several typos on Android Studio index.html page." into mnc-preview-docs
* commit '
fe216bd25b09c29530326b36f6edfbace489da44':
Docs: Fixes several typos on Android Studio index.html page.
Dirk Dougherty [Fri, 5 Jun 2015 02:35:14 +0000 (02:35 +0000)]
am
4a08d6f0: am
392f5321: am
5c117ae1: Merge "Fix dependency specs for data binding." into mnc-preview-docs
* commit '
4a08d6f04248ef3ad7b15077d09fee25f928f085':
Fix dependency specs for data binding.
Filip Gruszczynski [Fri, 5 Jun 2015 02:35:09 +0000 (02:35 +0000)]
am
43c4cd1c: am
93634166: am
d88e4d50: Merge "ActivityView: set surface on a background thread." into cw-d-mr1-dev
* commit '
43c4cd1c82eab55decd88816a505ed102b79fb81':
ActivityView: set surface on a background thread.
Chris Craik [Fri, 5 Jun 2015 02:35:04 +0000 (02:35 +0000)]
am
44dc1667: am
78ab4c38: am
6042f351: Merge "Rework systrace analysis documentation" into mnc-preview-docs
* commit '
44dc1667eb186eed6374b3119c1c2c6ac14b7e43':
Rework systrace analysis documentation
Joe Fernandez [Fri, 5 Jun 2015 02:34:59 +0000 (02:34 +0000)]
am
eb837e8c: am
ab1fb237: am
79106d1c: docs: Remove ADT-1 RMA form link
* commit '
eb837e8cf84e2068f649aa959eba42f6bf39ba02':
docs: Remove ADT-1 RMA form link
John Reck [Fri, 5 Jun 2015 02:27:26 +0000 (02:27 +0000)]
am
06ae68aa: am
902ec1c7: Merge "Fix framestats docs ordering" into mnc-preview-docs
* commit '
06ae68aac222e1ba06169c5125e0689a30d13b09':
Fix framestats docs ordering
David Friedman [Fri, 5 Jun 2015 02:18:53 +0000 (02:18 +0000)]
am
cae82287: am
6bffab80: Merge "Docs: Fixes several typos on Android Studio index.html page." into mnc-preview-docs
* commit '
cae82287c704c000d304fdd3447dd693e2801c14':
Docs: Fixes several typos on Android Studio index.html page.
Dirk Dougherty [Fri, 5 Jun 2015 02:18:42 +0000 (02:18 +0000)]
am
392f5321: am
5c117ae1: Merge "Fix dependency specs for data binding." into mnc-preview-docs
* commit '
392f532104aeba2d395bdf940cc08a1247bd3de5':
Fix dependency specs for data binding.
Filip Gruszczynski [Fri, 5 Jun 2015 02:18:35 +0000 (02:18 +0000)]
am
93634166: am
d88e4d50: Merge "ActivityView: set surface on a background thread." into cw-d-mr1-dev
* commit '
93634166c8c78bdeccf045c62a0f601dceed74e3':
ActivityView: set surface on a background thread.
Chris Craik [Fri, 5 Jun 2015 02:18:29 +0000 (02:18 +0000)]
am
78ab4c38: am
6042f351: Merge "Rework systrace analysis documentation" into mnc-preview-docs
* commit '
78ab4c3867af40b512d2e0c046abd5c8b040d05f':
Rework systrace analysis documentation
Joe Fernandez [Fri, 5 Jun 2015 02:18:23 +0000 (02:18 +0000)]
am
ab1fb237: am
79106d1c: docs: Remove ADT-1 RMA form link
* commit '
ab1fb23712c66286285ffdce2d1488c41565650f':
docs: Remove ADT-1 RMA form link
Clara Bayarri [Fri, 5 Jun 2015 02:17:49 +0000 (02:17 +0000)]
am
de5cdeba: Merge "Fix Toolbar is not refreshed after Select All" into mnc-dev
* commit '
de5cdebac7b50871c3ece6ccd0b2a4d7a4b384bc':
Fix Toolbar is not refreshed after Select All
Clara Bayarri [Fri, 5 Jun 2015 02:05:43 +0000 (02:05 +0000)]
Merge "Fix Toolbar is not refreshed after Select All" into mnc-dev
Clara Bayarri [Tue, 2 Jun 2015 23:46:29 +0000 (00:46 +0100)]
Fix Toolbar is not refreshed after Select All
Bug:
21361248
Change-Id: Iab913bd610c208e5881d3d0eb5574efdf9eb5d92
Lorenzo Colitti [Fri, 5 Jun 2015 01:57:29 +0000 (10:57 +0900)]
Remove "returning Blocked NetworkInfo" logspam.
Bug:
20006730
Change-Id: I2061127e3c7283c0a4899940d3fc224ca114f754
Clara Bayarri [Wed, 3 Jun 2015 20:52:02 +0000 (21:52 +0100)]
Fix Select All should not be shown when everything is already selected
Condition Select All on whether the full text is already selected,
and add/remove this item when needed on ActionMode invalidation.
Bug:
21608943
Change-Id: Iad5f8a77a03b98024f7dcf355b2f7f0d1338b94a
Adam Lesinski [Fri, 5 Jun 2015 01:46:39 +0000 (01:46 +0000)]
am
6b717c66: Merge "AAPT2: Add manifest merging" into mnc-dev
* commit '
6b717c66a70663ea9d8b972289a8d4d74d90bc5a':
AAPT2: Add manifest merging
Adam Lesinski [Fri, 5 Jun 2015 01:35:13 +0000 (01:35 +0000)]
Merge "AAPT2: Add manifest merging" into mnc-dev
Zhijun He [Fri, 5 Jun 2015 01:21:17 +0000 (01:21 +0000)]
am
0ccc940a: Merge "Camera2: implement high speed video APIs" into mnc-dev
* commit '
0ccc940a0db0f6a779ed2cbc0f24a395046536e0':
Camera2: implement high speed video APIs
Zhijun He [Fri, 5 Jun 2015 01:07:51 +0000 (01:07 +0000)]
Merge "Camera2: implement high speed video APIs" into mnc-dev
Doris Liu [Fri, 5 Jun 2015 01:05:53 +0000 (01:05 +0000)]
am
5de55868: Merge "Make ListView\'s EdgeEffect respect the clipToPadding flag" into mnc-dev
* commit '
5de55868a9795a487af80e48540be84b6bdc7b97':
Make ListView's EdgeEffect respect the clipToPadding flag
Ben Kwa [Fri, 5 Jun 2015 01:05:48 +0000 (01:05 +0000)]
am
8dbb4328: Merge "Fix drawer selection to match Material spec." into mnc-dev
* commit '
8dbb43289ccc6bf85399eb3737be0dd5f01de923':
Fix drawer selection to match Material spec.
Svet Ganov [Fri, 5 Jun 2015 01:05:42 +0000 (01:05 +0000)]
am
e0748316: Merge "Update the pdfium library - framework" into mnc-dev
* commit '
e0748316053fe0210cf08be002d00a04e6068fb8':
Update the pdfium library - framework
Mady Mellor [Fri, 5 Jun 2015 01:03:49 +0000 (18:03 -0700)]
Stylus scale - API review feedback
Fixed typo and javadoc error.
Bug:
21572278
Change-Id: Ia710971f1f4a97df7ed8e898d972f617465900b9
Adam Lesinski [Wed, 20 May 2015 22:24:01 +0000 (15:24 -0700)]
AAPT2: Add manifest merging
Now that AAPT2 is library-aware, it needs to take care of
all library related work, including merging manifests.
The logic was taken from the current Java ManifestMerger.
Change-Id: Id93f713f27ae8617922bf89e325e45be9f863c06
OSDN Git Service
