OSDN Git Service
Kenny Root [Fri, 18 Apr 2014 22:50:12 +0000 (22:50 +0000)]
am
6888bee5: am
5a0cc789: am
2ed5f771: am
47231936: am
02bc4b04: am
4a62a6dc: am
451ed5f0: am
3ecaa88d: am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
6888bee598b8c88f7a93ef2da06dd5659cc92dc6':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 22:43:08 +0000 (22:43 +0000)]
am
5a0cc789: am
2ed5f771: am
47231936: am
02bc4b04: am
4a62a6dc: am
451ed5f0: am
3ecaa88d: am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
5a0cc78929bf56c153696ffa16b602acfcc40089':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 22:37:38 +0000 (22:37 +0000)]
am
2ed5f771: am
47231936: am
02bc4b04: am
4a62a6dc: am
451ed5f0: am
3ecaa88d: am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
2ed5f771c47c16e9c2be1f2025ef0a826f0290c3':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 22:31:08 +0000 (22:31 +0000)]
am
47231936: am
02bc4b04: am
4a62a6dc: am
451ed5f0: am
3ecaa88d: am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
47231936c0593b87c3c9898767327f1516a7ec22':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 22:26:03 +0000 (22:26 +0000)]
am
02bc4b04: am
4a62a6dc: am
451ed5f0: am
3ecaa88d: am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
02bc4b04239c437f88fdb82633b41cdc8a8eff6b':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 22:21:37 +0000 (22:21 +0000)]
am
4a62a6dc: am
451ed5f0: am
3ecaa88d: am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
4a62a6dce9a4b48f1c1c64e47a22d2319b852acd':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 22:14:14 +0000 (22:14 +0000)]
am
451ed5f0: am
3ecaa88d: am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
451ed5f077b9f95deae809ae620bc210c253b922':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 21:33:04 +0000 (21:33 +0000)]
am
3ecaa88d: am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
3ecaa88d83d04a0fd55b494829badbb41016f5a1':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 18:14:32 +0000 (18:14 +0000)]
am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
ecb013dbff5e33b95c49015fa375579e055911ae':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 17:12:40 +0000 (17:12 +0000)]
Merge "Use hidden API to validate APK chains" into jb-dev
Kenny Root [Thu, 17 Apr 2014 21:03:31 +0000 (14:03 -0700)]
Use hidden API to validate APK chains
Bug:
13678484
Change-Id: I28dedab74b0e24d47ab9f2190298156c909e9d54
Deepanshu Gupta [Wed, 16 Apr 2014 18:37:02 +0000 (18:37 +0000)]
am
5a125053: Merge changes I66792c4d,I203b6783 into jb-mr2-dev
* commit '
5a1250532f159842c364accf02bcfd111a6b900b':
Improve text rendering and measurement. [DO NOT MERGE]
Fix the measurement of text bounds. [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:36:58 +0000 (18:36 +0000)]
am
04b4f8d1: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev
* commit '
04b4f8d11406c64b94797af67dd7530435187129':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:36:55 +0000 (18:36 +0000)]
am
fb120acd: Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev
* commit '
fb120acd841f7d8d0e1845f5bdd98abf35cb25b4':
Add methods for Time_Delegate [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:36:52 +0000 (18:36 +0000)]
am
b7fd6315: Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
b7fd6315328c3a38fd7928f3dbb43f44227eb78b':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:36:48 +0000 (18:36 +0000)]
am
f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev
* commit '
f14cbb26edcf0838cee333bf0d6ee686bf6de333':
Optimize layout rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:34:11 +0000 (18:34 +0000)]
Merge changes I66792c4d,I203b6783 into jb-mr2-dev
* changes:
Improve text rendering and measurement. [DO NOT MERGE]
Fix the measurement of text bounds. [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:34:04 +0000 (18:34 +0000)]
Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev
Deepanshu Gupta [Wed, 16 Apr 2014 18:33:47 +0000 (18:33 +0000)]
Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev
Deepanshu Gupta [Wed, 16 Apr 2014 18:33:31 +0000 (18:33 +0000)]
Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
Deepanshu Gupta [Wed, 16 Apr 2014 18:33:10 +0000 (18:33 +0000)]
Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev
Robert Greenwalt [Mon, 7 Apr 2014 20:21:52 +0000 (20:21 +0000)]
am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
2676e36ff6fc3f779cb6f1b0db13e26d734dcbab':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:16:15 +0000 (20:16 +0000)]
am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
3e604b1198fcab0e3bf2fd29043e4172193db2b5':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:12:56 +0000 (20:12 +0000)]
am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
53691e39dca8be5dbe19bfef05b1c3e294d6c0bd':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:09:33 +0000 (20:09 +0000)]
am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
2c90609c0bddb6fbe255e5632a1e6639e760290f':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:07:10 +0000 (20:07 +0000)]
am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
128e937108035b77537f279dc0bc85a116906819':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:03:55 +0000 (20:03 +0000)]
am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
339cfdbde333984d02d189249f46e7b13317baed':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:00:33 +0000 (20:00 +0000)]
am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
106627e07cecfa8a9bcc43578fde78652fc59eba':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:57:32 +0000 (19:57 +0000)]
am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
72f9b3084cf8bf0ca01ba52a853faeeb74acdad4':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:54:13 +0000 (19:54 +0000)]
am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
e42ce676f54742f2d47c26adaa90407c2cb8cec8':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:51:34 +0000 (19:51 +0000)]
am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
4bc58bd255f3a0cd9bb3a8f7a916a3cccb96ce6b':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:48:39 +0000 (19:48 +0000)]
am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
ebf23a8d9ef7eb2d14ef19bff5525eb16604da7c':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:47:49 +0000 (19:47 +0000)]
am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
c0d94e7ac6353757b7fa4d7f6fce75c5719c7e6e':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:42:49 +0000 (19:42 +0000)]
am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
f52d1a56af8cc769c1019fbb0d8b7a2254fcc01b':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:42:32 +0000 (19:42 +0000)]
am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
74acf23a1eef75628c8fa9e2ff7ba08ed4258558':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:36:54 +0000 (19:36 +0000)]
am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
fe38ff8d36c4fa2e18f4c786692eeea5ebd94e9f':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:36:44 +0000 (19:36 +0000)]
am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
3c417fbf21133340cbbe3539d87c453f81ae3a9d':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:30:10 +0000 (19:30 +0000)]
Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
Deepanshu Gupta [Fri, 4 Apr 2014 01:54:13 +0000 (01:54 +0000)]
am
c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev
* commit '
c07a48bed2c772dc548423396b208331b22a679a':
Fix a bug in Nine Patch library. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 01:54:10 +0000 (01:54 +0000)]
am
70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
70dfe865013f0c8fedf2c9468360a41b02fcce0a':
Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 01:54:08 +0000 (01:54 +0000)]
am
2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev
* commit '
2eb5f9e5b25dc769e5ba205237097c67fa212fd6':
Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 01:54:05 +0000 (01:54 +0000)]
am
b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
b6588c522451f5015c2cbc902d5a72566f979f2b':
Fix NPE in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 01:54:03 +0000 (01:54 +0000)]
am
3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev
* commit '
3bc5b23f8dbb6ecc4eeac4334f94682056d0cb3b':
Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 01:54:00 +0000 (01:54 +0000)]
am
ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev
* commit '
ba0ce05688ff7ebf91e16f5cb741701feb706fc2':
Fix text size in Fake Action Bar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 00:45:44 +0000 (00:45 +0000)]
Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev
Deepanshu Gupta [Fri, 4 Apr 2014 00:45:29 +0000 (00:45 +0000)]
Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev
Deepanshu Gupta [Fri, 4 Apr 2014 00:45:13 +0000 (00:45 +0000)]
Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev
Deepanshu Gupta [Fri, 4 Apr 2014 00:44:01 +0000 (00:44 +0000)]
Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
Deepanshu Gupta [Fri, 4 Apr 2014 00:43:47 +0000 (00:43 +0000)]
Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev
Deepanshu Gupta [Fri, 4 Apr 2014 00:43:08 +0000 (00:43 +0000)]
Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev
Craig Mautner [Tue, 1 Apr 2014 19:54:59 +0000 (19:54 +0000)]
am
d4d2aa51: am
efbe7cc0: am
d1c82f8f: am
1cb3c1d3: am
fc80fbe3: am
7bd0b652: am
4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
* commit '
d4d2aa519fb1a9d54c14da858a4ab7ab0880f34d':
Fix FLAG_DISMISS_KEYGUARD not working
Craig Mautner [Tue, 1 Apr 2014 19:49:36 +0000 (19:49 +0000)]
am
efbe7cc0: am
d1c82f8f: am
1cb3c1d3: am
fc80fbe3: am
7bd0b652: am
4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
* commit '
efbe7cc0ff5c85cc7956bb3099402c7ebbe20591':
Fix FLAG_DISMISS_KEYGUARD not working
Craig Mautner [Tue, 1 Apr 2014 19:43:41 +0000 (19:43 +0000)]
am
d1c82f8f: am
1cb3c1d3: am
fc80fbe3: am
7bd0b652: am
4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
* commit '
d1c82f8fc22216e9b544e3a3b521bcad05bc113d':
Fix FLAG_DISMISS_KEYGUARD not working
Craig Mautner [Tue, 1 Apr 2014 19:36:48 +0000 (19:36 +0000)]
am
1cb3c1d3: am
fc80fbe3: am
7bd0b652: am
4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
* commit '
1cb3c1d381c389c7ef903c1a871ff695cd406da4':
Fix FLAG_DISMISS_KEYGUARD not working
Craig Mautner [Tue, 1 Apr 2014 19:30:41 +0000 (19:30 +0000)]
am
fc80fbe3: am
7bd0b652: am
4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
* commit '
fc80fbe3d5b287c19e3dab89fc93ca4b8a812bb1':
Fix FLAG_DISMISS_KEYGUARD not working
Craig Mautner [Tue, 1 Apr 2014 19:24:23 +0000 (19:24 +0000)]
am
7bd0b652: am
4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
* commit '
7bd0b65233d0ef34114ecb93d734dfe4351f470d':
Fix FLAG_DISMISS_KEYGUARD not working
Craig Mautner [Tue, 1 Apr 2014 19:18:36 +0000 (19:18 +0000)]
am
4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
* commit '
4bdab6bb4c55661d4915518b1190e30c4633c6a5':
Fix FLAG_DISMISS_KEYGUARD not working
Craig Mautner [Tue, 1 Apr 2014 19:05:11 +0000 (12:05 -0700)]
Fix FLAG_DISMISS_KEYGUARD not working
Fixes bug
13672528.
Change-Id: I0292aee51d5d8755bbae926e5f0e6af1e22107dc
Deepanshu Gupta [Wed, 19 Feb 2014 19:05:02 +0000 (11:05 -0800)]
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
If a style doesn't specify text style (normal/bold/italic/bold-italic)
then default to normal instead of throwing an error.
Bug: http://b.android.com/61358
Change-Id: I0138c73807a5ff6e4d938a99ece3044333110aa1
(cherry-picked from
0acfb16dcd95468fe032204f54618e86becfd1eb)
Deepanshu Gupta [Wed, 19 Feb 2014 18:53:27 +0000 (10:53 -0800)]
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
For these font families, text was always rendered as italic. This
changeset fixes the issue.
Bug: http://b.android.com/57221
Change-Id: Ic8a299bd1e555f5bb914cd3d2fe72917ec7f471a
(cherry-picked from
e327212adde1136807bbdf052e8cc3861f8a6aba)
Robert Greenwalt [Fri, 7 Feb 2014 11:52:12 +0000 (03:52 -0800)]
DO NOT MERGE Sanitize WifiConfigs
Do this both on input from apps (giving error) and between wifi and
ConnectivityService (ignoring bad data). This means removing all
addresses beyond the first and all routes but the first default and
the implied direct-connect routes.
We do this because the user can't monitor the others (no UI), their
support wasn't intended, they allow redirection of all traffic
without user knowledge and they allow circumvention of legacy VPNs.
This should not move forward from JB as it breaks IPv6 and K has
a more resilient VPN.
Bug:
12663469
Change-Id: I80912cc08ffa1e4b63008c94630006cf316e7a64
Deepanshu Gupta [Tue, 7 Jan 2014 19:58:44 +0000 (11:58 -0800)]
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)
Deepanshu Gupta [Sat, 1 Feb 2014 03:03:48 +0000 (19:03 -0800)]
Add methods for Time_Delegate [DO NOT MERGE]
Bug: http://b.android.com/65359
Change-Id: I7c2d09286d6bcd9899444aaa5a4a5a342e39d923
(cherry-picked from
eb3c5459eb893061779b102236a81069efdbef73)
Deepanshu Gupta [Tue, 21 Jan 2014 01:02:37 +0000 (17:02 -0800)]
Optimize layout rendering in layoutlib [DO NOT MERGE]
The height of a layout should be zero if it is assigned a layout_weight.
This way, the layout is measured only once and prevents spurious errors.
Bug: https://code.google.com/p/android/issues/detail?id=58398
Change-Id: If49a7480e5eb82cb86780e00f2f5b65ee053fc2a
(cherry-picked from
35d56c0d67537e56fafebd8edf790026644fe8de)
Deepanshu Gupta [Tue, 7 Jan 2014 19:58:44 +0000 (11:58 -0800)]
Fix the measurement of text bounds. [DO NOT MERGE]
Bug:
12366230
Change-Id: I203b678363dc7b688c744503ee10216baca658a9
(cherry-picked from
5ad7c183f39df43562c69aba21ea422ad69bdae0)
Robert Greenwalt [Fri, 7 Feb 2014 11:52:12 +0000 (03:52 -0800)]
DO NOT MERGE Sanitize WifiConfigs
Do this both on input from apps (giving error) and between wifi and
ConnectivityService (ignoring bad data). This means removing all
addresses beyond the first and all routes but the first default and
the implied direct-connect routes.
We do this because the user can't monitor the others (no UI), their
support wasn't intended, they allow redirection of all traffic
without user knowledge and they allow circumvention of legacy VPNs.
This should not move forward from JB as it breaks IPv6 and K has
a more resilient VPN.
Bug:
12663469
Change-Id: I98c0672a6d9c8d5bc4f160849aa0fa182073216b
Deepanshu Gupta [Thu, 6 Feb 2014 01:11:14 +0000 (17:11 -0800)]
Fix a bug in Nine Patch library. [DO NOT MERGE]
The nine patches were not drawn correctly if they were not positioned at
the top left corner of the canvas.
Bug: http://b.android.com/29959
Change-Id: Icfed522ea07322a3ee9f3955067d3da26c4b0b5b
(cherry-picked from
8a892279bd1b212311f4200f306a317985463918)
Deepanshu Gupta [Thu, 16 Jan 2014 22:16:23 +0000 (14:16 -0800)]
Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
Change-Id: I8102da6c1c4625e887293a8823770d199521c53f
(cherry-picked from
58037a4404e639d28695a0f1c17053b53b96b970)
Deepanshu Gupta [Wed, 13 Nov 2013 11:52:22 +0000 (17:22 +0530)]
Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
Issue: http://b.android.com/59497
Change-Id: Ief11e602703b6041db66241f1699cc1de72e65a5
(cherry-picked from
1f92d7fc0ffa72d7db93244c29a1a6575bb4b318)
Deepanshu Gupta [Tue, 12 Nov 2013 13:03:17 +0000 (18:33 +0530)]
Fix NPE in layoutlib. [DO NOT MERGE]
Change-Id: I36623304d83b344ea078044001577b8005a63c02
(cherry-picked from
d0581d271e814670d81a6550aa7b1e86864d5710)
Brian Carlstrom [Thu, 27 Mar 2014 22:29:08 +0000 (22:29 +0000)]
am
bea6517d: am
e0b94d1c: (-s ours) Revert "Remove doSingleCrunch call DO NOT MERGE"
* commit '
bea6517da91e9af08feb8c305ec9d9a4576dc6ad':
Revert "Remove doSingleCrunch call DO NOT MERGE"
Deepanshu Gupta [Thu, 17 Oct 2013 03:27:51 +0000 (20:27 -0700)]
Fix layoutlib [DO NOT MERGE]
Fix a NPE, and update an ICU method to return the right value as
required by DatePicker widget.
The cherry-pick differs slightly from the original to remove changes not
relevant to the current branch.
Bug:
11140701
Change-Id: Id92fc5359acf6dde1bcdbc781aaf637fdb6eecbf
(cherry-picked from
39e75835399f4d979cf82069dae2bd1ec496fb81)
Brian Carlstrom [Thu, 27 Mar 2014 22:15:24 +0000 (22:15 +0000)]
am
e0b94d1c: (-s ours) Revert "Remove doSingleCrunch call DO NOT MERGE"
* commit '
e0b94d1cf16c11406554edd035c7e1bef6d2b844':
Revert "Remove doSingleCrunch call DO NOT MERGE"
Deepanshu Gupta [Fri, 8 Nov 2013 11:13:07 +0000 (16:43 +0530)]
Fix text size in Fake Action Bar. [DO NOT MERGE]
The density multiplier was being applied twice to the title text in
the fake action bar.
Bug:
11436018
Change-Id: Id74c11037cb43d01f6cd79126623c84edfc37aaf
(cherry-picked from
f4800bc3b122828d61a34caecbf782eee170ae59)
Brian Carlstrom [Thu, 27 Mar 2014 21:50:06 +0000 (14:50 -0700)]
Revert "Remove doSingleCrunch call DO NOT MERGE"
This reverts commit
3944abbb506bb94d8e70b8b62f30225777f50648.
Craig Mautner [Tue, 25 Mar 2014 17:36:04 +0000 (10:36 -0700)]
am
4cf6286c: 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 '
4cf6286c3ccfe63bf73e6a1fb33e67d1becd16be':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Tue, 25 Mar 2014 17:29:48 +0000 (10:29 -0700)]
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
Craig Mautner [Tue, 25 Mar 2014 17:22:56 +0000 (10:22 -0700)]
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
Craig Mautner [Tue, 25 Mar 2014 17:04:07 +0000 (10:04 -0700)]
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
Craig Mautner [Tue, 25 Mar 2014 16:58:17 +0000 (09:58 -0700)]
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
Craig Mautner [Tue, 25 Mar 2014 16:52:28 +0000 (09:52 -0700)]
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
Craig Mautner [Tue, 25 Mar 2014 16:48:27 +0000 (09:48 -0700)]
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
Craig Mautner [Tue, 25 Mar 2014 16:43:40 +0000 (16:43 +0000)]
Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
Craig Mautner [Thu, 20 Mar 2014 02:48:38 +0000 (19:48 -0700)]
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
Marco Nelissen [Thu, 20 Mar 2014 20:16:32 +0000 (13:16 -0700)]
am
759445c5: resolved conflicts for merge of
c53ad4cd to jb-mr2-dev
* commit '
759445c5bdb2eb54af9e974f604226596976e078':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 19:51:55 +0000 (12:51 -0700)]
resolved conflicts for merge of
c53ad4cd to jb-mr2-dev
Change-Id: I5fdbc5c8c20386f173efa8957e470a644e6c14ff
Marco Nelissen [Thu, 20 Mar 2014 18:11:16 +0000 (11:11 -0700)]
am
072e1da2: am
b17cf207: am
9ee72b65: am
665b0757: am
81fbdade: resolved conflicts for merge of
534f3e94 to jb-mr1-dev
* commit '
072e1da26e80adb4009d063428c2ef8fb65c3d6c':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 18:06:41 +0000 (11:06 -0700)]
am
b17cf207: am
9ee72b65: am
665b0757: am
81fbdade: resolved conflicts for merge of
534f3e94 to jb-mr1-dev
* commit '
b17cf207372268d91177de7efa692b2483785991':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:54:38 +0000 (10:54 -0700)]
am
9ee72b65: am
665b0757: am
81fbdade: resolved conflicts for merge of
534f3e94 to jb-mr1-dev
* commit '
9ee72b65436242ab4f8f4ceb904ea5078779416c':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:51:35 +0000 (10:51 -0700)]
am
665b0757: am
81fbdade: resolved conflicts for merge of
534f3e94 to jb-mr1-dev
* commit '
665b07579aa2a74bb5425d543892da40d78b7ef8':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:47:34 +0000 (10:47 -0700)]
am
81fbdade: resolved conflicts for merge of
534f3e94 to jb-mr1-dev
* commit '
81fbdade8db4117157ea48602be121e6cf5597dd':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:27:58 +0000 (10:27 -0700)]
resolved conflicts for merge of
534f3e94 to jb-mr1-dev
Change-Id: I48ef81bc77d5ececbe9b0cf7d5e905512ca16394
Marco Nelissen [Thu, 20 Mar 2014 17:04:23 +0000 (10:04 -0700)]
am
a3337bc7: Merge "Verify certificates" into jb-dev
* commit '
a3337bc7c3a98ec12b6dec281e26c34f82025bdd':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 16:58:36 +0000 (16:58 +0000)]
Merge "Verify certificates" into jb-dev
Victoria Lease [Wed, 19 Mar 2014 22:14:07 +0000 (15:14 -0700)]
Victoria Lease [Wed, 19 Mar 2014 22:08:32 +0000 (15:08 -0700)]
Victoria Lease [Wed, 19 Mar 2014 22:03:28 +0000 (15:03 -0700)]
Victoria Lease [Wed, 19 Mar 2014 21:57:36 +0000 (14:57 -0700)]
Victoria Lease [Wed, 19 Mar 2014 21:51:58 +0000 (14:51 -0700)]
Victoria Lease [Wed, 19 Mar 2014 21:47:23 +0000 (14:47 -0700)]
am
31912122: am
6eb28103: am
183f97b7: am
1c12f9e7: malloc some advances
* commit '
3191212259b1629cf8174416adf01522b88501ad':
malloc some advances
OSDN Git Service
