OSDN Git Service
Julia Reynolds [Wed, 11 May 2016 17:19:10 +0000 (17:19 +0000)]
Merge "Swap radio button alphas." into nyc-dev
Cheryl Potter [Wed, 11 May 2016 17:16:20 +0000 (17:16 +0000)]
Merge "docs: Fix missing image in Android Monitor Overview card b/
28704424" into mnc-mr-docs am:
ae08263ac8 am:
5c273ba194
am:
1b59797ce5
* commit '
1b59797ce56e080847f6b635dc5e92707ac45fb4':
docs: Fix missing image in Android Monitor Overview card b/
28704424
Change-Id: I99842f49b7d7c927b8c720b3e161ec488c8c3cee
Cheryl Potter [Wed, 11 May 2016 17:13:34 +0000 (17:13 +0000)]
Merge "docs: Fix missing image in Android Monitor Overview card b/
28704424" into mnc-mr-docs am:
ae08263ac8
am:
5c273ba194
* commit '
5c273ba194deab8b0dc73b9632b936b7f088e7ac':
docs: Fix missing image in Android Monitor Overview card b/
28704424
Change-Id: I651132147c73a9b96373c688a34437bf1d557c87
Cheryl Potter [Wed, 11 May 2016 17:10:48 +0000 (17:10 +0000)]
Merge "docs: Fix missing image in Android Monitor Overview card b/
28704424" into mnc-mr-docs
am:
ae08263ac8
* commit '
ae08263ac81277ad25a84cc3a30917f8f78a3153':
docs: Fix missing image in Android Monitor Overview card b/
28704424
Change-Id: I59128f6ff32ffab60e5e1dd43d8008d7d7d470e8
Cheryl Potter [Wed, 11 May 2016 17:07:58 +0000 (17:07 +0000)]
Merge "docs: Fix missing image in Android Monitor Overview card b/
28704424" into mnc-mr-docs
TreeHugger Robot [Wed, 11 May 2016 16:47:26 +0000 (16:47 +0000)]
Merge "Force status bar window to be visible when expanded" into nyc-dev
Rob Carr [Wed, 11 May 2016 16:44:15 +0000 (16:44 +0000)]
Merge "PopupWindow: Be more careful with FLAG_LAYOUT_NO_LIMITS" into nyc-dev
Amith Yamasani [Wed, 11 May 2016 16:44:07 +0000 (16:44 +0000)]
Merge "Reduce wtf spam when a service onDestroy races with proc death" into nyc-dev
TreeHugger Robot [Wed, 11 May 2016 16:16:30 +0000 (16:16 +0000)]
Merge "Change webview developer setting string." into nyc-dev
Diego Perez [Wed, 11 May 2016 15:53:13 +0000 (15:53 +0000)]
Merge "Fix VectorDrawable_Delegate and DrawerLayout" into nyc-dev
Adrian Roos [Fri, 15 Apr 2016 00:49:43 +0000 (17:49 -0700)]
Force status bar window to be visible when expanded
Also don't collapse status bar if low profile gets set.
Status bar should almost never be collapsed without explicit
user action, and this only leads to issues.
Fixes:
27629489
Change-Id: Ibe5c64df578438c7224985b173a9cd967bf363bf
Jason Monk [Wed, 11 May 2016 15:27:36 +0000 (15:27 +0000)]
Merge "Add metrics constant for new settings activity" into nyc-dev
Torne (Richard Coles) [Wed, 11 May 2016 14:52:07 +0000 (15:52 +0100)]
Change webview developer setting string.
Request from UI to change string to make it clearer.
Bug:
28691051
Change-Id: Ibc2507a0e278994741c43fdadccbbe3e416b2e49
Victor Chang [Wed, 11 May 2016 14:43:13 +0000 (14:43 +0000)]
Merge "Fix ConfirmCredential is not presented before trusting cert installed by PO/DO" into nyc-dev
Todd Kennedy [Wed, 11 May 2016 14:35:18 +0000 (14:35 +0000)]
Merge "Fix secondary ABI instrumetion" into nyc-dev
Jason Monk [Fri, 6 May 2016 19:09:44 +0000 (15:09 -0400)]
Add metrics constant for new settings activity
Bug:
28554048
Change-Id: I3e2008890779867ecbc5fe485f33d52d75f0b324
Jason Monk [Tue, 10 May 2016 17:25:50 +0000 (13:25 -0400)]
Add constants for settings pages
Some settings pages weren't extending SettingsPreferenceFragment
and they need to.
Bug:
28634520
Change-Id: Iebb63027b6390974eb2070b3388763d49e9529e6
Jason Monk [Wed, 11 May 2016 13:37:17 +0000 (13:37 +0000)]
Merge "Make collapsed QS work the same as expanded" into nyc-dev
Julia Reynolds [Tue, 10 May 2016 18:33:11 +0000 (14:33 -0400)]
Swap radio button alphas.
Change-Id: I9fb4ff64a3e92659c614cfff3f23e2ba8fa3b2cd
Fixes:
27597108
TreeHugger Robot [Wed, 11 May 2016 12:38:30 +0000 (12:38 +0000)]
Merge "Log optimizing apps dialog time in seconds (and not decis)." into nyc-dev
Greg Kaiser [Wed, 11 May 2016 12:32:17 +0000 (12:32 +0000)]
Merge "GradientColor: Fix typo in documentation." into nyc-dev
Narayan Kamath [Wed, 11 May 2016 10:50:43 +0000 (11:50 +0100)]
Log optimizing apps dialog time in seconds (and not decis).
bug:
28528058
bug:
28544474
Change-Id: Ib95d5625640c3c8d27d1844c49188570d7196ee2
Joachim Sauer [Wed, 11 May 2016 09:25:07 +0000 (09:25 +0000)]
Merge "Fix AbstractStringBuilder gaining extra APIs." into nyc-dev
Donghyun Cho [Wed, 11 May 2016 06:20:08 +0000 (06:20 +0000)]
Merge "CEC: Handle <Active Source> from AVR properly" into nyc-dev
smain@google.com [Wed, 11 May 2016 05:11:32 +0000 (05:11 +0000)]
fix redirects, as per linkchecker cl: https://critique.corp.google.com/#review/
122012121 am:
0772f44acf am:
718d27d8dc
am:
53b552d7f3
* commit '
53b552d7f3f7071019a3c84d58d1e3fccc642c71':
fix redirects, as per linkchecker cl: https://critique.corp.google.com/#review/
122012121
Change-Id: Ie72fb65bdff90844cec767250cb33bbfba72c9f7
smain@google.com [Wed, 11 May 2016 05:08:30 +0000 (05:08 +0000)]
fix redirects, as per linkchecker cl: https://critique.corp.google.com/#review/
122012121 am:
0772f44acf
am:
718d27d8dc
* commit '
718d27d8dcd94a8b86ceb6e63782c8265f101570':
fix redirects, as per linkchecker cl: https://critique.corp.google.com/#review/
122012121
Change-Id: I0d6623892a7dc99a35a2ef4f2e1f9431ab111117
smain@google.com [Wed, 11 May 2016 05:05:52 +0000 (05:05 +0000)]
fix redirects, as per linkchecker cl: https://critique.corp.google.com/#review/
122012121
am:
0772f44acf
* commit '
0772f44acfb710b9e587f543f9e4424c555c9083':
fix redirects, as per linkchecker cl: https://critique.corp.google.com/#review/
122012121
Change-Id: Ie8bfb9a6fe9858300571669e1fc2efe58d55b848
smain@google.com [Wed, 11 May 2016 04:58:52 +0000 (21:58 -0700)]
fix redirects,
as per linkchecker cl: https://critique.corp.google.com/#review/
122012121
Change-Id: Ie0ff7349f5018913d63bf8c169dd4eacc7faca64
smain@google.com [Wed, 11 May 2016 03:18:57 +0000 (03:18 +0000)]
new downloads and notes for studio 2.1.1 security update am:
77f368fed9 -s ours am:
58b25d39a5 am:
2558617210
am:
3b3b5f8f31
* commit '
3b3b5f8f31693e08a5f3bcf9a24576b16be30245':
new downloads and notes for studio 2.1.1 security update
Change-Id: Idb41c0fe61c4c09dd045db9c7fcf2ba05ec438e7
smain@google.com [Wed, 11 May 2016 03:16:20 +0000 (03:16 +0000)]
new downloads and notes for studio 2.1.1 security update am:
77f368fed9 -s ours am:
58b25d39a5
am:
2558617210
* commit '
25586172107ca82f212e685c505e9f1a536ffa13':
new downloads and notes for studio 2.1.1 security update
Change-Id: I7c0a70735fa144052c57817b0d91745ac92c5251
smain@google.com [Wed, 11 May 2016 03:13:43 +0000 (03:13 +0000)]
new downloads and notes for studio 2.1.1 security update am:
77f368fed9 -s ours
am:
58b25d39a5
* commit '
58b25d39a5d778ff666fb0a9d9838a66dc071c9c':
new downloads and notes for studio 2.1.1 security update
Change-Id: If13f2134f06733cb4707cac29d8489e1b76095df
smain@google.com [Wed, 11 May 2016 03:11:28 +0000 (03:11 +0000)]
new downloads and notes for studio 2.1.1 security update
am:
77f368fed9 -s ours
* commit '
77f368fed9457c93778f7b155d883751c553a7fa':
new downloads and notes for studio 2.1.1 security update
Change-Id: Ic44876292fe62f872f2a8c165610e227c3b2453f
Joe Fernandez [Wed, 11 May 2016 02:45:44 +0000 (02:45 +0000)]
docs: DoDS Wear reference docs (regenerated) am:
95df02229c am:
bc2c9b6d4c
am:
6bbab0d7e8
* commit '
6bbab0d7e8f200be4f4f58c3cdfe433c75aaf48d':
docs: DoDS Wear reference docs (regenerated)
Change-Id: I45c17dc1369004a243e8be0738798ae362fe4932
Joe Fernandez [Wed, 11 May 2016 02:42:40 +0000 (02:42 +0000)]
docs: DoDS Wear reference docs (regenerated) am:
95df02229c
am:
bc2c9b6d4c
* commit '
bc2c9b6d4c271b7d9bd4c5ec43246e5d9a142a56':
docs: DoDS Wear reference docs (regenerated)
Change-Id: I40a099f31d71cd4c7dc30d91297a41d77d69d6eb
Joe Fernandez [Wed, 11 May 2016 02:40:01 +0000 (02:40 +0000)]
docs: DoDS Wear reference docs (regenerated)
am:
95df02229c
* commit '
95df02229cd96d2bdb6c3966f0957e9faaeb72ad':
docs: DoDS Wear reference docs (regenerated)
Change-Id: Iad7c032b5557ba856c8b59d6e492a03034804b18
Donghyun Cho [Tue, 10 May 2016 11:06:52 +0000 (20:06 +0900)]
CEC: Handle <Active Source> from AVR properly
To avoid timing issues, handling of <Active Source> was delayed until
corresponding tv input becomes ready. However, AVR is not considered as
a tv input, so delayed <Active Source> will not be processed. This
change makes <Active Source> from AVR handled immediately rather than
buffered.
Bug:
25630805
Change-Id: Iae8e86a84b5a9e5a2e62e457aaf93da67f145fac
Joe Fernandez [Wed, 11 May 2016 00:27:12 +0000 (17:27 -0700)]
docs: DoDS Wear reference docs (regenerated)
b/
28462526
Change-Id: I59874b401aafb76f965a9dc734db73abf68a1250
TreeHugger Robot [Wed, 11 May 2016 01:02:31 +0000 (01:02 +0000)]
Merge "Fail upgrades that change storage devices." into nyc-dev
Cheryl Potter [Wed, 11 May 2016 00:38:05 +0000 (17:38 -0700)]
docs: Fix missing image in Android Monitor Overview card
b/
28704424
Change-Id: I2610d56a17d40dbc81fd211a7a435be639000c65
Jorim Jaggi [Tue, 10 May 2016 02:05:22 +0000 (19:05 -0700)]
Don't stage content drawn bounds
It's certainly not needed for two up, so remove the staging aspect.
Freeform resizing is currently broken because of another bug so this
can't be tested, but because we are not "shipping" it in any case
fixing the 2-up bug is more important, but it shouldn't break freeform
anyways.
Bug:
28618501
Change-Id: I6f285a714281fde50fd7328a3f8999cfa8dfb2c5
Fyodor Kupolov [Wed, 11 May 2016 00:27:47 +0000 (00:27 +0000)]
Merge "Push unlocking/unlocked state to UserManager" into nyc-dev
Jean-Michel Trivi [Wed, 11 May 2016 00:07:46 +0000 (00:07 +0000)]
Merge "Fix javadoc missing possible return value in AudioRecordingConfiguration" into nyc-dev
Adam Lesinski [Wed, 11 May 2016 00:05:53 +0000 (00:05 +0000)]
Merge "Resource shared libraries: fix theme references" into nyc-dev
Greg Kaiser [Mon, 9 May 2016 13:09:28 +0000 (06:09 -0700)]
GradientColor: Fix typo in documentation.
Bug:
28678266
Change-Id: I8f551108643698a1b6c573911509a4e48ad88783
Amith Yamasani [Tue, 10 May 2016 22:49:51 +0000 (15:49 -0700)]
Reduce wtf spam when a service onDestroy races with proc death
Only log a message if the ServiceRecord still has a non-null app
Bug:
28527548
Change-Id: I737679a6a0cd28d265919090c6a9e955ee454379
TreeHugger Robot [Tue, 10 May 2016 23:36:42 +0000 (23:36 +0000)]
Merge "TIF: Fix comments for program start/end times" into nyc-dev
Chris Craik [Tue, 10 May 2016 23:31:21 +0000 (23:31 +0000)]
Merge "Add WebView scroll activity to UiBench" into nyc-dev
Jim Miller [Tue, 10 May 2016 01:31:22 +0000 (18:31 -0700)]
Always update cached copy of authenticatorId.
This fixes a bug where the cached copy of authenticatorId
was incorrect immediately after enrolling a new fingerprint.
During enroll, the authenticatorId is changed and needs to be updated.
The fix is to always get the new authenticatorId when we
call setActiveGroup(), which happens during every new
Fixes bug
28606914
Change-Id: I8b2d3afe67b3677b6e4516a550d874d9c2e426cd
Selim Cinek [Tue, 10 May 2016 23:14:00 +0000 (23:14 +0000)]
Merge "Fixed a bug where the content wasn't transforming in a group" into nyc-dev
Selim Cinek [Tue, 10 May 2016 23:13:50 +0000 (23:13 +0000)]
Merge "Fixed a bug where the positioning on the lockscreen was wrong" into nyc-dev
Jeff Sharkey [Tue, 10 May 2016 23:01:49 +0000 (17:01 -0600)]
Fail upgrades that change storage devices.
Now that we live in an FBE world, we need the user to be involved
with every package move to ensure that CE storage is unlocked. This
means that a package upgrade session that would require moving an
app between storage devices cannot be satisfied.
Bug:
27147501
Change-Id: I274d85cbed727d9185178b77bfc6cef196df17f5
TreeHugger Robot [Tue, 10 May 2016 22:38:25 +0000 (22:38 +0000)]
Merge "Fix density change bugs in SystemUI" into nyc-dev
Amith Yamasani [Tue, 10 May 2016 22:29:18 +0000 (22:29 +0000)]
Merge "Fix multi-window assiststructure trashing" into nyc-dev
Jae Seo [Tue, 10 May 2016 22:17:08 +0000 (15:17 -0700)]
TIF: Fix comments for program start/end times
Bug:
28681747
Change-Id: I28a7359121ca1740c043806e1532ce922c753cbc
Todd Kennedy [Tue, 10 May 2016 20:45:40 +0000 (13:45 -0700)]
Fix secondary ABI instrumetion
When installing an APK that supports multiple ABIs, the ABI installed
can be forced to the secondary ABI [i.e. On devices that support both
32 and 64 bit variants, the 32-bit version can be forced when it's
the secondary ABI.] In this case, instrumenting the class always tried
to use the primary ABI. Instead of blindly using the primary ABI and
dropping the secondary ABI, we propagate both ABIs and make a
decision on which one should be chosen.
Bug:
28406240
Change-Id: I7ebb2fd264d2281912afd30f6d73ccb460f9cf85
TreeHugger Robot [Tue, 10 May 2016 22:06:40 +0000 (22:06 +0000)]
Merge "ExifInterface: Set mPosition in AssetStream with proper values" into nyc-dev
Adam Powell [Tue, 10 May 2016 21:34:27 +0000 (21:34 +0000)]
Merge "Move Activity multi-window event logic out of the public methods" into nyc-dev
Chong Zhang [Tue, 10 May 2016 18:20:14 +0000 (11:20 -0700)]
Disable keep_screen_on traces
bug:
28692100
bug:
27522448
Change-Id: Ic077e8985f1f21bc111287813fb2992ed01df909
Winson Chung [Tue, 10 May 2016 21:33:32 +0000 (21:33 +0000)]
Merge "Reducing the number of recent tasks we keep." into nyc-dev
Chong Zhang [Tue, 10 May 2016 21:30:39 +0000 (21:30 +0000)]
Merge "Fixes for restoring more than one child surfaces" into nyc-dev
Android Build Merger (Role) [Tue, 10 May 2016 21:25:16 +0000 (21:25 +0000)]
Merge "Updating redirects to correct Studio Tips and Tricks am:
8e2431513f am:
908a8703f0 am:
c712fdcc45" into nyc-dev
Mary Yanchar [Tue, 10 May 2016 21:24:50 +0000 (21:24 +0000)]
Updating redirects to correct Studio Tips and Tricks am:
8e2431513f am:
908a8703f0
am:
c712fdcc45
* commit '
c712fdcc4524face58cec7afd711a4d66db80e8d':
Updating redirects to correct Studio Tips and Tricks
Change-Id: I04d4614b395e74e058b6b727f254612fa5d62d98
Doug Felt [Tue, 10 May 2016 21:24:34 +0000 (21:24 +0000)]
Merge "Remove rifle (1F946) from emoji font." into nyc-dev
Android Build Merger (Role) [Tue, 10 May 2016 21:22:56 +0000 (21:22 +0000)]
Merge "Updating redirects to correct Studio Tips and Tricks am:
8e2431513f am:
908a8703f0 am:
c712fdcc45" into nyc-dev
Mary Yanchar [Tue, 10 May 2016 21:22:33 +0000 (21:22 +0000)]
Updating redirects to correct Studio Tips and Tricks am:
8e2431513f am:
908a8703f0
am:
c712fdcc45
* commit '
c712fdcc4524face58cec7afd711a4d66db80e8d':
Updating redirects to correct Studio Tips and Tricks
Change-Id: Iecda302c587733e8cd8f741aa8af52cb1cf8975c
Mary Yanchar [Tue, 10 May 2016 21:19:54 +0000 (21:19 +0000)]
Updating redirects to correct Studio Tips and Tricks am:
8e2431513f
am:
908a8703f0
* commit '
908a8703f0119367255d1d1a184f2f9b9b9c074a':
Updating redirects to correct Studio Tips and Tricks
Change-Id: I4425c56a5e44b9c4426fab180ebcfbce702e660d
Keisuke Kuroyanagi [Tue, 10 May 2016 21:16:01 +0000 (21:16 +0000)]
Merge "Sum up character widths to get the last line width for ellipsis." into nyc-dev
Mary Yanchar [Tue, 10 May 2016 21:13:51 +0000 (21:13 +0000)]
Updating redirects to correct Studio Tips and Tricks
am:
8e2431513f
* commit '
8e2431513fbc32b64e240b9b39995b1217111bc6':
Updating redirects to correct Studio Tips and Tricks
Change-Id: I16c631bb7ec38fba7ba11132c85e90cb205ff26d
Selim Cinek [Tue, 10 May 2016 21:11:54 +0000 (17:11 -0400)]
Fixed a bug where the content wasn't transforming in a group
Too many booleans.
Change-Id: I1451484b1abcae3880448db60cff18ad97e9505f
Fixes:
28677158
Paul Crowley [Tue, 10 May 2016 21:07:57 +0000 (21:07 +0000)]
Merge "Revert "Two phases to set the password for disk encryption"" into nyc-dev
Adrian Roos [Thu, 5 May 2016 14:50:49 +0000 (10:50 -0400)]
Fix density change bugs in SystemUI
- Reinflate KeyguardUserSwitcher on density changes.
- Update size of UserAvatar on Keyguard.
- Fix brightness slider width in quick settings.
- Refetch and rescale user icons on density changes.
Change-Id: I961c59b8b224d6ac22cbbb8e115b8a12547a04b9
Fixes:
28535987
Fixes:
28454340
Winson [Tue, 10 May 2016 20:59:36 +0000 (13:59 -0700)]
Reducing the number of recent tasks we keep.
- This should decrease the time it takes to fetch the recent task list,
and also reduce the number of tasks we store on-disk.
- Since a user can still open a fair number of tasks within the
time-window, and this list includes tasks that are excluded from the
UI, we are just reducing it to about half for the time being.
Bug:
28318359
Change-Id: Ie21b3d3d09a567007015fbbecaf914123c71cc06
Antonio Cansado [Tue, 10 May 2016 20:58:32 +0000 (20:58 +0000)]
Merge "Addressing API council comments on NetworkStatsManager." into nyc-dev
Robert Carr [Tue, 10 May 2016 20:56:21 +0000 (13:56 -0700)]
PopupWindow: Be more careful with FLAG_LAYOUT_NO_LIMITS
If we intend to clip to the screen we can't pass NO_LIMITS.
Luckily the default behavior for LAYOUT_IN_PARENT_FRAME is to not
clip to the parent frame, so we don't have to do anything except
update our local flag we use for explicit size calculations.
Bug:
28194524
Change-Id: I1465efce7f5412cf646bccd83e23a4b049f4dbc4
Paul Crowley [Tue, 10 May 2016 20:36:56 +0000 (20:36 +0000)]
Revert "Two phases to set the password for disk encryption"
This reverts commit
17e5dce5112fece2d2b9cd070c2f96bf65108e40.
Bug:
28694324
Change-Id: I6d89bc26cb429b195c9bcf640666c495617257b7
Amith Yamasani [Tue, 10 May 2016 20:31:46 +0000 (20:31 +0000)]
Merge "Fix the issue that App crash on startForeground" into nyc-dev
Sudheer Shanka [Tue, 10 May 2016 20:28:35 +0000 (20:28 +0000)]
Merge "Update docs for DELETE_PACKAGES permission." into nyc-dev
Selim Cinek [Tue, 10 May 2016 19:50:53 +0000 (15:50 -0400)]
Fixed a bug where the positioning on the lockscreen was wrong
Because of a circular dependancy of calculating the notification
heights and setting them to GONE, the views could be laid out in a
wrong fashion. Another issue was that ambient notifications would
still be taken into account as well as removed notifications.
This also lead to a bug where the removal of notifications could
lead to unnecessary add animations when swiping them away.
Change-Id: If9ad81237a520b14dc6851df3af52406d192a7a7
Fixes:
28441832
Antonio Cansado [Wed, 30 Mar 2016 18:37:18 +0000 (11:37 -0700)]
Addressing API council comments on NetworkStatsManager.
Callbacks
- DataUsageCallback renamed to UsageCallback
- DataUsagePolicy removed; passing in params directly to register method
- making it an abstract class
- passing in (networkType, subscriberId) that reached its threshold
- renaming onLimitReached to onThresholdReached to match existing naming
- only monitor single network,subscriberId
- no monitoring of specific uids; using device or user wide instead
Tags
- only owner uid can read its tags
- exposing only TAG_NONE to match service side
BUG:
27530098
Change-Id: I2b2664da71806868a1e937d2bf4d1f234637509b
Phil Weaver [Tue, 10 May 2016 20:18:11 +0000 (20:18 +0000)]
Merge "Reduce cost of a11y services with magnification." into nyc-dev
Paul Crowley [Tue, 10 May 2016 20:12:40 +0000 (20:12 +0000)]
Merge "Hide notification before tie managed profile lock" into nyc-dev
Chong Zhang [Mon, 9 May 2016 19:47:11 +0000 (12:47 -0700)]
Fixes for restoring more than one child surfaces
App may have more than one windows and subwindows. Remember which ones
are visible at the last setAppVisibility time, and restore only those
that was visible then. If the app itself requested to hide a window
before that, we don't want to use the window for early animation.
Also move mAnimatingWithSavedSurface into WindowState as it needs to
be tracked per window.
bug:
27455025
bug:
28296945
Change-Id: I3ed1879634fa7709de699d4518d8fcfc91a85554
Mary Yanchar [Tue, 10 May 2016 19:58:42 +0000 (12:58 -0700)]
Updating redirects to correct Studio Tips and Tricks
Updating the _redirects.yaml to correct the Studio Tips and Tricks
redirect, to match the CL already submitted in Piper (
121956464).
Bug:
28680261
Change-Id: I7fc075d26061c37a7b2ba20d91b6deca4dae6557
Andreas Gampe [Tue, 10 May 2016 19:55:41 +0000 (19:55 +0000)]
Merge "Frameworks/base: Shorten system property" into nyc-dev
Andreas Gampe [Tue, 10 May 2016 19:51:45 +0000 (12:51 -0700)]
Frameworks/base: Shorten system property
Otherwise it's too long.
Bug:
26877591
Change-Id: I741186a9fbea6ee50df6cef58d528ec58662c772
Doug Felt [Tue, 10 May 2016 19:50:25 +0000 (12:50 -0700)]
Remove rifle (1F946) from emoji font.
Bug:
28678310
Change-Id: I60097cd78f28764d83abe0d12b53e2a7e6c974dc
TreeHugger Robot [Tue, 10 May 2016 19:47:40 +0000 (19:47 +0000)]
Merge "Don't even try adjusting when dock is minimized" into nyc-dev
Keisuke Kuroyanagi [Tue, 10 May 2016 19:21:33 +0000 (12:21 -0700)]
Sum up character widths to get the last line width for ellipsis.
To properly apply ellipsis, we virtually concatenate the last line and
overflowed lines after line breaking for a paragraph.
Previously, width of the concatenated line was computed by summing up all
line's width. However, the width is wrong when there are any trailing
white spaces that can be normal white spaces by concatenating lines.
With this CL, we sum up widths of all characters in lines except the last
overflowed line.
Bug:
28599066
Change-Id: I41d828ee8eb8a702cd5096d626b307cbb3467047
Amith Yamasani [Tue, 10 May 2016 18:44:12 +0000 (11:44 -0700)]
Fix multi-window assiststructure trashing
When multiple activities within the same process
try to handle requests for AssistStructure, the
singleton mLastAssistStructure tends to trash
the old structure when a second window's request
comes in.
This change passes in a sessionId so that the
cache is only cleared if the session id changes.
Bug:
28348867
Change-Id: I07efcd933db7e48aefd25a1c95493b71bbcffe4b
TreeHugger Robot [Tue, 10 May 2016 19:17:02 +0000 (19:17 +0000)]
Merge "Simplify permitted-path construction" into nyc-dev
Ricky Wai [Tue, 10 May 2016 19:11:59 +0000 (20:11 +0100)]
Hide notification before tie managed profile lock
We should hide the notification asap before setting
managed profile lock, to reduce the time that user is unlocked
while the notification is still showing.
Bug:
28689675
Change-Id: I289302302e3079726998adefebe2e8b113b2e52a
Svetoslav Ganov [Tue, 10 May 2016 18:52:15 +0000 (18:52 +0000)]
Merge "Don't throw runtime exceptions for permission flags" into nyc-dev
Cheryl Potter [Tue, 10 May 2016 18:37:18 +0000 (18:37 +0000)]
docs: Add redirects for deleted files on AS devsite b/
28679461 am:
bc753be9e3 am:
90f143e1f3
am:
9f2b8642a8
* commit '
9f2b8642a8d496cceb0e0ab3ed0f67ae7f357ae0':
docs: Add redirects for deleted files on AS devsite b/
28679461
Change-Id: I3a1ae7b5c76cb6395ea2bfbfe8cea223fecf653a
Cheryl Potter [Tue, 10 May 2016 18:34:39 +0000 (18:34 +0000)]
docs: Add redirects for deleted files on AS devsite b/
28679461 am:
bc753be9e3
am:
90f143e1f3
* commit '
90f143e1f384ae37878e46997e43b171384c421d':
docs: Add redirects for deleted files on AS devsite b/
28679461
Change-Id: I9e5c8225010dbfa631c6f51fad094def57e4db15
Cheryl Potter [Tue, 10 May 2016 18:32:01 +0000 (18:32 +0000)]
docs: Add redirects for deleted files on AS devsite b/
28679461
am:
bc753be9e3
* commit '
bc753be9e3838cedfb2b45ef2076cc71f2cbe9b5':
docs: Add redirects for deleted files on AS devsite b/
28679461
Change-Id: I196bb7059c78439d051a5e3e9daac0033e4c6595
Jorim Jaggi [Tue, 10 May 2016 01:44:34 +0000 (18:44 -0700)]
Don't even try adjusting when dock is minimized
Bug:
28652219
Change-Id: I61fa515ec945e1da6b9e7a53766abea2fb1e606e
Fyodor Kupolov [Tue, 10 May 2016 02:10:53 +0000 (19:10 -0700)]
Push unlocking/unlocked state to UserManager
Push unlocking/unlocked state to UserManagerInternal when it's changed in
UserController. Use UserManagerInternal.isUserUnlockingOrUnlocked when
updating flags for filtering in PackageManager.
Bug:
28629076
Change-Id: I8440af090f533f93870d0cff0e3871e114c37efa
Cheryl Potter [Tue, 10 May 2016 05:08:18 +0000 (22:08 -0700)]
docs: Add redirects for deleted files on AS devsite
b/
28679461
Change-Id: I825cf17a4065b1af67fa1792cf66e50c30208e17
Narayan Kamath [Tue, 10 May 2016 17:56:21 +0000 (17:56 +0000)]
Merge "Use MetricsLogger.histogram for optimizing app statistics." into nyc-dev
Chong Zhang [Tue, 10 May 2016 17:53:25 +0000 (17:53 +0000)]
Merge "Make sure preserved surface is removed when it's no longer needed" into nyc-dev