git.osdn.net Git - android-x86/frameworks-base.git/log

(root) / android-x86 / frameworks-base.git / log

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 30 Jun 2015 22:41:46 +0000 (22:41 +0000)]

Merge "Replace infinite loop with foreach." into mnc-dev

commit | commitdiff | tree

Deepanshu Gupta [Tue, 30 Jun 2015 22:41:34 +0000 (22:41 +0000)]

Merge "Add missing resolveResValue call." into mnc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

John Hoford [Tue, 30 Jun 2015 22:34:43 +0000 (22:34 +0000)]

Merge "add comment about xor not being porter/duff Bug: 21934855"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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()

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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()

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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()

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Alan Viverette [Tue, 30 Jun 2015 20:53:28 +0000 (20:53 +0000)]

Merge "Handle null argument in ImageView.setImageIcon()" into mnc-dev

commit | commitdiff | tree

Chris Craik [Tue, 30 Jun 2015 20:52:24 +0000 (20:52 +0000)]

Merge "Saturate alpha values when overlaying glyphs" into mnc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Adam Lesinski [Tue, 30 Jun 2015 20:31:18 +0000 (20:31 +0000)]

Merge "Add round/notround qualifier to docs" into mnc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

Bryce Lee [Tue, 30 Jun 2015 20:15:31 +0000 (20:15 +0000)]

Merge "Merge commit '91d2cbf4' into manualmerge" into mnc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

John Spurlock [Tue, 30 Jun 2015 19:56:40 +0000 (19:56 +0000)]

am e7dcb9c6: am 4783d82d: am a81c2e16: Merge "Volume: Defend against monkeys pulling tags too early." into mnc-dev

* commit 'e7dcb9c6310bfd669e1e630e3747a934c4f00fd8':
Volume: Defend against monkeys pulling tags too early.

commit | commitdiff | tree

Adam Lesinski [Tue, 30 Jun 2015 19:54:41 +0000 (12:54 -0700)]

BatteryStats: Account for remaining OS wakelock time at the end of processing all apps

Bug:18724932
Change-Id: I01cfd18acb3332ad35fd0d48d9c50bc37e5ccd08

commit | commitdiff | tree

John Hoford [Tue, 30 Jun 2015 01:15:22 +0000 (18:15 -0700)]

add comment about xor not being porter/duff
Bug: 21934855

Change-Id: I99394bd8a7a40a220c05118564b532f2533da38a

commit | commitdiff | tree

Svet Ganov [Tue, 30 Jun 2015 19:44:27 +0000 (19:44 +0000)]

am ab4f6ff0: am 4a23ac45: Merge "Installer is a part of the system with unrevocable permissions" into mnc-dev

* commit 'ab4f6ff013860e5fbb72542d9c47165a47244b0f':
Installer is a part of the system with unrevocable permissions

commit | commitdiff | tree

John Spurlock [Tue, 30 Jun 2015 19:44:22 +0000 (19:44 +0000)]

am 4783d82d: am a81c2e16: Merge "Volume: Defend against monkeys pulling tags too early." into mnc-dev

* commit '4783d82d93325477ed8444df87656bb6c785bec0':
Volume: Defend against monkeys pulling tags too early.

commit | commitdiff | tree

Adam Lesinski [Tue, 30 Jun 2015 18:49:41 +0000 (11:49 -0700)]

Add round/notround qualifier to docs

Bug:22203014
Change-Id: Icc05b93f0c1beddce3bd26ae169c2e8c0e3cb898

commit | commitdiff | tree

Svet Ganov [Tue, 30 Jun 2015 19:32:49 +0000 (19:32 +0000)]

am 4a23ac45: Merge "Installer is a part of the system with unrevocable permissions" into mnc-dev

* commit '4a23ac45895ec65e2357b2e52726229dbead9bb1':
Installer is a part of the system with unrevocable permissions

commit | commitdiff | tree

John Spurlock [Tue, 30 Jun 2015 19:32:45 +0000 (19:32 +0000)]

am a81c2e16: Merge "Volume: Defend against monkeys pulling tags too early." into mnc-dev

