Scott Main
b4b84f6440
am d95cad7c: am 1a7ad2cb: am be06c28e: am 36c27c4a: add search tags to Design building blocks
...
* commit 'd95cad7c8acd83f50cc0b9567da68f80d454afb0':
add search tags to Design building blocks
2013-03-18 15:24:56 -07:00
Elliott Hughes
c5c6d4167b
am 6317315e: Merge "Deliberately break DateFormat.format\'s formatting of \'k\' for compatibility."
...
* commit '6317315e733f115aa6ad0339c1a334607fd04342':
Deliberately break DateFormat.format's formatting of 'k' for compatibility.
2013-03-18 15:24:31 -07:00
Scott Main
d95cad7c8a
am 1a7ad2cb: am be06c28e: am 36c27c4a: add search tags to Design building blocks
...
* commit '1a7ad2cb1284ae7828dda821a6a94d672e8253af':
add search tags to Design building blocks
2013-03-18 15:22:09 -07:00
Scott Main
1a7ad2cb12
am be06c28e: am 36c27c4a: add search tags to Design building blocks
...
* commit 'be06c28e733bb2978173dc5dfe5ee9ed0fb9874a':
add search tags to Design building blocks
2013-03-18 15:19:45 -07:00
Scott Main
be06c28e73
am 36c27c4a: add search tags to Design building blocks
...
* commit '36c27c4a5eccea944062b38cf70712275f732068':
add search tags to Design building blocks
2013-03-18 15:17:28 -07:00
Elliott Hughes
6317315e73
Merge "Deliberately break DateFormat.format's formatting of 'k' for compatibility."
2013-03-18 22:07:22 +00:00
Scott Main
36c27c4a5e
add search tags to Design building blocks
...
Change-Id: If23fdd1a29ea9ee5edf20e4b39d512c9b8ba02f5
2013-03-18 15:05:32 -07:00
Elliott Hughes
fc55c2ba49
Deliberately break DateFormat.format's formatting of 'k' for compatibility.
...
Bug: 8359981
Change-Id: I44ed816c644f94783c77952d544c5444b966868b
2013-03-18 14:59:59 -07:00
Scott Main
0e4071c73b
am 426bece0: am e0df1cf8: am 7ff52939: am f82df78b: Merge "add tags to some docs. Training classes from top to bottom of "Connectivity and the Cloud"" into jb-mr1.1-docs
...
* commit '426bece0d5ebff2b73fce797947406c40b90b133':
add tags to some docs. Training classes from top to bottom of "Connectivity and the Cloud"
2013-03-18 14:37:56 -07:00
Scott Main
426bece0d5
am e0df1cf8: am 7ff52939: am f82df78b: Merge "add tags to some docs. Training classes from top to bottom of "Connectivity and the Cloud"" into jb-mr1.1-docs
...
* commit 'e0df1cf883c67e597eca8365bd663a35170d3225':
add tags to some docs. Training classes from top to bottom of "Connectivity and the Cloud"
2013-03-18 14:36:11 -07:00
Scott Main
e0df1cf883
am 7ff52939: am f82df78b: Merge "add tags to some docs. Training classes from top to bottom of "Connectivity and the Cloud"" into jb-mr1.1-docs
...
* commit '7ff529393c64e3601f1cd05689d2296c1e35ca02':
add tags to some docs. Training classes from top to bottom of "Connectivity and the Cloud"
2013-03-18 14:34:23 -07:00
Scott Main
7ff529393c
am f82df78b: Merge "add tags to some docs. Training classes from top to bottom of "Connectivity and the Cloud"" into jb-mr1.1-docs
...
* commit 'f82df78b3534b0ffde83fe83bdb798d3bb7ab780':
add tags to some docs. Training classes from top to bottom of "Connectivity and the Cloud"
2013-03-18 14:31:43 -07:00
Scott Main
f82df78b35
Merge "add tags to some docs. Training classes from top to bottom of "Connectivity and the Cloud"" into jb-mr1.1-docs
2013-03-18 21:29:18 +00:00
Craig Mautner
7f7ac5b4a8
am fda1bff8: Merge "Correct the target app token for input method window"
...
* commit 'fda1bff8a8eda96662577820102aaaa02a0845b6':
Correct the target app token for input method window
2013-03-18 10:38:24 -07:00
Craig Mautner
fda1bff8a8
Merge "Correct the target app token for input method window"
2013-03-18 15:56:48 +00:00
Carrie Xu
5c97184c3a
Correct the target app token for input method window
...
The root cause is:
There is a defect in window manager service: When a new
activity that can be ime target is added into window manager
but the Z order of input method window don't need to be
changed, then the target app token of input method window
would not be updated to new one. This defect may cause that
the layer of input method window is calculated incorrectly.
The solution:
Correct the target app token for input method window.
Change-Id: I008311e3c9b1cf5fc320b614d8675c183c506d50
2013-03-18 11:45:14 +09:00
Robert Greenwalt
3fafccdd18
am 519ba7b1: Merge "update APN version for MVNO"
...
* commit '519ba7b10c4e0da3586aeeaa9696349f28313898':
update APN version for MVNO
2013-03-15 17:56:52 -07:00
Robert Greenwalt
519ba7b10c
Merge "update APN version for MVNO"
2013-03-16 00:18:52 +00:00
kmccormick
3e32923425
am 088aef97: am 96a60639: am eb46c95c: am 4758e3e7: Merge "Doc update: Add memory mgt lesson to bitmaps class" into jb-mr1.1-docs
...
* commit '088aef975808497caf90f03b7eb0a0175d43e01f':
Doc update: Add memory mgt lesson to bitmaps class
2013-03-15 15:33:13 -07:00
kmccormick
088aef9758
am 96a60639: am eb46c95c: am 4758e3e7: Merge "Doc update: Add memory mgt lesson to bitmaps class" into jb-mr1.1-docs
...
* commit '96a6063943d725c9febc2bc525cb8be648c34fa5':
Doc update: Add memory mgt lesson to bitmaps class
2013-03-15 15:31:53 -07:00
kmccormick
96a6063943
am eb46c95c: am 4758e3e7: Merge "Doc update: Add memory mgt lesson to bitmaps class" into jb-mr1.1-docs
...
* commit 'eb46c95c8094e4dd09b5f99a362e55921d259bac':
Doc update: Add memory mgt lesson to bitmaps class
2013-03-15 15:30:38 -07:00
kmccormick
eb46c95c80
am 4758e3e7: Merge "Doc update: Add memory mgt lesson to bitmaps class" into jb-mr1.1-docs
...
* commit '4758e3e7c824bc5cb8b11b6536c5236145f2670f':
Doc update: Add memory mgt lesson to bitmaps class
2013-03-15 15:28:48 -07:00
kmccormick
4758e3e7c8
Merge "Doc update: Add memory mgt lesson to bitmaps class" into jb-mr1.1-docs
2013-03-15 22:26:45 +00:00
kmccormick
7571542c9d
Doc update: Add memory mgt lesson to bitmaps class
...
Change-Id: If780ad8bfabd66de21842bdb465d86ab24b2940c
2013-03-15 15:10:37 -07:00
Nick Kralevich
57eed5b416
am 38bfb5a7: Merge "app_process: don\'t pollute the environment"
...
* commit '38bfb5a7bfc0eeab68f25afad43245efd062caef':
app_process: don't pollute the environment
2013-03-15 14:36:30 -07:00
Nick Kralevich
38bfb5a7bf
Merge "app_process: don't pollute the environment"
2013-03-15 20:55:53 +00:00
Nick Kralevich
9a9350550a
app_process: don't pollute the environment
...
Give a hoot — don't pollute!
Change-Id: I30d6c05cecab483f0e9d8063907f7bc0ef2bb104
2013-03-15 13:14:52 -07:00
Nick Kralevich
9c322c7562
am f7ec4e61: Merge "Never call app_main more than once"
...
* commit 'f7ec4e61ebde9ff6d4934bd398e9ef8a39e4c28b':
Never call app_main more than once
2013-03-15 12:16:43 -07:00
Nick Kralevich
f7ec4e61eb
Merge "Never call app_main more than once"
2013-03-15 19:08:50 +00:00
Nick Kralevich
1fe21bd1b6
Never call app_main more than once
...
Different kernels seem to handle ADDR_COMPAT_LAYOUT differently,
sometimes passing it to its children, sometimes not. If it's not
passed to its child successfully, we can end up in a restart loop.
Instead of testing for the presence of ADDR_COMPAT_LAYOUT, use an
environment variable instead, which is handled more predictably.
Bug: 8392487
Change-Id: Ia531dd2abb4e1cd46f3430d844e644f53581f530
2013-03-15 11:59:03 -07:00
Nick Kralevich
6098579a20
am 1ae6ae20: Merge "Don\'t use ADDR_COMPAT_LAYOUT on the emulator"
...
* commit '1ae6ae2094fd0ab8c82ad1a347e7a8bd67d995e5':
Don't use ADDR_COMPAT_LAYOUT on the emulator
2013-03-14 17:20:12 -07:00
Nick Kralevich
1ae6ae2094
Merge "Don't use ADDR_COMPAT_LAYOUT on the emulator"
2013-03-14 23:46:20 +00:00
Nick Kralevich
5fa1ee779e
Don't use ADDR_COMPAT_LAYOUT on the emulator
...
For the emulator, we want people to see memory as it
actually is, not how we're hacking around buggy apps. Don't
set ADDR_COMPAT_LAYOUT on the emulator.
For reasons that I don't understand, personality(ADDR_COMPAT_LAYOUT)
does not persist across an exec on the emulator. app_main gets
into a tight loop restarting itself because of this. This change
also works around that bug.
Change-Id: Ia73a7d2d623c25cf39d248145d97307945d554da
2013-03-14 16:31:34 -07:00
Nick Kralevich
31a7345c9c
am f732108e: Merge "Respawn app_main if ADDR_COMPAT_LAYOUT is not set"
...
* commit 'f732108e86fcc9825d5ecaa0b65ee91469c4a24c':
Respawn app_main if ADDR_COMPAT_LAYOUT is not set
2013-03-14 16:14:10 -07:00
Nick Kralevich
f732108e86
Merge "Respawn app_main if ADDR_COMPAT_LAYOUT is not set"
2013-03-14 22:28:01 +00:00
Nick Kralevich
8a0a929422
Respawn app_main if ADDR_COMPAT_LAYOUT is not set
...
Bug: 8358800
Change-Id: Id81aa26d74dfd16a49f0ee5926ea2cdb3c2106d8
2013-03-14 15:21:12 -07:00
Scott Main
9b92e9156d
am baf974fa: am b608915d: am af1bd23b: am e8319257: Merge "cherrypick from jb-mr1.1-dev Change-Id: I9a7d106e73ca3553b8541def0a143911f4c44780 docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed0
...
* commit 'baf974fa5aaf9977fa1dc26a33ada4e7d68768c0':
cherrypick from jb-mr1.1-dev Change-Id: I9a7d106e73ca3553b8541def0a143911f4c44780 docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f
2013-03-13 17:23:20 -07:00
Scott Main
c597f5b69b
am bbc13661: am ed3f55f1: am 5f00c3c7: am d0d8f8a9: update IO announcement to remove registration
...
* commit 'bbc13661504ef7cc8c397bd05f1ba33db619c77a':
update IO announcement to remove registration
2013-03-13 17:23:17 -07:00
Scott Main
baf974fa5a
am b608915d: am af1bd23b: am e8319257: Merge "cherrypick from jb-mr1.1-dev Change-Id: I9a7d106e73ca3553b8541def0a143911f4c44780 docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f" into
...
* commit 'b608915d5dd1bb81c45b6f1406dd2e41f2e7c6cf':
cherrypick from jb-mr1.1-dev Change-Id: I9a7d106e73ca3553b8541def0a143911f4c44780 docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f
2013-03-13 17:20:57 -07:00
Scott Main
bbc1366150
am ed3f55f1: am 5f00c3c7: am d0d8f8a9: update IO announcement to remove registration
...
* commit 'ed3f55f12d6dd702fed9d9ba21f5d2e333382e44':
update IO announcement to remove registration
2013-03-13 17:20:54 -07:00
Scott Main
b608915d5d
am af1bd23b: am e8319257: Merge "cherrypick from jb-mr1.1-dev Change-Id: I9a7d106e73ca3553b8541def0a143911f4c44780 docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f" into jb-mr1.1-docs
...
* commit 'af1bd23bf55efc456727874f39f7e35d49ec2a85':
cherrypick from jb-mr1.1-dev Change-Id: I9a7d106e73ca3553b8541def0a143911f4c44780 docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f
2013-03-13 17:19:32 -07:00
Scott Main
ed3f55f12d
am 5f00c3c7: am d0d8f8a9: update IO announcement to remove registration
...
* commit '5f00c3c7d70b33ad360e48908e23c796fced43bb':
update IO announcement to remove registration
2013-03-13 17:19:28 -07:00
Scott Main
af1bd23bf5
am e8319257: Merge "cherrypick from jb-mr1.1-dev Change-Id: I9a7d106e73ca3553b8541def0a143911f4c44780 docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f" into jb-mr1.1-docs
...
* commit 'e83192577fbc1fc6e0a8d991f07be506605fa496':
cherrypick from jb-mr1.1-dev Change-Id: I9a7d106e73ca3553b8541def0a143911f4c44780 docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f
2013-03-13 17:18:20 -07:00
Scott Main
5f00c3c7d7
am d0d8f8a9: update IO announcement to remove registration
...
* commit 'd0d8f8a9d464e1bb2385639c2f70c219d8e605e1':
update IO announcement to remove registration
2013-03-13 17:18:17 -07:00
Scott Main
e83192577f
Merge "cherrypick from jb-mr1.1-dev Change-Id: I9a7d106e73ca3553b8541def0a143911f4c44780 docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f" into jb-mr1.1-docs
2013-03-14 00:16:11 +00:00
Scott Main
d0d8f8a9d4
update IO announcement to remove registration
...
Change-Id: I0d9d984b90db1ee94b8b282fe816e95a6ec43094
2013-03-13 17:15:01 -07:00
Joe Fernandez
8119f871d8
cherrypick from jb-mr1.1-dev Change-Id: I9a7d106e73ca3553b8541def0a143911f4c44780
...
docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes
formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f
Change-Id: Id5556ff25a41780703ab0f0b7f5b04dcb228ad87
2013-03-13 16:50:28 -07:00
kmccormick
00707306e2
am 37fc02be: am 61f13cd8: am ae657a05: am e23f97ba: Doc change: updates to Gestures training class.
...
* commit '37fc02be989e880314c05390eca01398ddee996a':
Doc change: updates to Gestures training class.
2013-03-12 15:34:26 -07:00
kmccormick
37fc02be98
am 61f13cd8: am ae657a05: am e23f97ba: Doc change: updates to Gestures training class.
...
* commit '61f13cd877405f8bb72c2ad33c717ba3f02acf74':
Doc change: updates to Gestures training class.
2013-03-12 15:32:46 -07:00
kmccormick
61f13cd877
am ae657a05: am e23f97ba: Doc change: updates to Gestures training class.
...
* commit 'ae657a05db910936a92340ffe721351d259d434b':
Doc change: updates to Gestures training class.
2013-03-12 15:31:14 -07:00