OSDN Git Service
Jorim Jaggi [Wed, 1 Jul 2015 00:06:59 +0000 (00:06 +0000)]
am
f915990f: am
f794711f: am
e4f1a202: Fix Keyguard header animation from SHADE_LOCKED -> Keyguard
* commit '
f915990f1e2d2817aba51d3c1182b2e948a522ff':
Fix Keyguard header animation from SHADE_LOCKED -> Keyguard
Jorim Jaggi [Tue, 30 Jun 2015 23:57:31 +0000 (23:57 +0000)]
am
f794711f: am
e4f1a202: Fix Keyguard header animation from SHADE_LOCKED -> Keyguard
* commit '
f794711fa05b71134fe73ec461e631eb662814ac':
Fix Keyguard header animation from SHADE_LOCKED -> Keyguard
ztenghui [Tue, 30 Jun 2015 23:53:28 +0000 (23:53 +0000)]
am
fc17eb21: am
a2a01969: am
c2756505: Merge "Update the doc for VectorDrawable\'s Tint support" into mnc-dev
* commit '
fc17eb21e171f1d6639140a0a7465e8135a277fe':
Update the doc for VectorDrawable's Tint support
Adam Lesinski [Tue, 30 Jun 2015 23:53:18 +0000 (23:53 +0000)]
am
0a7b6d6c: am
509dbdb6: am
49a2a698: Merge "Add helper function to extract app ID from shared app gid." into mnc-dev
* commit '
0a7b6d6cf9c73d63339dc0b4cb7867cb90b038db':
Add helper function to extract app ID from shared app gid.
Amith Yamasani [Tue, 30 Jun 2015 23:43:31 +0000 (23:43 +0000)]
am
67abd3b3: am
da3d7b2b: am
2b64ec47: Merge "Don\'t allow non-admins to adopt sd card for internal storage" into mnc-dev
* commit '
67abd3b356794b316e647a9ad20a24b09406823f':
Don't allow non-admins to adopt sd card for internal storage
ztenghui [Tue, 30 Jun 2015 23:40:58 +0000 (23:40 +0000)]
am
a2a01969: am
c2756505: Merge "Update the doc for VectorDrawable\'s Tint support" into mnc-dev
* commit '
a2a019699f27376792b5b67c9e7f698839459a27':
Update the doc for VectorDrawable's Tint support
Adam Lesinski [Tue, 30 Jun 2015 23:40:52 +0000 (23:40 +0000)]
am
509dbdb6: am
49a2a698: Merge "Add helper function to extract app ID from shared app gid." into mnc-dev
* commit '
509dbdb68640679a35384bb8e56f63790e1218d3':
Add helper function to extract app ID from shared app gid.
Jorim Jaggi [Tue, 30 Jun 2015 23:39:44 +0000 (23:39 +0000)]
am
e4f1a202: Fix Keyguard header animation from SHADE_LOCKED -> Keyguard
* commit '
e4f1a202d8cc817eca3c4dbf4f448ba11f596f42':
Fix Keyguard header animation from SHADE_LOCKED -> Keyguard
Amith Yamasani [Tue, 30 Jun 2015 23:26:30 +0000 (23:26 +0000)]
am
da3d7b2b: am
2b64ec47: Merge "Don\'t allow non-admins to adopt sd card for internal storage" into mnc-dev
* commit '
da3d7b2bd7311bbec91b60199c85ceb22750139e':
Don't allow non-admins to adopt sd card for internal storage
ztenghui [Tue, 30 Jun 2015 23:25:56 +0000 (23:25 +0000)]
am
c2756505: Merge "Update the doc for VectorDrawable\'s Tint support" into mnc-dev
* commit '
c2756505b24801d4580383734a58bdf5f916e093':
Update the doc for VectorDrawable's Tint support
Adam Lesinski [Tue, 30 Jun 2015 23:25:51 +0000 (23:25 +0000)]
am
49a2a698: Merge "Add helper function to extract app ID from shared app gid." into mnc-dev
* commit '
49a2a6985d49b7356fd319266dd502f27964e69d':
Add helper function to extract app ID from shared app gid.
Jorim Jaggi [Tue, 30 Jun 2015 20:35:11 +0000 (13:35 -0700)]
Fix Keyguard header animation from SHADE_LOCKED -> Keyguard
Bug:
22128249
Change-Id: I36dbecc41e66922987c1b753d62bde27cb3b17be
Chet Haase [Tue, 30 Jun 2015 23:20:54 +0000 (23:20 +0000)]
am
1ee7dc93: am
58517a20: am
081ddbe2: Merge "Invalidate parent when scrolling child view back onto screen" into mnc-dev
* commit '
1ee7dc939fc01d118b104d439384b96d312cca16':
Invalidate parent when scrolling child view back onto screen
Alan Viverette [Tue, 30 Jun 2015 23:20:47 +0000 (23:20 +0000)]
am
78022801: am
29690e20: am
5906f587: Merge "Use non-greedy view to draw background in landscape time picker" into mnc-dev
* commit '
7802280162439c2205a09f61cd6d1a5bfa752d96':
Use non-greedy view to draw background in landscape time picker
Deepanshu Gupta [Tue, 30 Jun 2015 23:20:39 +0000 (23:20 +0000)]
am
83807f43: am
5174db63: am
c428b55c: Merge "Replace infinite loop with foreach." into mnc-dev
* commit '
83807f436a63cd69187efb9c5c8d2fe29fde0c4b':
Replace infinite loop with foreach.
Deepanshu Gupta [Tue, 30 Jun 2015 23:20:32 +0000 (23:20 +0000)]
am
5538455d: am
d81fe0f9: am
f5ca45ba: Merge "Add missing resolveResValue call." into mnc-dev
* commit '
5538455d16c5bbdb091819f85bbf9e4b40aabdb2':
Add missing resolveResValue call.
ztenghui [Tue, 30 Jun 2015 23:20:29 +0000 (23:20 +0000)]
Merge "Update the doc for VectorDrawable's Tint support" into mnc-dev
Adam Lesinski [Tue, 30 Jun 2015 23:16:18 +0000 (23:16 +0000)]
Merge "Add helper function to extract app ID from shared app gid." into mnc-dev
Amith Yamasani [Tue, 30 Jun 2015 23:13:50 +0000 (23:13 +0000)]
am
2b64ec47: Merge "Don\'t allow non-admins to adopt sd card for internal storage" into mnc-dev
* commit '
2b64ec470c7f18a2e8995d6131d99c58849f9938':
Don't allow non-admins to adopt sd card for internal storage
Chet Haase [Tue, 30 Jun 2015 23:05:36 +0000 (23:05 +0000)]
am
58517a20: am
081ddbe2: Merge "Invalidate parent when scrolling child view back onto screen" into mnc-dev
* commit '
58517a20011dfe777d75e2c16f6d47230e0a67b3':
Invalidate parent when scrolling child view back onto screen
Alan Viverette [Tue, 30 Jun 2015 23:05:32 +0000 (23:05 +0000)]
am
29690e20: am
5906f587: Merge "Use non-greedy view to draw background in landscape time picker" into mnc-dev
* commit '
29690e2015748b367b4794b25a7bd34c0c03a1cb':
Use non-greedy view to draw background in landscape time picker
Deepanshu Gupta [Tue, 30 Jun 2015 23:05:26 +0000 (23:05 +0000)]
am
5174db63: am
c428b55c: Merge "Replace infinite loop with foreach." into mnc-dev
* commit '
5174db63a975af9aa954801ac8ddf9b79ccb310f':
Replace infinite loop with foreach.
Deepanshu Gupta [Tue, 30 Jun 2015 23:05:21 +0000 (23:05 +0000)]
am
d81fe0f9: am
f5ca45ba: Merge "Add missing resolveResValue call." into mnc-dev
* commit '
d81fe0f9844e7e12b5a5266c46a39616014bc3c8':
Add missing resolveResValue call.
John Hoford [Tue, 30 Jun 2015 23:05:16 +0000 (23:05 +0000)]
am
d6ae7852: am
3791d011: am
6463dd52: Merge "add comment about xor not being porter/duff Bug:
21934855"
* commit '
d6ae7852929e2f6516752246c65f34096e3f124e':
add comment about xor not being porter/duff Bug:
21934855
Jorim Jaggi [Tue, 30 Jun 2015 23:05:10 +0000 (23:05 +0000)]
am
bec0e495: am
961c26c5: am
6ef58987: Don\'t show orb when voice session is already running
* commit '
bec0e4959b85ef518a5cbdac272a566572f0f5fc':
Don't show orb when voice session is already running
Jorim Jaggi [Tue, 30 Jun 2015 23:05:03 +0000 (23:05 +0000)]
am
05d9bbe8: am
2412e764: am
3b866bee: Make sure endClosing doesn\'t get called too early
* commit '
05d9bbe8af7cf8b7a542b5ddd7e90c330b249140':
Make sure endClosing doesn't get called too early
Amith Yamasani [Tue, 30 Jun 2015 23:00:06 +0000 (23:00 +0000)]
Merge "Don't allow non-admins to adopt sd card for internal storage" into mnc-dev
ztenghui [Tue, 30 Jun 2015 22:58:55 +0000 (15:58 -0700)]
Update the doc for VectorDrawable's Tint support
b/
21726146
Change-Id: I262f77b980afa81407b008276190062974cdc4fa
John Hoford [Tue, 30 Jun 2015 22:59:18 +0000 (22:59 +0000)]
am
3791d011: am
6463dd52: Merge "add comment about xor not being porter/duff Bug:
21934855"
* commit '
3791d0112ef38c95b8de8b73c5a1f5b074e6e6e9':
add comment about xor not being porter/duff Bug:
21934855
Chet Haase [Tue, 30 Jun 2015 22:53:59 +0000 (22:53 +0000)]
am
081ddbe2: Merge "Invalidate parent when scrolling child view back onto screen" into mnc-dev
* commit '
081ddbe296f6cfd29b4576ed20c8559f8aeae025':
Invalidate parent when scrolling child view back onto screen
Alan Viverette [Tue, 30 Jun 2015 22:53:54 +0000 (22:53 +0000)]
am
5906f587: Merge "Use non-greedy view to draw background in landscape time picker" into mnc-dev
* commit '
5906f587713c94c42e2a30a24ca9257ea9657b30':
Use non-greedy view to draw background in landscape time picker
Deepanshu Gupta [Tue, 30 Jun 2015 22:53:50 +0000 (22:53 +0000)]
am
c428b55c: Merge "Replace infinite loop with foreach." into mnc-dev
* commit '
c428b55c97a7359defef2c90a8a65160461d8474':
Replace infinite loop with foreach.
Deepanshu Gupta [Tue, 30 Jun 2015 22:53:45 +0000 (22:53 +0000)]
am
f5ca45ba: Merge "Add missing resolveResValue call." into mnc-dev
* commit '
f5ca45baab32d83bd46a85917dc5521785cd2a89':
Add missing resolveResValue call.
Jorim Jaggi [Tue, 30 Jun 2015 22:53:20 +0000 (22:53 +0000)]
am
961c26c5: am
6ef58987: Don\'t show orb when voice session is already running
* commit '
961c26c581e261c6769214d7dfb1326e47c19e17':
Don't show orb when voice session is already running
Jorim Jaggi [Tue, 30 Jun 2015 22:53:15 +0000 (22:53 +0000)]
am
2412e764: am
3b866bee: Make sure endClosing doesn\'t get called too early
* commit '
2412e764ccf97edb900cc7dc6779584173fa3be4':
Make sure endClosing doesn't get called too early
Chet Haase [Tue, 30 Jun 2015 22:46:42 +0000 (22:46 +0000)]
Merge "Invalidate parent when scrolling child view back onto screen" into mnc-dev
Alan Viverette [Tue, 30 Jun 2015 22:44:57 +0000 (22:44 +0000)]
Merge "Use non-greedy view to draw background in landscape time picker" into mnc-dev
John Hoford [Tue, 30 Jun 2015 22:44:56 +0000 (22:44 +0000)]
am
6463dd52: Merge "add comment about xor not being porter/duff Bug:
21934855"
* commit '
6463dd52470a2279e699647a282a085c00604d0c':
add comment about xor not being porter/duff Bug:
21934855
Deepanshu Gupta [Tue, 30 Jun 2015 22:41:46 +0000 (22:41 +0000)]
Merge "Replace infinite loop with foreach." into mnc-dev
Deepanshu Gupta [Tue, 30 Jun 2015 22:41:34 +0000 (22:41 +0000)]
Merge "Add missing resolveResValue call." into mnc-dev
Jorim Jaggi [Tue, 30 Jun 2015 22:38:11 +0000 (22:38 +0000)]
am
6ef58987: Don\'t show orb when voice session is already running
* commit '
6ef5898793ea5cda3767c219bd8a2c564991747c':
Don't show orb when voice session is already running
Jorim Jaggi [Tue, 30 Jun 2015 22:38:07 +0000 (22:38 +0000)]
am
3b866bee: Make sure endClosing doesn\'t get called too early
* commit '
3b866bee86f742f51a0042985ec7666283dc4406':
Make sure endClosing doesn't get called too early
Deepanshu Gupta [Tue, 30 Jun 2015 21:30:55 +0000 (14:30 -0700)]
Replace infinite loop with foreach.
A method call exists to find all inner classes. Use it instead of
manually enumerating the possibilities and checking.
Also fix a typo.
Change-Id: I2af678e92ea0c11b53617b247d8cda324391c185
John Hoford [Tue, 30 Jun 2015 22:34:43 +0000 (22:34 +0000)]
Merge "add comment about xor not being porter/duff Bug:
21934855"
Chet Haase [Tue, 30 Jun 2015 22:31:10 +0000 (15:31 -0700)]
Invalidate parent when scrolling child view back onto screen
This bug caused views which used to be quick-rejected to continue to not
be drawn because the parent's DisplayList no longer contained them. The
fix is to notice when offsetting a view puts it back on screen and invalidates
the parent appropriately.
Issue #
21413554 offsetTopAndBottom requires invalidating parent when view becomes visible again
Change-Id: I0f5d2cc48e3da912a41635712d9c37fb30e70c86
Jorim Jaggi [Tue, 30 Jun 2015 18:41:32 +0000 (11:41 -0700)]
Don't show orb when voice session is already running
Bug:
22195186
Change-Id: I7839536d2f6362889a924b65011d80556f0176b8
Jorim Jaggi [Tue, 30 Jun 2015 18:31:10 +0000 (11:31 -0700)]
Make sure endClosing doesn't get called too early
Bug:
22196478
Bug:
22184101
Change-Id: I3488c40b74a080efbba9b1544f9709f7e509988b
Alan Viverette [Tue, 30 Jun 2015 21:06:13 +0000 (14:06 -0700)]
Use non-greedy view to draw background in landscape time picker
Bug:
21933765
Change-Id: I95d608e9be166308e3a9b013a2c4c17cd4345046
Svet Ganov [Tue, 30 Jun 2015 22:17:06 +0000 (22:17 +0000)]
am
87922ed1: am
cf8ec275: am
1aaad610: Merge "Do not hold a lock when calling API to grant default permissions" into mnc-dev
* commit '
87922ed1d3dc527d1f9a9ec00fe58549c305ac0f':
Do not hold a lock when calling API to grant default permissions
Doris Liu [Tue, 30 Jun 2015 22:16:59 +0000 (22:16 +0000)]
am
3246ac08: am
94d225d8: am
e08f3b3f: Merge "Resolve CompoundButton\'s foreground drawable for layout direction change" into mnc-dev
* commit '
3246ac082dde2d307ba7f55b10d32199b914d4a8':
Resolve CompoundButton's foreground drawable for layout direction change
Doris Liu [Tue, 30 Jun 2015 22:16:52 +0000 (22:16 +0000)]
am
efd9b869: am
a5aedadc: am
99aa13ec: Merge "Allow null child view when checking whether divider should draw" into mnc-dev
* commit '
efd9b869d7225af5047352f9ca0180468467d54c':
Allow null child view when checking whether divider should draw
Svet Ganov [Tue, 30 Jun 2015 22:02:22 +0000 (22:02 +0000)]
am
cf8ec275: am
1aaad610: Merge "Do not hold a lock when calling API to grant default permissions" into mnc-dev
* commit '
cf8ec27503c07c353f543eb527e6306abd88d461':
Do not hold a lock when calling API to grant default permissions
Doris Liu [Tue, 30 Jun 2015 22:02:17 +0000 (22:02 +0000)]
am
94d225d8: am
e08f3b3f: Merge "Resolve CompoundButton\'s foreground drawable for layout direction change" into mnc-dev
* commit '
94d225d80be2b76ed7ad0f64946d81ce15845e1f':
Resolve CompoundButton's foreground drawable for layout direction change
Doris Liu [Tue, 30 Jun 2015 22:02:12 +0000 (22:02 +0000)]
am
a5aedadc: am
99aa13ec: Merge "Allow null child view when checking whether divider should draw" into mnc-dev
* commit '
a5aedadc0b94bab3277e7bf044250edfa41a71f0':
Allow null child view when checking whether divider should draw
Adam Lesinski [Fri, 26 Jun 2015 23:33:24 +0000 (16:33 -0700)]
Add helper function to extract app ID from shared app gid.
Bug:
22008744
Change-Id: Ifadc7df3777dd74932833f4d22a0e285d7bdaf95
Chris Craik [Tue, 30 Jun 2015 21:55:04 +0000 (21:55 +0000)]
am
bfb3afca: am
20d54457: am
ca985b54: Merge "Don\'t display layout bounds of GONE views" into mnc-dev
* commit '
bfb3afcad96fe38bb0f2e3cf2af2dc993ed663d8':
Don't display layout bounds of GONE views
Alan Viverette [Tue, 30 Jun 2015 21:54:58 +0000 (21:54 +0000)]
am
fe7b878f: am
d3ddb2f7: am
b35e8667: Merge "Handle null argument in ImageView.setImageIcon()" into mnc-dev
* commit '
fe7b878ff507be0cf991e24407a30d75891ac5e2':
Handle null argument in ImageView.setImageIcon()
Chris Craik [Tue, 30 Jun 2015 21:54:52 +0000 (21:54 +0000)]
am
6aa9b4ab: am
cf225194: am
a763bb83: Merge "Saturate alpha values when overlaying glyphs" into mnc-dev
* commit '
6aa9b4abf335d7ecf5c33cc48b41f9f9f8cbd8ab':
Saturate alpha values when overlaying glyphs
Alex Klyubin [Tue, 30 Jun 2015 21:54:46 +0000 (21:54 +0000)]
am
872eba0e: am
1809cfaa: am
89575b67: Merge "Enforce IND-CPA requirement when generating asymmetric keys." into mnc-dev
* commit '
872eba0e993323224001ebff57c5892b0f026bfe':
Enforce IND-CPA requirement when generating asymmetric keys.
Adam Lesinski [Tue, 30 Jun 2015 21:54:39 +0000 (21:54 +0000)]
am
8b15eb2c: am
1557a2ef: am
40fab055: Merge "Add round/notround qualifier to docs" into mnc-dev
* commit '
8b15eb2c30603179a824ca02144fc7d1959efb4a':
Add round/notround qualifier to docs
Adam Lesinski [Tue, 30 Jun 2015 21:54:33 +0000 (21:54 +0000)]
am
9986350d: am
36eadf9c: am
32ddd534: Merge "BatteryStats: Account for remaining OS wakelock time at the end of processing all apps" into mnc-dev
* commit '
9986350d66b6106cabe8c017455561f52a727f2c':
BatteryStats: Account for remaining OS wakelock time at the end of processing all apps
Svet Ganov [Tue, 30 Jun 2015 21:49:23 +0000 (21:49 +0000)]
am
1aaad610: Merge "Do not hold a lock when calling API to grant default permissions" into mnc-dev
* commit '
1aaad610dfc7445ec29fd906974677515c3a9f87':
Do not hold a lock when calling API to grant default permissions
Doris Liu [Tue, 30 Jun 2015 21:49:18 +0000 (21:49 +0000)]
am
e08f3b3f: Merge "Resolve CompoundButton\'s foreground drawable for layout direction change" into mnc-dev
* commit '
e08f3b3ff5ec89bc8c94b5d3d6518afde8e3b8a4':
Resolve CompoundButton's foreground drawable for layout direction change
Doris Liu [Tue, 30 Jun 2015 21:49:14 +0000 (21:49 +0000)]
am
99aa13ec: Merge "Allow null child view when checking whether divider should draw" into mnc-dev
* commit '
99aa13ec108e9cbb62984d79191548990809f95a':
Allow null child view when checking whether divider should draw
Svet Ganov [Tue, 30 Jun 2015 21:44:32 +0000 (21:44 +0000)]
Merge "Do not hold a lock when calling API to grant default permissions" into mnc-dev
Doris Liu [Tue, 30 Jun 2015 21:42:41 +0000 (21:42 +0000)]
Merge "Resolve CompoundButton's foreground drawable for layout direction change" into mnc-dev
Chris Craik [Tue, 30 Jun 2015 21:40:51 +0000 (21:40 +0000)]
am
20d54457: am
ca985b54: Merge "Don\'t display layout bounds of GONE views" into mnc-dev
* commit '
20d544571168cad62db4d86c91b3dfde7c13a342':
Don't display layout bounds of GONE views
Alan Viverette [Tue, 30 Jun 2015 21:40:46 +0000 (21:40 +0000)]
am
d3ddb2f7: am
b35e8667: Merge "Handle null argument in ImageView.setImageIcon()" into mnc-dev
* commit '
d3ddb2f7d2486a481b1d800c1dc9712b19b412ab':
Handle null argument in ImageView.setImageIcon()
Chris Craik [Tue, 30 Jun 2015 21:40:41 +0000 (21:40 +0000)]
am
cf225194: am
a763bb83: Merge "Saturate alpha values when overlaying glyphs" into mnc-dev
* commit '
cf225194a61db1558ead673fd67365ff9a61f3bb':
Saturate alpha values when overlaying glyphs
Alex Klyubin [Tue, 30 Jun 2015 21:40:35 +0000 (21:40 +0000)]
am
1809cfaa: am
89575b67: Merge "Enforce IND-CPA requirement when generating asymmetric keys." into mnc-dev
* commit '
1809cfaa764b9950701828e8858a06de5f907c2d':
Enforce IND-CPA requirement when generating asymmetric keys.
Adam Lesinski [Tue, 30 Jun 2015 21:40:29 +0000 (21:40 +0000)]
am
1557a2ef: am
40fab055: Merge "Add round/notround qualifier to docs" into mnc-dev
* commit '
1557a2ef9a1879a4505c29fb8a9952cb68684e6d':
Add round/notround qualifier to docs
Adam Lesinski [Tue, 30 Jun 2015 21:40:24 +0000 (21:40 +0000)]
am
36eadf9c: am
32ddd534: Merge "BatteryStats: Account for remaining OS wakelock time at the end of processing all apps" into mnc-dev
* commit '
36eadf9c1d78b047d9e43bf28fe2de417cc1fce5':
BatteryStats: Account for remaining OS wakelock time at the end of processing all apps
Bryce Lee [Tue, 30 Jun 2015 21:37:19 +0000 (21:37 +0000)]
am
cd1fc008: am
31b37509: am
5cd293b3: Merge "Merge commit \'
91d2cbf4\' into manualmerge" into mnc-dev
* commit '
cd1fc008006eadcd20de66346741fa4424ab2c3e':
Only enable theater mode by button press after setup.
Jason Monk [Tue, 30 Jun 2015 21:37:12 +0000 (21:37 +0000)]
am
004eb5c1: am
a969403c: am
583d2d9b: Merge "Don\'t allow do not disturb when volume restricted" into mnc-dev
* commit '
004eb5c1be854c00e717a8727417a26bb362d7ea':
Don't allow do not disturb when volume restricted
Doris Liu [Tue, 30 Jun 2015 21:34:58 +0000 (21:34 +0000)]
Merge "Allow null child view when checking whether divider should draw" into mnc-dev
Chris Craik [Tue, 30 Jun 2015 21:29:58 +0000 (21:29 +0000)]
am
ca985b54: Merge "Don\'t display layout bounds of GONE views" into mnc-dev
* commit '
ca985b54c8fe4d43f827f689fd4bd3008aa12977':
Don't display layout bounds of GONE views
Deepanshu Gupta [Tue, 30 Jun 2015 21:28:58 +0000 (14:28 -0700)]
Add missing resolveResValue call.
Bug: http://b.android.com/178504
Change-Id: I7dde8094cf762893e4f7ea0d3de87a281c9602cd
Alan Viverette [Tue, 30 Jun 2015 21:24:25 +0000 (21:24 +0000)]
am
b35e8667: Merge "Handle null argument in ImageView.setImageIcon()" into mnc-dev
* commit '
b35e866713bdc0ce3ea60ba67814ce8ed0810d8f':
Handle null argument in ImageView.setImageIcon()
Chris Craik [Tue, 30 Jun 2015 21:24:21 +0000 (21:24 +0000)]
am
a763bb83: Merge "Saturate alpha values when overlaying glyphs" into mnc-dev
* commit '
a763bb83cf931947db9e64231fdccf6a9db93ff2':
Saturate alpha values when overlaying glyphs
Alex Klyubin [Tue, 30 Jun 2015 21:24:16 +0000 (21:24 +0000)]
am
89575b67: Merge "Enforce IND-CPA requirement when generating asymmetric keys." into mnc-dev
* commit '
89575b678c57c3a6702040148bce94685df2b0b1':
Enforce IND-CPA requirement when generating asymmetric keys.
Adam Lesinski [Tue, 30 Jun 2015 21:24:11 +0000 (21:24 +0000)]
am
40fab055: Merge "Add round/notround qualifier to docs" into mnc-dev
* commit '
40fab055bb030c489469437fbcfa8e79fc89ded7':
Add round/notround qualifier to docs
Adam Lesinski [Tue, 30 Jun 2015 21:24:07 +0000 (21:24 +0000)]
am
32ddd534: Merge "BatteryStats: Account for remaining OS wakelock time at the end of processing all apps" into mnc-dev
* commit '
32ddd5346672339fe225ad16224a4498fef65ac3':
BatteryStats: Account for remaining OS wakelock time at the end of processing all apps
Bryce Lee [Tue, 30 Jun 2015 21:22:33 +0000 (21:22 +0000)]
am
31b37509: am
5cd293b3: Merge "Merge commit \'
91d2cbf4\' into manualmerge" into mnc-dev
* commit '
31b375095530c7414305568f3e9ceecfb66ba5bf':
Only enable theater mode by button press after setup.
Jason Monk [Tue, 30 Jun 2015 21:22:27 +0000 (21:22 +0000)]
am
a969403c: am
583d2d9b: Merge "Don\'t allow do not disturb when volume restricted" into mnc-dev
* commit '
a969403c1bc4f5f85b679692d204053566822a6c':
Don't allow do not disturb when volume restricted
Chris Craik [Tue, 30 Jun 2015 21:22:24 +0000 (21:22 +0000)]
Merge "Don't display layout bounds of GONE views" into mnc-dev
Amith Yamasani [Tue, 30 Jun 2015 21:21:01 +0000 (14:21 -0700)]
Don't allow non-admins to adopt sd card for internal storage
Bug:
21883016
Change-Id: I9af3eeffd860b076e69bb02a3dc06edba5f95898
Doris Liu [Tue, 30 Jun 2015 20:42:22 +0000 (13:42 -0700)]
Allow null child view when checking whether divider should draw
The beginning divider should draw before the first child that is not
set to GONE. Incidentally, there needs to be a check for such a child,
which involves checking the visibility of all the children with lower
indices. This CL takes into account the scenarios where children with
lower indices could be null, in which case we'll treat them as if they
were GONE.
Bug:
22199594
Change-Id: Iefc73ef87beec219898c967b9a3ccebd1e3b5b4c
Alan Viverette [Tue, 30 Jun 2015 20:53:28 +0000 (20:53 +0000)]
Merge "Handle null argument in ImageView.setImageIcon()" into mnc-dev
Chris Craik [Tue, 30 Jun 2015 20:52:24 +0000 (20:52 +0000)]
Merge "Saturate alpha values when overlaying glyphs" into mnc-dev
Chris Craik [Tue, 30 Jun 2015 20:51:25 +0000 (13:51 -0700)]
Don't display layout bounds of GONE views
bug:
22126532
Change-Id: Ib7816346e0f6ff54fcf7b180bf4042ce113728b9
Alex Klyubin [Tue, 30 Jun 2015 20:48:16 +0000 (20:48 +0000)]
Merge "Enforce IND-CPA requirement when generating asymmetric keys." into mnc-dev
Alan Viverette [Tue, 30 Jun 2015 20:32:27 +0000 (13:32 -0700)]
Handle null argument in ImageView.setImageIcon()
Provides consistency with setImageDrawable(). Also updates docs and
annotations for setImageZzz() methods that can take null.
Bug:
21664964
Change-Id: Ia9b7f8ee9edb23eeea457520bea4dd261decc794
Adam Lesinski [Tue, 30 Jun 2015 20:31:18 +0000 (20:31 +0000)]
Merge "Add round/notround qualifier to docs" into mnc-dev
Adam Lesinski [Tue, 30 Jun 2015 20:30:44 +0000 (20:30 +0000)]
Merge "BatteryStats: Account for remaining OS wakelock time at the end of processing all apps" into mnc-dev
Chris Craik [Tue, 30 Jun 2015 20:12:24 +0000 (13:12 -0700)]
Saturate alpha values when overlaying glyphs
bug:
19062769
Glyphs were stored to the output buffer with the assumption of
non-overlap, which is incorrect for certain fonts/strings. Instead,
blend src into dst, so new glyphs don't clobber existing content.
Change-Id: I6e22037500e67d5348ee2a43d939416c23c4d1ea
Bryce Lee [Tue, 30 Jun 2015 20:21:48 +0000 (20:21 +0000)]
am
5cd293b3: Merge "Merge commit \'
91d2cbf4\' into manualmerge" into mnc-dev
* commit '
5cd293b37946ccc60c148e4a17e5f59620999046':
Only enable theater mode by button press after setup.
Jason Monk [Tue, 30 Jun 2015 20:21:44 +0000 (20:21 +0000)]
am
583d2d9b: Merge "Don\'t allow do not disturb when volume restricted" into mnc-dev
* commit '
583d2d9ba22902eecf97bc9cf98dd27387b50fb3':
Don't allow do not disturb when volume restricted
Bryce Lee [Tue, 30 Jun 2015 20:15:31 +0000 (20:15 +0000)]
Merge "Merge commit '
91d2cbf4' into manualmerge" into mnc-dev
Jason Monk [Tue, 30 Jun 2015 20:08:13 +0000 (20:08 +0000)]
Merge "Don't allow do not disturb when volume restricted" into mnc-dev
Svet Ganov [Tue, 30 Jun 2015 19:56:47 +0000 (19:56 +0000)]
am
49316d83: am
ab4f6ff0: am
4a23ac45: Merge "Installer is a part of the system with unrevocable permissions" into mnc-dev
* commit '
49316d83d518110c64fab92c423ebd263ee3b7cf':
Installer is a part of the system with unrevocable permissions
OSDN Git Service