* commit 'a81c2e16fa8cd8b9c74332907f277af8aabf2b52':
Volume: Defend against monkeys pulling tags too early.

commit | commitdiff | tree

Bryce Lee [Tue, 30 Jun 2015 19:31:41 +0000 (12:31 -0700)]

Merge commit '91d2cbf4' into manualmerge

Change-Id: Id018e65bdbd67f040af13a07207cac33a4a2a158

commit | commitdiff | tree

Svet Ganov [Tue, 30 Jun 2015 19:24:02 +0000 (19:24 +0000)]

Merge "Installer is a part of the system with unrevocable permissions" into mnc-dev

commit | commitdiff | tree

John Spurlock [Tue, 30 Jun 2015 19:22:15 +0000 (19:22 +0000)]

Merge "Volume: Defend against monkeys pulling tags too early." into mnc-dev

commit | commitdiff | tree

Maxim Bogatov [Tue, 30 Jun 2015 19:19:29 +0000 (19:19 +0000)]

am b0c1485d: am 24815124: am 7a2e4b8f: Merge "Let TextView clear accessibility selection index" into mnc-dev

* commit 'b0c1485d4119e87507093892e0b1d96f777f5c55':
Let TextView clear accessibility selection index

commit | commitdiff | tree

John Spurlock [Tue, 30 Jun 2015 19:14:27 +0000 (15:14 -0400)]

Volume: Defend against monkeys pulling tags too early.

Bug: 22197117
Change-Id: I0f944fbc7fd6dd5176300c4fd0fd7b79234efe2d

commit | commitdiff | tree

Maxim Bogatov [Tue, 30 Jun 2015 19:07:50 +0000 (19:07 +0000)]

am 24815124: am 7a2e4b8f: Merge "Let TextView clear accessibility selection index" into mnc-dev

* commit '24815124600a12a9a0ef1d7a8883ab2c8e5c1525':
Let TextView clear accessibility selection index

commit | commitdiff | tree

Maxim Bogatov [Tue, 30 Jun 2015 18:53:55 +0000 (18:53 +0000)]

am 7a2e4b8f: Merge "Let TextView clear accessibility selection index" into mnc-dev

* commit '7a2e4b8f80de85d11d8bd49e559acd56801ea541':
Let TextView clear accessibility selection index

commit | commitdiff | tree

Maxim Bogatov [Tue, 30 Jun 2015 18:45:46 +0000 (18:45 +0000)]

Merge "Let TextView clear accessibility selection index" into mnc-dev

commit | commitdiff | tree

David Friedman [Tue, 30 Jun 2015 18:38:07 +0000 (18:38 +0000)]

am 06021c40: am 295c43cf: am 3acd1603: am eb7f1a94: am 9f2e92ee: Merge "Docs: Localized M-Preview pages Bug: 21789313" into mnc-preview-docs

* commit '06021c4069f5163c24ee90c8b27e040eeb9fb190':
Docs: Localized M-Preview pages Bug: 21789313

commit | commitdiff | tree

Andrew Solovay [Tue, 30 Jun 2015 18:38:00 +0000 (18:38 +0000)]

am b78b429e: am c59662e6: am 8722e141: am 4653cdec: am 350286e6: Merge "docs: Clarified when you can put the fragments in the root view." into mnc-preview-docs

* commit 'b78b429e4f8c2fa085883941014d41c1125b2467':
docs: Clarified when you can put the fragments in the root view.

commit | commitdiff | tree

Bryce Lee [Tue, 30 Jun 2015 18:34:47 +0000 (18:34 +0000)]

am cc2ba220: Merge "Only enable theater mode by button press after setup." into cw-d-mr1-dev

* commit 'cc2ba2200ddc9d95753fa930aa245540fac880e8':
Only enable theater mode by button press after setup.

commit | commitdiff | tree

Doris Liu [Tue, 30 Jun 2015 18:26:47 +0000 (11:26 -0700)]

Resolve CompoundButton's foreground drawable for layout direction change

