John Reck
074b3ceb84
am f96d9c54: Merge "Improve resource loading by ~3x" into mnc-dev
...
* commit 'f96d9c5421b7df1c60024a0928639e18c6d96b7b':
Improve resource loading by ~3x
2015-07-13 23:03:25 +00:00
Aravind Akella
42cae4aba7
am 37511e35: Merge "Log full class name of the client activating sensors for better debugging." into mnc-dev
...
* commit '37511e35ae22ea88539f1137ea2f74c9cb17f60c':
Log full class name of the client activating sensors for better debugging.
2015-07-13 23:02:13 +00:00
Chris Wren
d5b0f69a45
am 208934ff: Merge "fix build by restoring deleted enum" into mnc-dev
...
* commit '208934ff010cc2aff7d8fee9237d6cee0e5bb563':
fix build by restoring deleted enum
2015-07-13 23:01:57 +00:00
Julia Reynolds
19fd86589b
am fbd0a444: Merge "Remove personal/device group from sideloading screen." into mnc-dev
...
* commit 'fbd0a444e787c93ee8ef8741fcf24826a8619fcb':
Remove personal/device group from sideloading screen.
2015-07-13 23:01:53 +00:00
Chris Wren
2d8e017303
am 4502bfb8: Merge "add new enums to MetricsConstans" into mnc-dev
...
* commit '4502bfb8fd5ddb15bf0cc9bfc631eda269621f29':
add new enums to MetricsConstans
2015-07-13 23:01:35 +00:00
Rubin Xu
f5d6d432af
am cf9aebf1: Merge "Remove ExternalStorageFormatter" into mnc-dev
...
* commit 'cf9aebf138a3ec07277b1e5564751d2396a155c0':
Remove ExternalStorageFormatter
2015-07-13 23:01:21 +00:00
Billy Lau
f028ba3db3
am 96d00ab3: Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev
...
* commit '96d00ab359d60197321f06b4feb3d01f3fa03a29':
Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
2015-07-13 23:00:54 +00:00
Zhijun He
a9fc8aa3c8
am 4fb81253: Camera metadata: fix typos.
...
* commit '4fb81253edc726936d4b71b7e9c0789cab45e9da':
Camera metadata: fix typos.
2015-07-13 23:00:50 +00:00
Raph Levien
93a2c97dc7
am 1b3d0351: Merge "Improve Html.toHtml() documentation" into mnc-dev
...
* commit '1b3d03512e7bc759d3cd340280d7a5c59195a063':
Improve Html.toHtml() documentation
2015-07-13 23:00:20 +00:00
Carlos Valdivia
cc3c93d30c
am 97cf0f1d: Merge "Revert "Revert "Security: AccountChooser shouldn\'t auto reveal accounts.""" into mnc-dev
...
* commit '97cf0f1d76f1747302e0171c1cd4f0655fde99c4':
Revert "Revert "Security: AccountChooser shouldn't auto reveal accounts.""
2015-07-13 22:30:24 +00:00
Mady Mellor
7fac4d6cc4
am 1c277ca8: Merge "Fix: line slop shouldn\'t always increase / decrease by one line" into mnc-dev
...
* commit '1c277ca8cd699b15e631342775d996404a75e660':
Fix: line slop shouldn't always increase / decrease by one line
2015-07-13 22:30:13 +00:00
Mady Mellor
24950db276
am a9f07ccf: Merge "Fix line slop issue at end of line for Thai & CJK" into mnc-dev
...
* commit 'a9f07ccf38709be29137dec246bca7fea976a294':
Fix line slop issue at end of line for Thai & CJK
2015-07-13 22:30:08 +00:00
Chris Craik
be10a86620
am 9f004920: Merge "Reduce cost of span type checking" into mnc-dev
...
* commit '9f0049200824ae523a6cd39b9866c709d42e3075':
Reduce cost of span type checking
2015-07-13 22:29:36 +00:00
John Reck
f96d9c5421
Merge "Improve resource loading by ~3x" into mnc-dev
2015-07-13 21:50:28 +00:00
John Reck
4feb326015
Improve resource loading by ~3x
...
Bug: 22392651
ColorStateLists were never cached because the lazy-create
of the constant state had a typo.
Resource caching in general was broken because ThemeKey did not
clone the hash code, so all keys in the cache had a hashCode
of 0 which did not match the real, uncloned ThemeKeys hash code
so the binary search in ArrayMap based off of hash code was failing.
Change-Id: I9df1628b226bfa797bed97875354c19bf64f41ad
2015-07-13 14:42:43 -07:00
Paul Crowley
bac3d0936d
Merge "Delete the user key when deleting a user." into mnc-dr-dev
2015-07-13 20:53:57 +00:00
Paul Crowley
9e0e69915a
Merge "Use mount service to create user dirs." into mnc-dr-dev
2015-07-13 20:53:09 +00:00
Aravind Akella
37511e35ae
Merge "Log full class name of the client activating sensors for better debugging." into mnc-dev
2015-07-13 18:21:37 +00:00
Chris Wren
208934ff01
Merge "fix build by restoring deleted enum" into mnc-dev
2015-07-13 17:41:49 +00:00
Julia Reynolds
fbd0a444e7
Merge "Remove personal/device group from sideloading screen." into mnc-dev
2015-07-13 17:34:20 +00:00
Chris Wren
8cba70fb05
fix build by restoring deleted enum
...
Bug: 21114836
Change-Id: Ied4a6e48c66f882f43343a21bce0b3ccccd81713
2015-07-13 12:59:01 -04:00
Chris Wren
4502bfb8fd
Merge "add new enums to MetricsConstans" into mnc-dev
2015-07-13 16:21:24 +00:00
Rubin Xu
cf9aebf138
Merge "Remove ExternalStorageFormatter" into mnc-dev
2015-07-13 13:55:53 +00:00
Julia Reynolds
9a5c9118ce
Remove personal/device group from sideloading screen.
...
Also ignore the requestedPermissionFlags of yet to be installed
packages when trying to determine if a permission is new.
Bug: 22229417
Change-Id: I59d579cdc42d64bcfdefdb06e1576959355bb7a4
2015-07-13 08:46:29 -04:00
Billy Lau
96d00ab359
Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev
2015-07-12 22:02:37 +00:00
Billy Lau
22b3f4cb15
Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
...
Raised the protection level of WRITE_SETTINGS permission to appop and also
allowed backwards compatibility with pre23 flag. Also made sure that this
permission is not added as RuntimePermission in DefaultPermissionGrantPolicy as
that breaks a lot of gmscore stuff.
Introduced new action to manage write system settings as a new API and
renamed the string that describes the managing of overlay permission.
Change-Id: Ifd25a6ddc06de68ee37015cb9fb23452e4ef10f4
2015-07-12 22:41:00 +01:00
Aravind Akella
11fce8e8c5
Log full class name of the client activating sensors for better debugging.
...
Bug: 22076400
Change-Id: Ibb8e72cfb031651e803f2eaf4b6530f809c00b6b
2015-07-12 11:56:25 -07:00
Zhijun He
4fb81253ed
Camera metadata: fix typos.
...
Bug: 22417740
Change-Id: I871b990da43132f4967faf7ee23a9a2d962c4320
2015-07-11 20:03:52 -07:00
Raph Levien
1b3d03512e
Merge "Improve Html.toHtml() documentation" into mnc-dev
2015-07-11 06:09:12 +00:00
Raph Levien
c55277d689
Improve Html.toHtml() documentation
...
The existing documentation is very terse and users were getting
confused whether the method escapes HTML metacharacters or not. Expand
the description a bit and explicitly state that metacharacters are
escaped.
Bug: 17456925
Change-Id: Icaae7fe1344629de5c0860674f3913781de18013
2015-07-10 17:44:18 -07:00
Carlos Valdivia
97cf0f1d76
Merge "Revert "Revert "Security: AccountChooser shouldn't auto reveal accounts.""" into mnc-dev
2015-07-11 00:40:09 +00:00
Mady Mellor
1c277ca8cd
Merge "Fix: line slop shouldn't always increase / decrease by one line" into mnc-dev
2015-07-11 00:30:33 +00:00
Mady Mellor
a9f07ccf38
Merge "Fix line slop issue at end of line for Thai & CJK" into mnc-dev
2015-07-11 00:26:35 +00:00
Mady Mellor
a6a0f7829f
Fix line slop issue at end of line for Thai & CJK
...
Previously touch slop for line movement was based on the line position
of the HandleView, not the previous line touched.
Thai and CJK languages don't have a space at the end of a line so
the handle jumps to the beginning of the next line. This meant that
when calculating the touch slop it'd be from the incorrect line.
This CL tracks the previous line touched and uses that instead to
calculate touch slop and applies it to the selection and insertion
handles.
Note this is *not* added to the drag accelerator because
it does not have the problem of the handle jumping to the next line
since it has no handles.
Bug: 21925162
Change-Id: If4b231725c06489ec780a5b5a308ceffee804c20
2015-07-10 16:43:32 -07:00
Chris Craik
9f00492008
Merge "Reduce cost of span type checking" into mnc-dev
2015-07-10 22:44:28 +00:00
Carlos Valdivia
a3db8acf3d
Revert "Revert "Security: AccountChooser shouldn't auto reveal accounts.""
...
Fixes api stuff.
This reverts commit f2d248db80 .
Change-Id: I75c05a17ebde4f245e1f3e0cc22e622d06534c4b
2015-07-10 14:47:07 -07:00
Chris Wren
05aa88a937
add new enums to MetricsConstans
...
Bug: 21114836
Change-Id: Id62701be012c10bc11ee1ff8aa8435e178d35684
2015-07-10 17:33:39 -04:00
Chris Craik
fc121c2430
Reduce cost of span type checking
...
bug:22378829
Change-Id: I1da5154b2fb4f5032eaed44586d5470d28ceb45b
2015-07-10 13:12:35 -07:00
Robin Lee
f180fe31de
Merge "Legacy VPN calls to require a userID" into mnc-dev
2015-07-10 19:05:38 +00:00
Raph Levien
5d1654a943
Merge "Fix StaticLayout crash when maxLines = 0" into mnc-dev
2015-07-10 18:37:49 +00:00
Robert Greenwalt
1570b6b3c7
Merge "Enable EMERGENCY mobile connections." into mnc-dev
2015-07-10 18:23:24 +00:00
John Reck
2c7ed6e80a
Merge "Improve ImageView drawable re-use" into mnc-dev
2015-07-10 17:50:28 +00:00
John Reck
5a1356916d
Improve ImageView drawable re-use
...
Bug 22403868
Initial attempt only helped if setImageBitmap() was the only
thing called but during new-loading content it's common for a
placeholder to be set via setImageDrawable.
Tweak ImageView slightly to just have a BitmapDrawable that it
lazy-creates but will hold on to for any subsequent calls
to setImageBitmap
Change-Id: I7380521c7b363d458e4cda041f1f8b2b1fb3a93a
2015-07-10 10:08:01 -07:00
Paul Jensen
00c64f7ca5
Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev
2015-07-10 14:57:13 +00:00
Bart Sears
1aa4049286
Merge "Revert "Security: AccountChooser shouldn't auto reveal accounts."" into mnc-dev
2015-07-10 03:15:57 +00:00
Eino-Ville Talvala
a2cd9c56f8
Merge "Camera2: Reorganize high-speed recording API slightly" into mnc-dev
2015-07-10 03:14:35 +00:00
Baligh Uddin
f2d248db80
Revert "Security: AccountChooser shouldn't auto reveal accounts."
...
This reverts commit c3b3f46d5f .
Change-Id: I6d156e1ad82c052606f76644fe6085f14e82a734
2015-07-10 03:01:47 +00:00
Carlos Valdivia
319883c80e
Merge "Security: AccountChooser shouldn't auto reveal accounts." into mnc-dev
2015-07-10 01:25:36 +00:00
Dianne Hackborn
a681d7d92b
Merge "Improve alarm manager docs." into mnc-dev
2015-07-10 01:19:49 +00:00
Carlos Valdivia
c3b3f46d5f
Security: AccountChooser shouldn't auto reveal accounts.
...
Bug: 9739125
Change-Id: Ib9032271def423aaafdab2505afaf6b1d3fcad06
2015-07-09 18:18:22 -07:00