drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,594 Commits 1 Branch 0 Tags
Commit Graph

104594 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
88301948c9 Improve text rendering and measurement. [DO NOT MERGE] 
1. Fix a bug where baseline of the run was modified while rendering
resulting in crooked text in some cases.

2. Use GlyphVector.getLogicalBounds() for text measurement which is more
accurate than getVisualBounds().

3. This change also optimizes text rendering by not computing the advances
for individual glyphs when not needed.

Change-Id: I66792c4d8f50eaf29afa70bccca1e6c812a3fa28
(cherry-picked from 45dbfcc781a3926d22571b6ccfa3f27ec896f119)
 2014-03-28 14:46:51 -07:00
Deepanshu Gupta
eb1fae940d Fix the measurement of text bounds. [DO NOT MERGE] 
Bug: 12366230
Change-Id: I203b678363dc7b688c744503ee10216baca658a9
(cherry-picked from 5ad7c183f39df43562c69aba21ea422ad69bdae0)
 2014-03-28 14:08:02 -07:00
Craig Mautner
4cf6286c3c am 02c7ba73: am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev 
* commit '02c7ba73e8733def289535b6d13dc6a504a0443f':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
 2014-03-25 10:29:48 -07:00
Craig Mautner
02c7ba73e8 am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev 
* commit '41bb0637ca430808ab40a0300467ea58ae0a05c3':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
 2014-03-25 10:22:56 -07:00
Craig Mautner
41bb0637ca am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev 
* commit '76e85eec845ff3688e6fd5b7bafbb5934530df4b':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
 2014-03-25 10:04:07 -07:00
Craig Mautner
76e85eec84 am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev 
* commit '3bc9971d707839f2d26e601082d654242295002d':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
 2014-03-25 09:58:17 -07:00
Craig Mautner
3bc9971d70 am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev 
* commit '95d6e32bc3c5382740a6bb418f77cf7147d833f7':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
 2014-03-25 09:52:28 -07:00
Craig Mautner
95d6e32bc3 am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev 
* commit '86f9a93e20bf33b9f5152592f4781bd253be8643':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
 2014-03-25 09:48:27 -07:00
Craig Mautner
86f9a93e20 Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev 2014-03-25 16:43:41 +00:00
Craig Mautner
0392442de8 Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs 
Previous fix to keep non-show-when-locked windows hid dialogs from
activities that had asked to be show-when-locked. That was too
restrictive.

Fixes bug 13225149.

Change-Id: I39ae9d7cbcc9b5109257f732d027bda3a2de65e4
 2014-03-22 17:15:52 -07:00
Marco Nelissen
759445c5bd resolved conflicts for merge of c53ad4cd to jb-mr2-dev 
Change-Id: I5fdbc5c8c20386f173efa8957e470a644e6c14ff
 2014-03-20 12:51:55 -07:00
Marco Nelissen
c53ad4cd80 am 072e1da2: am b17cf207: am 9ee72b65: am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev 
* commit '072e1da26e80adb4009d063428c2ef8fb65c3d6c':
  Verify certificates
 2014-03-20 11:11:16 -07:00
Marco Nelissen
072e1da26e am b17cf207: am 9ee72b65: am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev 
* commit 'b17cf207372268d91177de7efa692b2483785991':
  Verify certificates
 2014-03-20 11:06:41 -07:00
Marco Nelissen
b17cf20737 am 9ee72b65: am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev 
* commit '9ee72b65436242ab4f8f4ceb904ea5078779416c':
  Verify certificates
 2014-03-20 10:54:38 -07:00
Marco Nelissen
9ee72b6543 am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev 
* commit '665b07579aa2a74bb5425d543892da40d78b7ef8':
  Verify certificates
 2014-03-20 10:51:35 -07:00
Marco Nelissen
665b07579a am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev 
* commit '81fbdade8db4117157ea48602be121e6cf5597dd':
  Verify certificates
 2014-03-20 10:47:34 -07:00
