Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
197,520 Commits 3 Branches 0 Tags
cf00a86461bb39ca5cb6461cab280aeb4d42bab3
Commit Graph

53495 Commits

Author SHA1 Message Date
Zhijun He
cf00a86461 am a9fc8aa3: am 4fb81253: Camera metadata: fix typos. 
* commit 'a9fc8aa3c88e7b837be65abf6f3b0f3e2e9a4a1e':
  Camera metadata: fix typos.
 2015-07-13 23:35:09 +00:00
Raph Levien
073477a18e am 93a2c97d: am 1b3d0351: Merge "Improve Html.toHtml() documentation" into mnc-dev 
* commit '93a2c97dc71b211de1e9e3a7a64aa301309f3308':
  Improve Html.toHtml() documentation
 2015-07-13 23:34:55 +00:00
Carlos Valdivia
4e976dd141 am cc3c93d3: am 97cf0f1d: Merge "Revert "Revert "Security: AccountChooser shouldn\'t auto reveal accounts.""" into mnc-dev 
* commit 'cc3c93d30cd16597eb1e551d36237692cdb1299d':
  Revert "Revert "Security: AccountChooser shouldn't auto reveal accounts.""
 2015-07-13 23:33:31 +00:00
Mady Mellor
441ad4df23 am 7fac4d6c: am 1c277ca8: Merge "Fix: line slop shouldn\'t always increase / decrease by one line" into mnc-dev 
* commit '7fac4d6cc41cab81b2b2202725ae69782f9bcce9':
  Fix: line slop shouldn't always increase / decrease by one line
 2015-07-13 23:33:26 +00:00
Mady Mellor
9d4cd8cf48 am 24950db2: am a9f07ccf: Merge "Fix line slop issue at end of line for Thai & CJK" into mnc-dev 
* commit '24950db2768def06509e9bfd4ed6ecb47318f31d':
  Fix line slop issue at end of line for Thai & CJK
 2015-07-13 23:33:22 +00:00
Chris Craik
3b34b0061b am be10a866: am 9f004920: Merge "Reduce cost of span type checking" into mnc-dev 
* commit 'be10a86620947bfee882c50ae725ceb10cbae98f':
  Reduce cost of span type checking
 2015-07-13 23:33:08 +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
Paul Crowley
140ff7a50b am bac3d093: Merge "Delete the user key when deleting a user." into mnc-dr-dev 
* commit 'bac3d0936dfdb4d594873fd8690e8017e748ed96':
  Delete the user key when deleting a user.
 2015-07-13 22:34:51 +00:00
Paul Crowley
62d43bd9e8 am 9e0e6991: Merge "Use mount service to create user dirs." into mnc-dr-dev 
* commit '9e0e69915a2e45dd5ba158e0436571551a672636':
  Use mount service to create user dirs.
 2015-07-13 22:34:47 +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
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
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 Craik
fc121c2430 Reduce cost of span type checking 
bug:22378829

Change-Id: I1da5154b2fb4f5032eaed44586d5470d28ceb45b
 2015-07-10 13:12:35 -07:00
Robin Lee
51cfb3a4d6 am 2164cf4f: am f180fe31: Merge "Legacy VPN calls to require a userID" into mnc-dev 
* commit '2164cf4f4043b4892db5688ed53624af758fcdaa':
  Legacy VPN calls to require a userID
 2015-07-10 19:32:40 +00: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
dbcd049ac8 am 9320bb08: am 5d1654a9: Merge "Fix StaticLayout crash when maxLines = 0" into mnc-dev 
* commit '9320bb082f53dfdf34881907a736527b3bdd9b45':
  Fix StaticLayout crash when maxLines = 0
 2015-07-10 19:04:51 +00:00
Robert Greenwalt
2cef47ff86 am 66f59dc1: am 1570b6b3: Merge "Enable EMERGENCY mobile connections." into mnc-dev 
* commit '66f59dc1bde15be207d49fafb97db372cb01d977':
  Enable EMERGENCY mobile connections.
 2015-07-10 18:52:25 +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
1e2063fb22 am d1b16386: am 2c7ed6e8: Merge "Improve ImageView drawable re-use" into mnc-dev 
* commit 'd1b16386e7a2c793bb0fc3d19708f1c2853e92da':
  Improve ImageView drawable re-use
 2015-07-10 18:14:19 +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
2cb16d2e71 am 75a43340: am 00c64f7c: Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev 
* commit '75a43340b675fd13eac05965438aaac2a7164658':
  Add android.net.CaptivePortal class for captive-portal-handling-app callbacks
 2015-07-10 15:19:43 +00: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
6d583ad921 am 1773f2df: am 1aa40492: Merge "Revert "Security: AccountChooser shouldn\'t auto reveal accounts."" into mnc-dev 
* commit '1773f2df50d0d36d688b9721b6c7aca4c9b3cd6e':
  Revert "Security: AccountChooser shouldn't auto reveal accounts."
 2015-07-10 03:38:58 +00:00
Eino-Ville Talvala
9dbe6b1f61 am 3aa7069b: am a2cd9c56: Merge "Camera2: Reorganize high-speed recording API slightly" into mnc-dev 
* commit '3aa7069b60ff41b5047382d64a941a6aff23de58':
  Camera2: Reorganize high-speed recording API slightly
 2015-07-10 03:38:53 +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
ce31576df0 am be8c3eb1: am 319883c8: Merge "Security: AccountChooser shouldn\'t auto reveal accounts." into mnc-dev 
* commit 'be8c3eb19465a2bc5162b4a26c97574f110760be':
  Security: AccountChooser shouldn't auto reveal accounts.
 2015-07-10 01:54:25 +00:00
Dianne Hackborn
6b33538053 am 47306086: am a681d7d9: Merge "Improve alarm manager docs." into mnc-dev 
* commit '4730608646b19c3c230978da09050890b3d7e380':
  Improve alarm manager docs.
 2015-07-10 01:54:17 +00:00
John Reck
19cb068505 am 31ff4513: am b7ba1220: Teach ImageView to recycle internal drawables 
* commit '31ff4513d25b215f4e36ac24c313239d25998f86':
  Teach ImageView to recycle internal drawables
 2015-07-10 01:54:08 +00:00
Svet Ganov
3ceb043fcc am b7cf986e: am 171fe6ac: Merge "Add an API for apps to query if a permisison is denied by policy." into mnc-dev 
* commit 'b7cf986eb875e7a8b4489c30b73e43a52951b4f1':
  Add an API for apps to query if a permisison is denied by policy.
 2015-07-10 01:54:04 +00:00
John Reck
f8a504fcee am 1a51a136: am 4ee9b23a: Merge "Delete dead code" into mnc-dev 
* commit '1a51a136fdabe24a26b218fd1f52197093307ce5':
  Delete dead code
 2015-07-10 01:54:00 +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