OSDN Git Service
Alan Viverette [Tue, 19 May 2015 17:19:44 +0000 (17:19 +0000)]
am
6246ade0: Merge "Remove controlBackground attribute, replace with direct reference" into mnc-dev
* commit '
6246ade0b36a1583e254b7aded3b232da9290f6d':
Remove controlBackground attribute, replace with direct reference
Hemant Gupta [Tue, 19 May 2015 17:19:39 +0000 (17:19 +0000)]
am
58fbffc3: Bluetooth: Check for mPanService before changing tethering state
* commit '
58fbffc36f71fbccbf510bfd17797760dc738133':
Bluetooth: Check for mPanService before changing tethering state
Alan Viverette [Tue, 19 May 2015 17:13:21 +0000 (17:13 +0000)]
Merge "Remove controlBackground attribute, replace with direct reference" into mnc-dev
Abodunrinwa Toki [Tue, 19 May 2015 17:12:40 +0000 (17:12 +0000)]
am
378939ad: Merge "Hide floating toolbar when selection is out of bounds." into mnc-dev
* commit '
378939ad14944922a5920c952877a6fd2904b44c':
Hide floating toolbar when selection is out of bounds.
Hemant Gupta [Sun, 15 Feb 2015 13:26:54 +0000 (18:56 +0530)]
Bluetooth: Check for mPanService before changing tethering state
Checking for mPanService before changing OR checking tethering state,
otherwise it will lead to application crash while checking isTetheringOn
OR changing tethering state.
Change-Id: I00844c03cdb8616118c1d50d7d31c75e51f0ef9b
Abodunrinwa Toki [Tue, 19 May 2015 17:00:05 +0000 (17:00 +0000)]
Merge "Hide floating toolbar when selection is out of bounds." into mnc-dev
Yohei Yukawa [Tue, 19 May 2015 16:59:26 +0000 (16:59 +0000)]
am
c2cc6fff: Merge "Keep IMM#mCurRootView synchronized with the actual window focus." into mnc-dev
* commit '
c2cc6fff1bac2afd73840b64976b146bdcd4435c':
Keep IMM#mCurRootView synchronized with the actual window focus.
Abodunrinwa Toki [Tue, 19 May 2015 16:53:30 +0000 (16:53 +0000)]
am
737c6f16: Merge "Fix wrong delay values for floatingtoolbar.hide/dismiss" into mnc-dev
* commit '
737c6f16a57562303caae38208effe06405ef7fe':
Fix wrong delay values for floatingtoolbar.hide/dismiss
Dianne Hackborn [Tue, 19 May 2015 16:53:24 +0000 (16:53 +0000)]
am
8e3f2954: Merge "Update power manager to track uid state like netstats." into mnc-dev
* commit '
8e3f29540db56d02a45966344133d6144c81e7c5':
Update power manager to track uid state like netstats.
John Spurlock [Tue, 19 May 2015 16:53:19 +0000 (16:53 +0000)]
am
5ddde02a: Merge "Volume: Dialog should not interfere when not showing." into mnc-dev
* commit '
5ddde02ac243b28ae9189a9f7ba64ba99c2d11d7':
Volume: Dialog should not interfere when not showing.
Yohei Yukawa [Tue, 19 May 2015 16:52:25 +0000 (16:52 +0000)]
Merge "Keep IMM#mCurRootView synchronized with the actual window focus." into mnc-dev
Abodunrinwa Toki [Tue, 19 May 2015 16:45:19 +0000 (16:45 +0000)]
Merge "Fix wrong delay values for floatingtoolbar.hide/dismiss" into mnc-dev
Dianne Hackborn [Tue, 19 May 2015 16:44:09 +0000 (16:44 +0000)]
Merge "Update power manager to track uid state like netstats." into mnc-dev
Narayan Kamath [Tue, 19 May 2015 16:40:40 +0000 (16:40 +0000)]
am
b9048634: Scan package to derive ABIs before optimizing.
* commit '
b904863476991d8540d37d542c0a49b78deab680':
Scan package to derive ABIs before optimizing.
Roozbeh Pournader [Tue, 19 May 2015 16:40:35 +0000 (16:40 +0000)]
am
03340feb: Merge "Update Naskh font names to match upstream and add Tibetan." into mnc-dev
* commit '
03340feb335f497a5e2d52d1f86a05ecc9dcfcb1':
Update Naskh font names to match upstream and add Tibetan.
Wale Ogunwale [Tue, 19 May 2015 16:40:29 +0000 (16:40 +0000)]
am
1ca9c687: Merge "Send AppTransitionFinish notification when there was no animation" into mnc-dev
* commit '
1ca9c687407b0a7cdc828837c2460ee581e08975':
Send AppTransitionFinish notification when there was no animation
John Spurlock [Tue, 19 May 2015 16:40:05 +0000 (16:40 +0000)]
Merge "Volume: Dialog should not interfere when not showing." into mnc-dev
Abodunrinwa Toki [Tue, 19 May 2015 16:36:55 +0000 (17:36 +0100)]
Fix wrong delay values for floatingtoolbar.hide/dismiss
Change-Id: Ie16b5f49babd0df0c70b188c9637e17c661e029c
Narayan Kamath [Mon, 18 May 2015 09:18:35 +0000 (10:18 +0100)]
Scan package to derive ABIs before optimizing.
This requires a minor refactor to extract the ABI detection logic
out of scanPackageDirtyLI.
Note that there's a minor regression here : we ignore the
cpuAbiOverride from the package settings when calculating the
CPU ABI. This is OK (and possibly better behaviour) because this
is only a debug only option (for adb install) AND because the instructions
require users to specify the abi override on every adb install
invocation. Furthermore, the behaviour when an ADB installed app
(with an override) is auto-updated is more consistent.
bug:
21144503
Change-Id: I74e7c493468ee0088eb615c9a7fe30b4d7cf27de
Roozbeh Pournader [Tue, 19 May 2015 16:29:25 +0000 (16:29 +0000)]
Merge "Update Naskh font names to match upstream and add Tibetan." into mnc-dev
Roozbeh Pournader [Sun, 17 May 2015 03:50:06 +0000 (20:50 -0700)]
Update Naskh font names to match upstream and add Tibetan.
The latest files from the upstream Noto repository are named
NotoNaskhArabic* instead of the previous NotoNaskh*.
Also, Noto Sans Tibetan is now included in the fallback chain. Apart
from supporting Tibetan and Dzongkha langauges, this adds a character
(U+0FD6) that completes coverage for ARIB character sets.
Bug:
13680438
Bug:
18181755
Bug:
18639453
Bug:
19390244
Change-Id: I09b493340d1453ef61b08c841e1731119d645822
Wale Ogunwale [Tue, 19 May 2015 16:27:27 +0000 (16:27 +0000)]
Merge "Send AppTransitionFinish notification when there was no animation" into mnc-dev
John Spurlock [Tue, 19 May 2015 16:26:25 +0000 (12:26 -0400)]
Volume: Dialog should not interfere when not showing.
Also dump volume dialog controller state properly as part of
the sysui service dump.
Bug:
21207717
Change-Id: I5146d4159d9b017bc91852b91a585725821c19d9
Xiyuan Xia [Tue, 19 May 2015 16:18:58 +0000 (16:18 +0000)]
am
00d1fcf7: Merge "No input instead of disabling password entry" into mnc-dev
* commit '
00d1fcf7372155510930a2ea759d08bf8db93b61':
No input instead of disabling password entry
Xiyuan Xia [Tue, 19 May 2015 16:06:05 +0000 (16:06 +0000)]
Merge "No input instead of disabling password entry" into mnc-dev
Xiyuan Xia [Fri, 15 May 2015 18:01:30 +0000 (11:01 -0700)]
No input instead of disabling password entry
So that the keyboard does not come and go all the time.
Bug:
21271425
Change-Id: I9ba2fa7034777885a6e53f135eca31fc89568e9d
Alex Klyubin [Tue, 19 May 2015 15:57:05 +0000 (15:57 +0000)]
am
29542143: Merge "Document the security features of Android Keystore." into mnc-dev
* commit '
29542143b1b09ce690dc64b3569bf4ba6bfd8ed6':
Document the security features of Android Keystore.
Xiyuan Xia [Tue, 19 May 2015 15:57:00 +0000 (15:57 +0000)]
am
1ca35418: Merge "Abort swipe up gesture when long press is detected" into mnc-dev
* commit '
1ca3541857043b549a5aed04559f5e303cb84422':
Abort swipe up gesture when long press is detected
Alex Klyubin [Tue, 19 May 2015 15:55:09 +0000 (15:55 +0000)]
Merge "Document the security features of Android Keystore." into mnc-dev
Glenn Kasten [Tue, 19 May 2015 15:45:37 +0000 (15:45 +0000)]
am
c4ddf16c: Merge "send without timestamp is not equivalent to send now" into mnc-dev
* commit '
c4ddf16c8b25d544096f22fbdc491a0c627c1a79':
send without timestamp is not equivalent to send now
Xiyuan Xia [Tue, 19 May 2015 15:44:41 +0000 (15:44 +0000)]
Merge "Abort swipe up gesture when long press is detected" into mnc-dev
Alex Klyubin [Tue, 12 May 2015 15:48:54 +0000 (08:48 -0700)]
Document the security features of Android Keystore.
Bug:
18088752
Change-Id: Iec995e39065d9c4f159cb4eea38486f9c75de072
Glenn Kasten [Tue, 19 May 2015 15:38:00 +0000 (15:38 +0000)]
Merge "send without timestamp is not equivalent to send now" into mnc-dev
Glenn Kasten [Mon, 18 May 2015 23:43:43 +0000 (16:43 -0700)]
send without timestamp is not equivalent to send now
Change-Id: I68decbd005932c762ccd376ee80b52ac9884fba4
Derek Sollenberger [Tue, 19 May 2015 14:46:40 +0000 (14:46 +0000)]
am
252893df: Merge "Check that the parcel contained the expected amount of region data." into mnc-dev
* commit '
252893df572256657d02b08eb52596bc9e82d5cc':
Check that the parcel contained the expected amount of region data.
Derek Sollenberger [Tue, 19 May 2015 14:38:51 +0000 (14:38 +0000)]
Merge "Check that the parcel contained the expected amount of region data." into mnc-dev
Abodunrinwa Toki [Wed, 6 May 2015 17:57:06 +0000 (18:57 +0100)]
Hide floating toolbar when selection is out of bounds.
Bug:
20212141
Change-Id: I7844308e339ba9a5027c629da8090053011e019d
Abodunrinwa Toki [Tue, 19 May 2015 14:16:53 +0000 (14:16 +0000)]
am
1f21d2a8: Merge "Hide floating toolbar when user interacts with screen." into mnc-dev
* commit '
1f21d2a8b15d088ab50a62cbc389e88c09d141c1':
Hide floating toolbar when user interacts with screen.
Abodunrinwa Toki [Tue, 19 May 2015 14:06:44 +0000 (14:06 +0000)]
Merge "Hide floating toolbar when user interacts with screen." into mnc-dev
Abodunrinwa Toki [Tue, 5 May 2015 19:04:34 +0000 (20:04 +0100)]
Hide floating toolbar when user interacts with screen.
- Adds an ActionMode.snooze(int) API.
- Clients call this to hide the floating toolbar on DOWN touch event.
- This is called repeatedly as a snooze timeout will re-show the
toolbar.
- ActionMode.snooze(0) will "wake" the toolbar, reshowing it.
- Clients call this to re-show the toolbar on UP touch event.
- This CL also adds code to hide the toolbar when the "content rect"
is changing.
Bug:
20148125
Change-Id: If5a9a15f72c73cad8ca01a4328a58570b3e29f66
Paul Jensen [Tue, 19 May 2015 12:16:19 +0000 (12:16 +0000)]
am
7597dc7c: Merge "Avoid surfacing "Sign in to network" notification if user selects "use as is" from captive portal app." into mnc-dev
* commit '
7597dc7c4dfe49ba7c5d0e7568873521b90c6682':
Avoid surfacing "Sign in to network" notification if user selects "use as is" from captive portal app.
Paul Jensen [Tue, 19 May 2015 12:16:15 +0000 (12:16 +0000)]
am
0c506582: Merge "Make NetworkMonitor do exponential backoff between reevaluation attempts." into mnc-dev
* commit '
0c506582effbe3262b537dab638f8213c6dd933a':
Make NetworkMonitor do exponential backoff between reevaluation attempts.
Paul Jensen [Tue, 19 May 2015 12:07:46 +0000 (12:07 +0000)]
Merge "Avoid surfacing "Sign in to network" notification if user selects "use as is" from captive portal app." into mnc-dev
Paul Jensen [Tue, 19 May 2015 12:07:03 +0000 (12:07 +0000)]
Merge "Make NetworkMonitor do exponential backoff between reevaluation attempts." into mnc-dev
Clara Bayarri [Tue, 19 May 2015 10:54:44 +0000 (10:54 +0000)]
am
e94561ec: Merge "Fix Cancelling a text action activity deletes the selected text" into mnc-dev
* commit '
e94561ecbcb7f6df2446b811de9ad5cfaff29d99':
Fix Cancelling a text action activity deletes the selected text
Clara Bayarri [Tue, 19 May 2015 10:42:17 +0000 (10:42 +0000)]
Merge "Fix Cancelling a text action activity deletes the selected text" into mnc-dev
Lorenzo Colitti [Tue, 19 May 2015 10:37:15 +0000 (10:37 +0000)]
am
aba6cccd: Merge "Make NET_CAPABILITY_VALIDATED (almost) a first-class citizen." into mnc-dev
* commit '
aba6cccd40e0393d7bcff7f6edb5ca8cfdd4c7b1':
Make NET_CAPABILITY_VALIDATED (almost) a first-class citizen.
Lorenzo Colitti [Tue, 19 May 2015 10:29:46 +0000 (10:29 +0000)]
Merge "Make NET_CAPABILITY_VALIDATED (almost) a first-class citizen." into mnc-dev
Robin Lee [Tue, 19 May 2015 10:26:03 +0000 (10:26 +0000)]
am
3e5484d4: Merge "Support cross-user VPN calls (with permission)" into mnc-dev
* commit '
3e5484d452cdf9f98e3c0e1abfe4a7297753cb5e':
Support cross-user VPN calls (with permission)
Robin Lee [Tue, 19 May 2015 10:14:55 +0000 (10:14 +0000)]
Merge "Support cross-user VPN calls (with permission)" into mnc-dev
Lorenzo Colitti [Thu, 14 May 2015 08:28:27 +0000 (17:28 +0900)]
Make NET_CAPABILITY_VALIDATED (almost) a first-class citizen.
1. Always keep ConnectivityService's validated bits current:
- Apply the validated bit whenever a NetworkAgent updates its
NetworkCapabilities.
- Set or clear the validated bit whenever lastValidated changes.
2. Send callbacks when the validation state of a network changes.
3. Delete getNetworkCapabilitiesAndValidation, removing code
duplication with getNetworkCapabilities.
4. Add the validated bit to NetworkCapabilities#toString.
Bug:
18591282
Bug:
20081183
Change-Id: I6aa53b61c15cc137f203f9fc6bbd4c16894be750
Jorim Jaggi [Tue, 19 May 2015 04:51:11 +0000 (04:51 +0000)]
am
c6767354: Merge "Add setting to disable assist data (1/2)" into mnc-dev
* commit '
c6767354c5c2e32648c7404b73878a8ae66dd3c8': (30 commits)
Add setting to disable assist data (1/2)
Make all icon fields & extras sent to listeners backward-compatible.
Revert "Fix IMMS#mInputShown state inconsistency."
Fix bug with jobservice context giving wrong value
camera2: Fix work-profile eviction handling.
Fix missing break in Icon class
Fix post dial for remote connections
Fix build: udpate parser factory method
Don't keep LayoutlibCallback reference.
Adjust lockscreen style to spec
[RenderScript] Add dummy getMinorID to maintain compatible with old RS compat lib.
Change the location of Brandmaster statement file.
Revert "Update IME focus when the active view is losing the focus."
Revert "Icon support comes to Notification."
Fix icon-related crash.
Don't display the "no Internet access" prompt on captive portals.
Rewriting should fail when any paths are null.
Ignore abandon after install relinquished.
Fix build - Revert "Revert "Use default constructor to get anti-aliasing""
Fix crash in setup wizard
...
Jorim Jaggi [Tue, 19 May 2015 04:40:08 +0000 (04:40 +0000)]
Merge "Add setting to disable assist data (1/2)" into mnc-dev
Jorim Jaggi [Tue, 19 May 2015 00:35:26 +0000 (17:35 -0700)]
Add setting to disable assist data (1/2)
Bug:
20944446
Change-Id: I8050df3177b6d540829c3f0989a4e4b1381c87ec
Erik Kline [Tue, 19 May 2015 02:46:15 +0000 (02:46 +0000)]
am
2b0196a7: Merge "Add IpReachabilityMonitor#probeAll() to begin doing DNAv4/v6-like probing" into mnc-dev
* commit '
2b0196a7d3d6c952c8df17acd9fcdf61ec735b5c':
Add IpReachabilityMonitor#probeAll() to begin doing DNAv4/v6-like probing
Erik Kline [Tue, 19 May 2015 02:36:53 +0000 (02:36 +0000)]
Merge "Add IpReachabilityMonitor#probeAll() to begin doing DNAv4/v6-like probing" into mnc-dev
Dianne Hackborn [Fri, 15 May 2015 23:36:12 +0000 (16:36 -0700)]
Update power manager to track uid state like netstats.
To follow the correct semantics for when restricts due to
device idle can be applied, power manager need to know about
uid process states like net policy so that it can allow
wake locks from apps that are in the foreground.
Since this is being added to a second place, I reworked things
so that the activity manager now keeps track of per-uid process
states and allows apps to register to listen to those, rather
than having to track lower-level process states and transform
them into an overall uid state. Both net policy and power
manager use this new facility.
Change-Id: I77359164c40d0f36fe1ef296dd9f9c3062431148
Adam Powell [Tue, 19 May 2015 01:13:13 +0000 (01:13 +0000)]
am
f9a0d44d: Merge "Migrate uses of config_windowIsRound to Configuration.isScreenRound" into mnc-dev
* commit '
f9a0d44d2e4f2d92a117074facee4f2632a4faf1':
Migrate uses of config_windowIsRound to Configuration.isScreenRound
Dianne Hackborn [Tue, 19 May 2015 01:13:08 +0000 (01:13 +0000)]
am
fde50024: Merge "Remove screenshot APIs." into mnc-dev
* commit '
fde500245c91c14fd1ba61e49fadb05969e9d1e7':
Remove screenshot APIs.
Adam Powell [Tue, 19 May 2015 01:10:51 +0000 (01:10 +0000)]
Merge "Migrate uses of config_windowIsRound to Configuration.isScreenRound" into mnc-dev
Dianne Hackborn [Tue, 19 May 2015 01:05:52 +0000 (01:05 +0000)]
Merge "Remove screenshot APIs." into mnc-dev
Alan Viverette [Tue, 19 May 2015 00:48:50 +0000 (00:48 +0000)]
am
0c4729a1: Merge "Revert "Postpone AnimatedVectorDrawable animator inflation until applyTheme()"" into mnc-dev
* commit '
0c4729a1e468e2b0783a4234e39677d8078473b3':
Revert "Postpone AnimatedVectorDrawable animator inflation until applyTheme()"
Dianne Hackborn [Tue, 19 May 2015 00:48:40 +0000 (17:48 -0700)]
Remove screenshot APIs.
Change-Id: I1efdb7945bd52f5f43c7103480be3d7dac60018b
Alan Viverette [Tue, 19 May 2015 00:37:02 +0000 (00:37 +0000)]
Merge "Revert "Postpone AnimatedVectorDrawable animator inflation until applyTheme()"" into mnc-dev
Alan Viverette [Tue, 19 May 2015 00:36:53 +0000 (00:36 +0000)]
Revert "Postpone AnimatedVectorDrawable animator inflation until applyTheme()"
This reverts commit
9b115a9870a184e32bdbd07f792f9b8c956c75ca.
Change-Id: Ief148510472e129f992cf52ef8b8a25b5e17e05f
Joe Fernandez [Tue, 19 May 2015 00:35:59 +0000 (00:35 +0000)]
am
f8575f66: am
e7e9d177: am
2b18c39d: Merge "docs: M Preview landing page updates" into mnc-preview-docs
* commit '
f8575f667b88d87207053cca06101bbc1c36f68c':
docs: M Preview landing page updates
Rich Slogar [Tue, 19 May 2015 00:35:54 +0000 (00:35 +0000)]
am
32239acf: am
80f67b62: am
3f3cde41: am
a01f2e73: am
c03a39ab: Merge "docs: emulator updates" into lmp-docs
* commit '
32239acf5c7f26268cf2569c35c78b8caf173fe7':
docs: emulator updates
Glenn Kasten [Tue, 19 May 2015 00:35:49 +0000 (00:35 +0000)]
am
0e2c164a: Merge "Update documentation for short transfer counts" into mnc-dev
* commit '
0e2c164a8aa8c1c9d868620b6aa6da34f7184cc4':
Update documentation for short transfer counts
Joe Fernandez [Tue, 19 May 2015 00:31:27 +0000 (00:31 +0000)]
am
e7e9d177: am
2b18c39d: Merge "docs: M Preview landing page updates" into mnc-preview-docs
* commit '
e7e9d1771525f14027602546e396c0e707bc9de0':
docs: M Preview landing page updates
Rich Slogar [Tue, 19 May 2015 00:31:21 +0000 (00:31 +0000)]
am
80f67b62: am
3f3cde41: am
a01f2e73: am
c03a39ab: Merge "docs: emulator updates" into lmp-docs
* commit '
80f67b621247cf120dd885a544e1c2d7eb1d8b90':
docs: emulator updates
Glenn Kasten [Tue, 19 May 2015 00:28:19 +0000 (00:28 +0000)]
Merge "Update documentation for short transfer counts" into mnc-dev
Svet Ganov [Tue, 19 May 2015 00:23:17 +0000 (00:23 +0000)]
am
f7b541ff: Merge "Do not report WiFi and Bluetooth MAC addresses - framework." into mnc-dev
* commit '
f7b541ff749ec8336852ba781f1fa6f7abb3f6df':
Do not report WiFi and Bluetooth MAC addresses - framework.
Joe Fernandez [Tue, 19 May 2015 00:16:51 +0000 (00:16 +0000)]
am
2b18c39d: Merge "docs: M Preview landing page updates" into mnc-preview-docs
* commit '
2b18c39dacd6a14a677b13556e3c8bafa8e110d6':
docs: M Preview landing page updates
Rich Slogar [Tue, 19 May 2015 00:16:46 +0000 (00:16 +0000)]
am
3f3cde41: am
a01f2e73: am
c03a39ab: Merge "docs: emulator updates" into lmp-docs
* commit '
3f3cde41d178267aeff9a41ec56bc95ce1ad45bf':
docs: emulator updates
Svet Ganov [Tue, 19 May 2015 00:13:21 +0000 (00:13 +0000)]
Merge "Do not report WiFi and Bluetooth MAC addresses - framework." into mnc-dev
Joe Fernandez [Tue, 19 May 2015 00:07:58 +0000 (00:07 +0000)]
Merge "docs: M Preview landing page updates" into mnc-preview-docs
Vladislav Kaznacheev [Tue, 19 May 2015 00:06:35 +0000 (00:06 +0000)]
am
10e23977: am
d2368d07: Merge "Make VPA.setInterpolator(null) unset the interpolator." into lmp-mr1-ub-dev
* commit '
10e23977bd1aec6d833df1e8894f3a78eb0bd3cb':
Make VPA.setInterpolator(null) unset the interpolator.
Joe Fernandez [Tue, 19 May 2015 00:02:57 +0000 (17:02 -0700)]
docs: M Preview landing page updates
- Simplify the action links
- Remove data binding section: this is too much emphasis on that tool
Change-Id: Ic81cef14985a6cc3f14bc9176dd8311ef265d9da
Rich Slogar [Tue, 19 May 2015 00:05:35 +0000 (00:05 +0000)]
am
a01f2e73: am
c03a39ab: Merge "docs: emulator updates" into lmp-docs
* commit '
a01f2e737c23ea8a45d34b9709b9a1010385b4c5':
docs: emulator updates
Erik Kline [Sat, 16 May 2015 12:10:29 +0000 (21:10 +0900)]
Add IpReachabilityMonitor#probeAll() to begin doing DNAv4/v6-like probing
Note that this change is not sufficient to force probing in all cases,
but does cause probing to occur on Linux if the target node hasn't been
confirmed as reachable in the past 5 seconds (delay_first_probe_time).
Bug:
18581716
Bug:
19866451
Bug:
20944464
Change-Id: I29393897118311b48c966c41e2cddb7a784f136f
Adrian Roos [Mon, 18 May 2015 23:56:56 +0000 (23:56 +0000)]
am
7034954f: Merge "Prevent EmergencyDialer restart from Keyguard" into mnc-dev
* commit '
7034954f91c94b0f07db1417a016ec9d6f7775ec':
Prevent EmergencyDialer restart from Keyguard
Vladislav Kaznacheev [Mon, 18 May 2015 23:54:08 +0000 (23:54 +0000)]
am
d2368d07: Merge "Make VPA.setInterpolator(null) unset the interpolator." into lmp-mr1-ub-dev
* commit '
d2368d07a71fa77edc07be4ada89f70065bc940f':
Make VPA.setInterpolator(null) unset the interpolator.
Stefan Kuhne [Mon, 18 May 2015 23:49:03 +0000 (23:49 +0000)]
am
63b007e6: Fixing build breakage
* commit '
63b007e651f7b487b09f42f13fe03e0327edea6f':
Fixing build breakage
Adrian Roos [Mon, 18 May 2015 23:48:14 +0000 (23:48 +0000)]
Merge "Prevent EmergencyDialer restart from Keyguard" into mnc-dev
Rich Slogar [Mon, 18 May 2015 23:45:33 +0000 (23:45 +0000)]
am
c03a39ab: Merge "docs: emulator updates" into lmp-docs
* commit '
c03a39ab74f5d4c6f62d5323d4049855758fdfcf':
docs: emulator updates
Adrian Roos [Thu, 14 May 2015 23:14:29 +0000 (16:14 -0700)]
Prevent EmergencyDialer restart from Keyguard
Fixes a flicker caused by clearing the emergency
dialer task when it was already launched. Instead
we now only clear activities on top of the dialer.
Bug:
20728640
Change-Id: I8a1214c4726e4848587a81e9050a6ab63759b64f
Vladislav Kaznacheev [Mon, 18 May 2015 23:32:55 +0000 (23:32 +0000)]
Merge "Make VPA.setInterpolator(null) unset the interpolator." into lmp-mr1-ub-dev
Stefan Kuhne [Mon, 18 May 2015 23:31:37 +0000 (23:31 +0000)]
am
a2968ad5: Merge "Revert "Backup/restore recents task list"" into mnc-dev
* commit '
a2968ad51e36190ad8042ec330237905bc7fe5c1':
Revert "Backup/restore recents task list"
Selim Cinek [Mon, 18 May 2015 23:31:33 +0000 (23:31 +0000)]
am
6f145cf0: Fixed a bug that the more card was gone
* commit '
6f145cf0c02fdbd324ff2d62a86f19bff5eb7ebe':
Fixed a bug that the more card was gone
Stefan Kuhne [Mon, 18 May 2015 23:26:46 +0000 (16:26 -0700)]
Fixing build breakage
There was a merge conflict due to 2 overlapping CL's.
Bug:
20763296
Change-Id: Ib5e8476587dfd1354d288150501771df4b3b7ec8
Jeff Brown [Mon, 18 May 2015 23:08:00 +0000 (23:08 +0000)]
am
d5538758: Merge "Rename file descriptor listener API." into mnc-dev
* commit '
d5538758af0f6fea0695d3682e9aad2613ab9192':
Rename file descriptor listener API.
Adam Powell [Mon, 18 May 2015 23:07:42 +0000 (16:07 -0700)]
Migrate uses of config_windowIsRound to Configuration.isScreenRound
Move existing code that previously relied on config_windowIsRound to
use the new Configuration.isScreenRound() method. Also move the system
property override for emulators over to the initial setup of a Display
so that the configuration property is consistent with existing
expectations.
Remove config_windowIsRound from symbols.xml. The symbol now only
exists as a default value redirect for overlays already configured to
supply this value.
Change-Id: I24e6564030a6051c3ac7262868983b43e13eee65
Stefan Kuhne [Mon, 18 May 2015 23:05:10 +0000 (23:05 +0000)]
Merge "Revert "Backup/restore recents task list"" into mnc-dev
Stefan Kuhne [Mon, 18 May 2015 17:33:45 +0000 (10:33 -0700)]
Revert "Backup/restore recents task list"
Reverts commits
92dd1abef4c0a22db40c5f7bbd100e6b471a1ad3,
18795a2299fefd88ee16393f22324b999ace6ce4, and
ac6a3a5e9d90edb533e5b377a4a14ef514be955a which make-up
changes required for backing-up and restoring recent
tasks from one device to another.
The implementation had too many unresolved issues including
the ordering of the restored recent tasks which was depending
on when the task package is installed on the new device that
puts the restored recents list out of order compared to the
old device.
Bug:
15986349
Bug:
19014377
Bug:
20763296
Change-Id: I06fd35a43036ef0b7260cf4db9c42890df63b95d
Selim Cinek [Mon, 18 May 2015 22:16:08 +0000 (15:16 -0700)]
Fixed a bug that the more card was gone
Bug:
21155295
Change-Id: I7e332df71980b5a553e66b928c3e994849470ab3
Jeff Brown [Mon, 18 May 2015 22:47:45 +0000 (22:47 +0000)]
Merge "Rename file descriptor listener API." into mnc-dev
Alan Viverette [Mon, 18 May 2015 22:43:27 +0000 (22:43 +0000)]
am
365f5c2e: Merge "Update ripple drawable target radius on bounds change" into mnc-dev
* commit '
365f5c2e4be73382eefeb69a6d4a4aa5d60bc27d':
Update ripple drawable target radius on bounds change
Alan Viverette [Mon, 18 May 2015 22:43:22 +0000 (22:43 +0000)]
am
6ae9dc80: Merge "Postpone AnimatedVectorDrawable animator inflation until applyTheme()" into mnc-dev
* commit '
6ae9dc804960da833338452c25023fc747e406a1':
Postpone AnimatedVectorDrawable animator inflation until applyTheme()
Robin Lee [Tue, 12 May 2015 17:14:58 +0000 (18:14 +0100)]
Support cross-user VPN calls (with permission)
Settings and SystemUI need to act on other users than USER_OWNER.
This is gated by INTERACT_ACROSS_USERS_FULL in addition to the existing
CONTROL_VPN checks, so the number of processes able to interfere with
other profiles' VPNs should be quite small.
Bug:
20692490
Bug:
20747154
Bug:
20872408
Change-Id: I6e5d7220f73435bec350719e7b4715935caf4e19
Alan Viverette [Mon, 18 May 2015 22:32:56 +0000 (22:32 +0000)]
Merge "Update ripple drawable target radius on bounds change" into mnc-dev