Marco Nelissen
81fbdade8d resolved conflicts for merge of 534f3e94 to jb-mr1-dev 
Change-Id: I48ef81bc77d5ececbe9b0cf7d5e905512ca16394
 2014-03-20 10:27:58 -07:00
Marco Nelissen
534f3e9438 am a3337bc7: Merge "Verify certificates" into jb-dev 
* commit 'a3337bc7c3a98ec12b6dec281e26c34f82025bdd':
  Verify certificates
 2014-03-20 10:04:23 -07:00
Marco Nelissen
a3337bc7c3 Merge "Verify certificates" into jb-dev 2014-03-20 16:58:37 +00:00
Victoria Lease
754bf6abc0 am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit 'c8868db2a025a97e439f8a9adde565c9c83f2204':
  malloc some advances
 2014-03-19 15:08:32 -07:00
Victoria Lease
c8868db2a0 am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '737d3e5da366124d164555009fa5ee4552143cc8':
  malloc some advances
 2014-03-19 15:03:28 -07:00
Victoria Lease
737d3e5da3 am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '6b96ecca90555e04da8a4477d6dc6de83e7b9ee1':
  malloc some advances
 2014-03-19 14:57:36 -07:00
Victoria Lease
6b96ecca90 am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '32753f4f1c0dfd810d68759cce3e51cf788084f8':
  malloc some advances
 2014-03-19 14:51:58 -07:00
Victoria Lease
32753f4f1c am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '3191212259b1629cf8174416adf01522b88501ad':
  malloc some advances
 2014-03-19 14:47:23 -07:00
Victoria Lease
3191212259 am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '6eb2810318262ff36014c52384ed3cdea19bd34e':
  malloc some advances
 2014-03-19 14:40:17 -07:00
Victoria Lease
6eb2810318 am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '183f97b72faf7a0f45ad66e1b3fd9a4343cc7482':
  malloc some advances
 2014-03-19 14:32:15 -07:00
Victoria Lease
183f97b72f am 1c12f9e7: malloc some advances 
* commit '1c12f9e76298c757423155ad812890d27effafe8':
  malloc some advances
 2014-03-19 14:27:19 -07:00
Adrian Roos
88da2bfaac am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug 
* commit 'ed529a5a78ade4833a8fd2ddfaf88d68ca260e6b':
  DO NOT MERGE - Fix keyguard pattern lockout bug
 2014-03-18 13:47:58 -07:00
Adrian Roos
ed529a5a78 am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug 
* commit '500ec9ce4b7856eca480c4c7dca8df1211614102':
  DO NOT MERGE - Fix keyguard pattern lockout bug
 2014-03-18 13:41:20 -07:00
Adrian Roos
500ec9ce4b am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug 
* commit '25fb7133901f6a538d5d365f3c0c1c936e76679d':
  DO NOT MERGE - Fix keyguard pattern lockout bug
 2014-03-18 13:34:05 -07:00
Adrian Roos
25fb713390 am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug 
* commit '0b2f212204bd71700a4a32b87ac2d4c6a0c56feb':
  DO NOT MERGE - Fix keyguard pattern lockout bug
 2014-03-18 13:28:17 -07:00
Adrian Roos
0b2f212204 am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug 
* commit 'd3da8f711ec642322e497a493985bed5c43f597b':
  DO NOT MERGE - Fix keyguard pattern lockout bug
 2014-03-18 13:24:35 -07:00
Adrian Roos
d3da8f711e am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug 
* commit 'ecba937b005b07d72eadfaf93a200e0b14af2980':
  DO NOT MERGE - Fix keyguard pattern lockout bug
 2014-03-18 13:17:12 -07:00
Adrian Roos
ecba937b00 DO NOT MERGE - Fix keyguard pattern lockout bug 
(cherry picked from commit 91c9561cbe665f91e1665f30362c409ae180b127)

Bug: 13302967
Change-Id: I35e7319f8767b2320dc11d9bfe8dc034e2a39b28
 2014-03-18 18:33:14 +01:00