This CL adds a step to resolve CompoundButton's foreground drawable when
layout direction has been changed. Prior this CL, only background drawable
of the button resolves its layout direciton in respond to system wide
layout direction change. This CL makes the foreground and background
drawables consistent in layout direciton.

Bug: 16376848
Change-Id: I9a4eb1e010e6ab61ef8684005508bd36486ec1f3

commit | commitdiff | tree

David Friedman [Tue, 30 Jun 2015 18:24:08 +0000 (18:24 +0000)]

am 295c43cf: am 3acd1603: am eb7f1a94: am 9f2e92ee: Merge "Docs: Localized M-Preview pages Bug: 21789313" into mnc-preview-docs

* commit '295c43cf66f4c5a8f7324a8c9665293a921ce608':
Docs: Localized M-Preview pages Bug: 21789313

commit | commitdiff | tree

Andrew Solovay [Tue, 30 Jun 2015 18:24:03 +0000 (18:24 +0000)]

am c59662e6: am 8722e141: am 4653cdec: am 350286e6: Merge "docs: Clarified when you can put the fragments in the root view." into mnc-preview-docs

* commit 'c59662e6a2fe874967c00e46de1168978c8d5d9c':
docs: Clarified when you can put the fragments in the root view.

commit | commitdiff | tree

Yorke Lee [Tue, 30 Jun 2015 18:23:42 +0000 (18:23 +0000)]

am 5d35aed7: am d9f525fb: am 40dff5b4: Merge "Fix TelecomManager.isVoicemailNumber" into mnc-dev

* commit '5d35aed77d5d46da31fc3727d92ca7f6e3841f2f':
Fix TelecomManager.isVoicemailNumber

commit | commitdiff | tree

David Friedman [Tue, 30 Jun 2015 18:09:42 +0000 (18:09 +0000)]

am 3acd1603: am eb7f1a94: am 9f2e92ee: Merge "Docs: Localized M-Preview pages Bug: 21789313" into mnc-preview-docs

* commit '3acd16032c1f8009f17d04ef6fce8d4211835f24':
Docs: Localized M-Preview pages Bug: 21789313

commit | commitdiff | tree

Andrew Solovay [Tue, 30 Jun 2015 18:09:38 +0000 (18:09 +0000)]

am 8722e141: am 4653cdec: am 350286e6: Merge "docs: Clarified when you can put the fragments in the root view." into mnc-preview-docs

* commit '8722e1416ed04fbd0122c394c7fdad9d41524c60':
docs: Clarified when you can put the fragments in the root view.

commit | commitdiff | tree

Yorke Lee [Tue, 30 Jun 2015 18:09:36 +0000 (18:09 +0000)]

am d9f525fb: am 40dff5b4: Merge "Fix TelecomManager.isVoicemailNumber" into mnc-dev

* commit 'd9f525fbcc9c452134396f5f8b391f1045f68bc7':
Fix TelecomManager.isVoicemailNumber

commit | commitdiff | tree

David Friedman [Tue, 30 Jun 2015 17:57:45 +0000 (17:57 +0000)]

am eb7f1a94: am 9f2e92ee: Merge "Docs: Localized M-Preview pages Bug: 21789313" into mnc-preview-docs

* commit 'eb7f1a948a202cec51c0c09c3fbc1c557674380b':
Docs: Localized M-Preview pages Bug: 21789313

commit | commitdiff | tree

Andrew Solovay [Tue, 30 Jun 2015 17:57:36 +0000 (17:57 +0000)]

am 4653cdec: am 350286e6: Merge "docs: Clarified when you can put the fragments in the root view." into mnc-preview-docs

* commit '4653cdecab5eb6b08f23183f83034ccf50e93451':
docs: Clarified when you can put the fragments in the root view.

commit | commitdiff | tree

Chris Wren [Tue, 30 Jun 2015 17:57:14 +0000 (17:57 +0000)]

am 8cc9473f: am 699d2f78: am 392527c4: Merge "add more power manager metrics" into mnc-dev

* commit '8cc9473fff87c184068a3b773c45d1d4c6669fcc':
add more power manager metrics

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help