Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
206,560 Commits 3 Branches 0 Tags
4eafb7a0d2e1fbd1d858a3cd190f87db4c090b79
Commit Graph

50872 Commits

Author SHA1 Message Date
Carlos Valdivia
4eafb7a0d2 am 50cf5e3a: am 1aefc776: am 4e976dd1: am cc3c93d3: am 97cf0f1d: Merge "Revert "Revert "Security: AccountChooser shouldn\'t auto reveal accounts.""" into mnc-dev 
* commit '50cf5e3a2bd544f4661660756ffc4c67d5afbb21':
  Revert "Revert "Security: AccountChooser shouldn't auto reveal accounts.""
 2015-07-14 16:49:09 +00:00
Mady Mellor
2f30e890cd am 604b1138: am 8fe9a017: am 441ad4df: am 7fac4d6c: am 1c277ca8: Merge "Fix: line slop shouldn\'t always increase / decrease by one line" into mnc-dev 
* commit '604b1138f166a75b80c79243432798416a843c93':
  Fix: line slop shouldn't always increase / decrease by one line
 2015-07-14 16:49:01 +00:00
Mady Mellor
60ca990850 am ee4d90ba: am 8f85f645: am 9d4cd8cf: am 24950db2: am a9f07ccf: Merge "Fix line slop issue at end of line for Thai & CJK" into mnc-dev 
* commit 'ee4d90ba0d5abbb7379e6f47d97c12619bbfeeee':
  Fix line slop issue at end of line for Thai & CJK
 2015-07-14 16:48:54 +00:00
Chris Craik
f689dfc549 am f451be08: am e8a5ae29: am 3b34b006: am be10a866: am 9f004920: Merge "Reduce cost of span type checking" into mnc-dev 
* commit 'f451be081f5460a10b6ccf2d5e129ee69241da0f':
  Reduce cost of span type checking
 2015-07-14 16:48:28 +00:00
Carlos Valdivia
50cf5e3a2b am 1aefc776: am 4e976dd1: am cc3c93d3: am 97cf0f1d: Merge "Revert "Revert "Security: AccountChooser shouldn\'t auto reveal accounts.""" into mnc-dev 
* commit '1aefc7769804ad1b593355f7bd71e4d6f962d132':
  Revert "Revert "Security: AccountChooser shouldn't auto reveal accounts.""
 2015-07-14 16:26:35 +00:00
Mady Mellor
604b1138f1 am 8fe9a017: am 441ad4df: am 7fac4d6c: am 1c277ca8: Merge "Fix: line slop shouldn\'t always increase / decrease by one line" into mnc-dev 
* commit '8fe9a0173ea9dd7334c5a634dea76055097e04ab':
  Fix: line slop shouldn't always increase / decrease by one line
 2015-07-14 16:26:18 +00:00
Mady Mellor
ee4d90ba0d am 8f85f645: am 9d4cd8cf: am 24950db2: am a9f07ccf: Merge "Fix line slop issue at end of line for Thai & CJK" into mnc-dev 
* commit '8f85f645154d02a3808ed3f3a3353d836fd994a5':
  Fix line slop issue at end of line for Thai & CJK
 2015-07-14 16:26:11 +00:00
Chris Craik
f451be081f am e8a5ae29: am 3b34b006: am be10a866: am 9f004920: Merge "Reduce cost of span type checking" into mnc-dev 
* commit 'e8a5ae29a0898de1a3194c079821091859afac31':
  Reduce cost of span type checking
 2015-07-14 16:25:40 +00:00
Paul Crowley
d2c9d0d92c Revert "am 8ae629f6: am 63690fa5: am 140ff7a5: am bac3d093: Merge "Delete the user key when deleting a user." into mnc-dr-dev" 
This reverts commit c5da3fe1de, reversing
changes made to d884b41331.
 2015-07-14 15:42:29 +01:00
Paul Crowley
c5da3fe1de am 8ae629f6: am 63690fa5: am 140ff7a5: am bac3d093: Merge "Delete the user key when deleting a user." into mnc-dr-dev 
* commit '8ae629f6cbda2ad55a1b6f3f508a04dc348ed796':
  Delete the user key when deleting a user.
 2015-07-14 12:00:55 +00:00
Seigo Nonaka
39ed6e7661 Merge "Update fullscreen state on hiding window." 2015-07-14 06:17:47 +00:00
Seigo Nonaka
93c47eab2b Update fullscreen state on hiding window. 
Need to update fullscreen state on hiding window as well as showing
window, otherwise IMM#isFullscreenWindow reports obsolete state after
hiding window by back key or device rotation.

Bug: 22238567
Change-Id: Ic8de161cd5d2ee161f32b9942cdc2c331ea4d48e
 2015-07-14 15:08:52 +09:00
