Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
202,640 Commits 3 Branches 0 Tags
87ea7e2fb6b81a53664a404be52d03025705f7e2
Commit Graph

54395 Commits

Author SHA1 Message Date
Rubin Xu
87ea7e2fb6 am cf9aebf1: Merge "Remove ExternalStorageFormatter" into mnc-dev 
* commit 'cf9aebf138a3ec07277b1e5564751d2396a155c0':
  Remove ExternalStorageFormatter
 2015-07-13 14:06:04 +00:00
Rubin Xu
cf9aebf138 Merge "Remove ExternalStorageFormatter" into mnc-dev 2015-07-13 13:55:53 +00:00
Billy Lau
462ab2555e 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 07:21:51 +00:00
Zhijun He
6fe81428df am 4fb81253: Camera metadata: fix typos. 
* commit '4fb81253edc726936d4b71b7e9c0789cab45e9da':
  Camera metadata: fix typos.
 2015-07-13 07:21:44 +00:00
Raph Levien
4a4a4505d5 am 1b3d0351: Merge "Improve Html.toHtml() documentation" into mnc-dev 
* commit '1b3d03512e7bc759d3cd340280d7a5c59195a063':
  Improve Html.toHtml() documentation
 2015-07-13 07:21:03 +00:00
Carlos Valdivia
d4d6021785 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 07:20:11 +00:00
Mady Mellor
b5d3e0cc10 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 07:19:59 +00:00
Mady Mellor
b0fd6bf0d9 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 07:19:50 +00:00
Chris Craik
0fa464e7f5 am 9f004920: Merge "Reduce cost of span type checking" into mnc-dev 
* commit '9f0049200824ae523a6cd39b9866c709d42e3075':
  Reduce cost of span type checking
 2015-07-13 07:19:10 +00: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
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
dcc4b2597f am f180fe31: Merge "Legacy VPN calls to require a userID" into mnc-dev 
* commit 'f180fe31de4cc428c298a2faed394c417ade5483':
  Legacy VPN calls to require a userID
 2015-07-10 19:17:06 +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
3991abf987 am 5d1654a9: Merge "Fix StaticLayout crash when maxLines = 0" into mnc-dev 
* commit '5d1654a9439f0ed81ecccecfacda34872270dfcb':
  Fix StaticLayout crash when maxLines = 0
 2015-07-10 18:48:57 +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
313e8adfd0 am 1570b6b3: Merge "Enable EMERGENCY mobile connections." into mnc-dev 
* commit '1570b6b3c7d1d41a52555312d161d0afe4b81df3':
  Enable EMERGENCY mobile connections.
 2015-07-10 18:34:40 +00:00
Robert Greenwalt
1570b6b3c7 Merge "Enable EMERGENCY mobile connections." into mnc-dev 2015-07-10 18:23:24 +00:00
John Reck
d179ca49ea am 2c7ed6e8: Merge "Improve ImageView drawable re-use" into mnc-dev 
* commit '2c7ed6e80a7e9504a0c0e13a27e54332c603d1cc':
  Improve ImageView drawable re-use
 2015-07-10 17:59:37 +00:00
John Reck
2c7ed6e80a Merge "Improve ImageView drawable re-use" into mnc-dev 2015-07-10 17:50:28 +00:00
Paul Jensen
9c2df94fbc am 00c64f7c: Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev 
* commit '00c64f7ca5b05384dc3c208eff43e0b1a037a7d0':
  Add android.net.CaptivePortal class for captive-portal-handling-app callbacks
 2015-07-10 17:33:43 +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
Bart Sears
b7508fc159 am 1aa40492: Merge "Revert "Security: AccountChooser shouldn\'t auto reveal accounts."" into mnc-dev 
* commit '1aa4049286e7ed1272ce84619f41c13a4d217395':
  Revert "Security: AccountChooser shouldn't auto reveal accounts."
 2015-07-10 17:00:04 +00:00
Eino-Ville Talvala
aebf04e5df am a2cd9c56: Merge "Camera2: Reorganize high-speed recording API slightly" into mnc-dev 
* commit 'a2cd9c56f8648b5a4faee14d9dd0c4151730f78c':
  Camera2: Reorganize high-speed recording API slightly
 2015-07-10 16:59:57 +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
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
5e424a9854 am 319883c8: Merge "Security: AccountChooser shouldn\'t auto reveal accounts." into mnc-dev 
* commit '319883c80e13ca980b2721a947805cde1999f204':
  Security: AccountChooser shouldn't auto reveal accounts.
 2015-07-10 01:45:31 +00:00
Dianne Hackborn
40d23c1a26 am a681d7d9: Merge "Improve alarm manager docs." into mnc-dev 
* commit 'a681d7d92b6938194d5670a11b79486365cbcd72':
  Improve alarm manager docs.
 2015-07-10 01:45:17 +00:00
John Reck
c2d0d09015 am b7ba1220: Teach ImageView to recycle internal drawables 
* commit 'b7ba1220a3dc3012d2e22825eaeb0e643333f5a4':
  Teach ImageView to recycle internal drawables
 2015-07-10 01:45:02 +00:00
Svet Ganov
1d8cf5316c am 171fe6ac: Merge "Add an API for apps to query if a permisison is denied by policy." into mnc-dev 
* commit '171fe6ac0aa5b0d2dd64ac1cdda25cdcb5f183f3':
  Add an API for apps to query if a permisison is denied by policy.
 2015-07-10 01:44:45 +00:00
John Reck
75bcfeabb9 am 4ee9b23a: Merge "Delete dead code" into mnc-dev 
* commit '4ee9b23a6f1856bfe7fa810b585b4ced02745d65':
  Delete dead code
 2015-07-10 01:44:38 +00:00
Adrian Roos
172d48cf87 am 4d8134c1: Merge "Fix black keyguard / missing status bar" into mnc-dev 
* commit '4d8134c1b9e11c2b3a92195fb753da7b144bad1e':
  Fix black keyguard / missing status bar
 2015-07-10 01:44:21 +00:00
Dianne Hackborn
cc9648500c am 0e7d497c: Merge "Fix issue #22328792: Fix scalability issues in AssistStructure" into mnc-dev 
* commit '0e7d497c10c4f5096cf4cd32a56784fd18ab0f2c':
  Fix issue #22328792: Fix scalability issues in AssistStructure
 2015-07-10 01:43:39 +00:00
Fyodor Kupolov
9be2a462c8 am a1790304: Do not return devices when caller has no location permission 
* commit 'a179030483a1f3f672be41797dc6e0f077ef4748':
  Do not return devices when caller has no location permission
 2015-07-10 01:43:31 +00:00
Christopher Tate
e41a21e1c2 am adebbeba: Merge "Remote extraneous debugging log message" into mnc-dev 
* commit 'adebbebaa7d516628b5946dd023ff8726e75d2b0':
  Remote extraneous debugging log message
 2015-07-10 01:43:05 +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
Dianne Hackborn
14c5ab4cb9 Improve alarm manager docs. 
Change-Id: I7547b48327a709783d908509efc7afd1a3f1a06a
 2015-07-09 18:17:54 -07:00