Victoria Lease
1c12f9e762 malloc some advances 
Bug: 13506939
Change-Id: I87ad616960c4f16bc55d8b906049dbd4f001d6a5
(cherry picked from commit 3af2a37e057b31617b8f4eeb22ac3ef85c3fd5aa)
 2014-03-18 16:22:20 +00:00
Marco Nelissen
c936d73adb Verify certificates 
b/13418320

Cherrypicked from 7e435a011dd519f76a8ec1a8ed99a22bee5c3e26
https://googleplex-android-review.git.corp.google.com/#/c/433316/

Change-Id: I39c81b1557a16c7a4666a4531a398efa91dcb00c
 2014-03-17 11:14:18 -07:00
Craig Mautner
1066fc61a3 Resolved conflicts for merge of ad63d914 to jb-mr2-dev 
Change-Id: Iea4cec4ce6f588c9f976ac5a1ff0208f1f91471b
 2014-03-13 12:35:23 -07:00
Craig Mautner
ad63d91439 am 20a4f490: am 817f5586: am 3d958f81: am 468e8e98: am 1f52437d: Show the keyguard if unsecure window on top 
* commit '20a4f490957407b9534fc453833de2fe2f276426':
  Show the keyguard if unsecure window on top
 2014-03-13 11:01:13 -07:00
Craig Mautner
20a4f49095 am 817f5586: am 3d958f81: am 468e8e98: am 1f52437d: Show the keyguard if unsecure window on top 
* commit '817f5586053ae135a59cd0768980ca741e9215b0':
  Show the keyguard if unsecure window on top
 2014-03-13 10:58:11 -07:00
Craig Mautner
817f558605 am 3d958f81: am 468e8e98: am 1f52437d: Show the keyguard if unsecure window on top 
* commit '3d958f81c54252b452631ea1bb6e7954fc7066c8':
  Show the keyguard if unsecure window on top
 2014-03-13 10:55:31 -07:00
Craig Mautner
3d958f81c5 am 468e8e98: am 1f52437d: Show the keyguard if unsecure window on top 
* commit '468e8e9873d764c090576d70aebf658e3e89bbfe':
  Show the keyguard if unsecure window on top
 2014-03-13 10:51:39 -07:00
Craig Mautner
468e8e9873 am 1f52437d: Show the keyguard if unsecure window on top 
* commit '1f52437de9aa6089a72c7c992f9e7291a6a96115':
  Show the keyguard if unsecure window on top
 2014-03-13 10:47:49 -07:00
Craig Mautner
1f52437de9 Show the keyguard if unsecure window on top 
When traversing windows save the fact that windows above the topmost
fullscreen window do not hide the lockscreen. If there is such a
window don't show it.

(cherry picked from commit ab55e524b89c13082193940a5bf8480a2c2522d9)

Fixes bug 13225149.

Change-Id: Ib6f33cbcfb2f60d8957a9184729ecdec80c6a236
 2014-03-12 22:52:26 +00:00
Paul Lawrence
8b91693683 am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '2e582d1379fa78e2693269d76d2bcd763bfbfba1':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 11:55:10 -08:00
Paul Lawrence
2e582d1379 am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '9bce4032e9b3ea3433f7c75cbfb8d784b12392aa':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 11:44:37 -08:00
Paul Lawrence
9bce4032e9 am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '08ee74b1f1c4df28faa4168114853836cc471095':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 11:40:21 -08:00
Paul Lawrence
08ee74b1f1 am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit 'ea5586ef7fc29463f8144931c2c43261d15043b1':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 11:38:01 -08:00
Paul Lawrence
ea5586ef7f am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '4be7c61a339f8200527f6df5a7b2215c96f81b4b':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 11:28:43 -08:00
Paul Lawrence
4be7c61a33 am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '5677513b7c46ca08a7fa34b9d227d7a448db6757':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 11:24:05 -08:00
Paul Lawrence
5677513b7c am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit 'da37ed8b0aebdf885a32cbe28e8fd5a2240d38c3':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 11:20:24 -08:00