Paul Crowley
8ae629f6cb am 63690fa5: am 140ff7a5: am bac3d093: Merge "Delete the user key when deleting a user." into mnc-dr-dev 
* commit '63690fa5b056523e2dce52fe9dc2954e92b55bca':
  Delete the user key when deleting a user.
 2015-07-13 23:51:03 +00:00
Paul Crowley
4e1174d9a7 am 7b6493a7: am 62d43bd9: am 9e0e6991: Merge "Use mount service to create user dirs." into mnc-dr-dev 
* commit '7b6493a7b7da70610735b87c30f0c2c9d0cf0ea1':
  Use mount service to create user dirs.
 2015-07-13 23:50:58 +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
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
Derek Sollenberger
1f4fb3c468 Merge "Move drawRegion from DisplayList to Canvas" 2015-07-13 17:53:28 +00:00
Derek Sollenberger
94394b3fb0 Move drawRegion from DisplayList to Canvas 
Change-Id: I9f401dc5b24732938ac2ca7ed829796e2d7ef3e8
 2015-07-13 13:48:08 -04:00
Neil Fuller
fcd6558370 am b662579e: am 3ecbca50: am 886630c0: Merge "Switch shutdownInput / shutdownOutput to using Os.shutdown." 
* commit 'b662579ec04c69bfd79ab7f9beaceca9135da57d':
  Switch shutdownInput / shutdownOutput to using Os.shutdown.
 2015-07-13 15:37:53 +00:00
Neil Fuller
b662579ec0 am 3ecbca50: am 886630c0: Merge "Switch shutdownInput / shutdownOutput to using Os.shutdown." 
* commit '3ecbca5081f26ca03ef6b8b68767753343e67f38':
  Switch shutdownInput / shutdownOutput to using Os.shutdown.
 2015-07-13 15:26:09 +00:00
Derek Sollenberger
1d69248667 Merge "Remove unused functions and variables from DisplayListCanvas" 2015-07-13 12:06:08 +00: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
Robin Lee
ec4b8c8f27 am f8b96edf: am 81093dd0: am 51cfb3a4: am 2164cf4f: am f180fe31: Merge "Legacy VPN calls to require a userID" into mnc-dev 
* commit 'f8b96edf47b4d54ccc91842c16cc505901459cae':
  Legacy VPN calls to require a userID
 2015-07-10 20:17:52 +00: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
f8b96edf47 am 81093dd0: am 51cfb3a4: am 2164cf4f: am f180fe31: Merge "Legacy VPN calls to require a userID" into mnc-dev 
* commit '81093dd04bc1fdfe1f7389baefb891122e232ff9':
  Legacy VPN calls to require a userID
 2015-07-10 20:03:02 +00:00
Raph Levien
bcedba1149 am 8b21d785: am c10176a4: am dbcd049a: am 9320bb08: am 5d1654a9: Merge "Fix StaticLayout crash when maxLines = 0" into mnc-dev 
* commit '8b21d785af995cac02eab53644f03bda90f4c383':
  Fix StaticLayout crash when maxLines = 0
 2015-07-10 19:47:11 +00:00
Raph Levien
8b21d785af am c10176a4: am dbcd049a: am 9320bb08: am 5d1654a9: Merge "Fix StaticLayout crash when maxLines = 0" into mnc-dev 
* commit 'c10176a419b4b95a64d9d20e5137c545a4472747':
  Fix StaticLayout crash when maxLines = 0
 2015-07-10 19:33:05 +00: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
Derek Sollenberger
cc882b6518 Remove unused functions and variables from DisplayListCanvas 
This also moves some functions that are only called when creating/completing
a displayList into the appropriate constructors and endRecording calls.

Change-Id: I9f6add156d7f476a52766934af713b0f852c8dea
 2015-07-10 19:32:30 +00:00
Robert Greenwalt
fc9f21f701 am cc5cd900: am e84c6b37: am 2cef47ff: am 66f59dc1: am 1570b6b3: Merge "Enable EMERGENCY mobile connections." into mnc-dev 
* commit 'cc5cd90029a1968ec3126f73735fef3234a31678':
  Enable EMERGENCY mobile connections.
 2015-07-10 19:32:12 +00:00
Robert Greenwalt
cc5cd90029 am e84c6b37: am 2cef47ff: am 66f59dc1: am 1570b6b3: Merge "Enable EMERGENCY mobile connections." into mnc-dev 
* commit 'e84c6b37f4859371e274b30035a1a5ec04307f66':
  Enable EMERGENCY mobile connections.
 2015-07-10 19:17:55 +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
John Reck
07957aa476 am 5159f778: am f01a4710: am 1e2063fb: am d1b16386: am 2c7ed6e8: Merge "Improve ImageView drawable re-use" into mnc-dev 
* commit '5159f778f0ea497327bc6efc6029ae95a1d1af05':
  Improve ImageView drawable re-use
 2015-07-10 18:57:03 +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