OSDN Git Service
Christopher Tate [Wed, 1 Jul 2015 16:19:28 +0000 (16:19 +0000)]
am
2438c9b2: Merge "Fix dispatch of onRestoreFinished()" into mnc-dev
* commit '
2438c9b2e7892a8515209cb1d440c3b5147165b2':
Fix dispatch of onRestoreFinished()
Christopher Tate [Wed, 1 Jul 2015 01:25:52 +0000 (01:25 +0000)]
Merge "Fix dispatch of onRestoreFinished()" into mnc-dev
Svet Ganov [Wed, 1 Jul 2015 01:00:38 +0000 (01:00 +0000)]
am
67a461ec: Merge "Rename uses-permission-m to uses-permission-23" into mnc-dev
* commit '
67a461eca888243e1f4960e662aa2059c90da629':
Rename uses-permission-m to uses-permission-23
Yohei Yukawa [Wed, 1 Jul 2015 01:00:33 +0000 (01:00 +0000)]
am
63c4a718: Merge "Reland "Fixed constant window switching on lock screen..."" into mnc-dev
* commit '
63c4a7185cf1b03ba45cc3147e87270502334387':
Reland "Fixed constant window switching on lock screen..."
Christopher Tate [Wed, 1 Jul 2015 00:48:46 +0000 (17:48 -0700)]
Fix dispatch of onRestoreFinished()
The agent instance wasn't properly being conveyed from the generic
restore engine implementation to the state machine handling the
lifecycles. On top of that, the lifecycle wasn't advancing to the
restore-finished callback phase properly in the full-data restore
case.
Bug
22194736
Change-Id: Ic649d6a196adbd21a4a0f3083c7eed2fff383e52
Svet Ganov [Wed, 1 Jul 2015 00:55:40 +0000 (00:55 +0000)]
Merge "Rename uses-permission-m to uses-permission-23" into mnc-dev
Jeff Sharkey [Wed, 1 Jul 2015 00:53:06 +0000 (00:53 +0000)]
am
fc2740ae: Merge "Hand out storage to more system apps." into mnc-dev
* commit '
fc2740ae571f68f1a83bf3197655970e7e597de4':
Hand out storage to more system apps.
Dianne Hackborn [Wed, 1 Jul 2015 00:53:02 +0000 (00:53 +0000)]
am
80abf887: Merge "Fix issue #
22124996: VI: Command Request not Active" into mnc-dev
* commit '
80abf887a1578669d3167ea83d52a497a64ea491':
Fix issue #
22124996: VI: Command Request not Active
Adam Lesinski [Wed, 1 Jul 2015 00:52:57 +0000 (00:52 +0000)]
am
14b57010: Merge "BatteryStats: Record cpu power usage from /proc/uid_cputime" into mnc-dev
* commit '
14b5701029edc4473921e2a2446ec3151f30b916':
BatteryStats: Record cpu power usage from /proc/uid_cputime
Yohei Yukawa [Wed, 1 Jul 2015 00:51:33 +0000 (00:51 +0000)]
Merge "Reland "Fixed constant window switching on lock screen..."" into mnc-dev
Jeff Sharkey [Wed, 1 Jul 2015 00:42:40 +0000 (00:42 +0000)]
Merge "Hand out storage to more system apps." into mnc-dev
Dianne Hackborn [Wed, 1 Jul 2015 00:41:44 +0000 (00:41 +0000)]
Merge "Fix issue #
22124996: VI: Command Request not Active" into mnc-dev
Adam Lesinski [Wed, 1 Jul 2015 00:40:00 +0000 (00:40 +0000)]
Merge "BatteryStats: Record cpu power usage from /proc/uid_cputime" into mnc-dev
Jeff Sharkey [Wed, 1 Jul 2015 00:32:45 +0000 (17:32 -0700)]
Hand out storage to more system apps.
Grant storage access to the Storage Access Framework provider that
offers to delegate access to storage devices. Also grant to the
default music app.
Bug:
22104872
Change-Id: I8cf7dceec8b4c1e31f8ddd40b094ccd4ecb1caf8
Jeff Sharkey [Wed, 1 Jul 2015 00:13:39 +0000 (00:13 +0000)]
am
ca2f2fed: Merge "Fully unmount existing storage in Zygote." into mnc-dev
* commit '
ca2f2feda8bc458df91180110105b3742aedb62d':
Fully unmount existing storage in Zygote.
Jeff Sharkey [Tue, 30 Jun 2015 23:59:40 +0000 (23:59 +0000)]
Merge "Fully unmount existing storage in Zygote." into mnc-dev
Dianne Hackborn [Tue, 30 Jun 2015 21:38:17 +0000 (14:38 -0700)]
Fix issue #
22124996: VI: Command Request not Active
Just forgot to add the request to the active set.
Also eradicate a bunch of old cruft that has been replaced
by the final APIs, and improve voice interaction test to
sit fully on top of the final APIs and have a test for
command request.
Change-Id: Ieff7a6165ebf2a4c5fb80c1ebd020511a2ae63ee
Jorim Jaggi [Tue, 30 Jun 2015 23:39:48 +0000 (23:39 +0000)]
am
e4b840d6: Fix overexpand panel motion
* commit '
e4b840d63d8334dc1af113a890c2e9d067bb9139':
Fix overexpand panel motion
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
Jorim Jaggi [Tue, 30 Jun 2015 23:19:17 +0000 (16:19 -0700)]
Fix overexpand panel motion
Expanding was already set to false when we decided which QS
overscroll animation to run. We can't change the order of expanding
finished/tracking finished because of another bug. Instead, let the
stack scroller know about tracking state and combine both of them.
Bug:
21705230
Change-Id: I041ff1fabc6c939c233528f9d08d804ead64bbab
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
Yohei Yukawa [Tue, 30 Jun 2015 23:22:05 +0000 (16:22 -0700)]
Reland "Fixed constant window switching on lock screen..."
This is a manual reland of I3680256d41793f62def42fda00e26db1dcc9,
which was certainly merged into lmp-mr1-dev then auto-merged into
master but silently lost there for unknown reasons when
I8c42a1e6091b0fe1253e90265ac248087e was auto-merged into master.
Changes in WindowAnimator.java was already covered by
I2933eaf0ab55fe31cb382c46c411033e33a756e0 so this CL does not
include that change.
Bug:
18021493
Bug:
22158649
Change-Id: Ib1bf9f5bef44d0400230afc32231f7d1f3a1c98b
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
Svet Ganov [Tue, 30 Jun 2015 01:27:20 +0000 (18:27 -0700)]
Rename uses-permission-m to uses-permission-23
bug:
20072113
Change-Id: Ia872853274c604a6fee1c1d84f82a98334523bac
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
Jeff Sharkey [Tue, 30 Jun 2015 22:56:33 +0000 (15:56 -0700)]
Fully unmount existing storage in Zygote.
Before mounting the requested storage into place, fully unmount all
existing mounts inherited from the root namespace.
Bug:
22192518
Change-Id: I6f7f12c1219d25ee487a031d37c60fb4051d24ad
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.
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
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
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
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
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
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
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
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
Adam Lesinski [Tue, 30 Jun 2015 18:49:41 +0000 (11:49 -0700)]
Add round/notround qualifier to docs
Bug:
22203014
Change-Id: Icc05b93f0c1beddce3bd26ae169c2e8c0e3cb898
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
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.
Bryce Lee [Tue, 30 Jun 2015 19:31:41 +0000 (12:31 -0700)]
Merge commit '
91d2cbf4' into manualmerge
Change-Id: Id018e65bdbd67f040af13a07207cac33a4a2a158
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
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
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
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
Maxim Bogatov [Tue, 30 Jun 2015 18:45:46 +0000 (18:45 +0000)]
Merge "Let TextView clear accessibility selection index" into mnc-dev
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.
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
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
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.
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
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.
Yorke Lee [Tue, 30 Jun 2015 17:57:12 +0000 (17:57 +0000)]
am
40dff5b4: Merge "Fix TelecomManager.isVoicemailNumber" into mnc-dev
* commit '
40dff5b47f52ffb648f51c395ae67193e3121a2c':
Fix TelecomManager.isVoicemailNumber
Yorke Lee [Tue, 30 Jun 2015 17:47:08 +0000 (17:47 +0000)]
Merge "Fix TelecomManager.isVoicemailNumber" into mnc-dev
Chris Wren [Tue, 30 Jun 2015 17:30:52 +0000 (17:30 +0000)]
am
392527c4: Merge "add more power manager metrics" into mnc-dev
* commit '
392527c4cc04be275a1d055a76ee83806beb2cb9':
add more power manager metrics
Chris Wren [Tue, 30 Jun 2015 17:20:27 +0000 (17:20 +0000)]
Merge "add more power manager metrics" into mnc-dev
Svet Ganov [Tue, 30 Jun 2015 17:15:44 +0000 (10:15 -0700)]
Installer is a part of the system with unrevocable permissions
1. Mark the installer permissions as not revocable.
2. Make the permission result dispatch more robust to handle installer death.
bug:
22012614
Change-Id: Idee30ca884b87ccf97ba1bb878d4c49912e474b8
Yorke Lee [Tue, 30 Jun 2015 17:07:40 +0000 (10:07 -0700)]
Fix TelecomManager.isVoicemailNumber
Provide an overload of PhoneNumberUtil.isVoiceMailNumber that
takes a context to prevent an NPE.
This does not fix PhoneNumberUtil.isVoicemailNumber(String number),
that will require a follow up CL.
Bug:
22184528
Change-Id: I300b70948e5ff7230989bb887ad17e222c61685d
Bryce Lee [Tue, 30 Jun 2015 17:13:02 +0000 (17:13 +0000)]
Merge "Only enable theater mode by button press after setup." into cw-d-mr1-dev
Abodunrinwa Toki [Tue, 30 Jun 2015 16:59:52 +0000 (16:59 +0000)]
am
e40d7a63: Merge "Fix Floating toolbar overflow width." into mnc-dev
* commit '
e40d7a632668a3813a443195ba8e2146407a0517':
Fix Floating toolbar overflow width.
Abodunrinwa Toki [Tue, 30 Jun 2015 16:59:48 +0000 (16:59 +0000)]
am
685a1446: Merge "Fix floating toolbar flicker in ExtractEditText mode." into mnc-dev
* commit '
685a14468eeb730d19a36ac20bda75fe968feddb':
Fix floating toolbar flicker in ExtractEditText mode.