OSDN Git Service
John Spurlock [Wed, 30 Jul 2014 15:03:03 +0000 (11:03 -0400)]
New wifi + radio icons.
- Replace old pngs with new vectors.
- New problem indication, remove provisional color filters.
- Remove spacing hacks in SignalClusterView.
- Wire up QS tile icons to demo mode.
Bug:
15988601
Change-Id: Ib785288eebfb09896a499d562eb56debbd89a456
ztenghui [Thu, 31 Jul 2014 20:01:56 +0000 (13:01 -0700)]
Fix the create() for the attrs position
Change-Id: Ieb93053f28502cabbf655c4a27c4864845da212e
Vinit Deshpande [Thu, 31 Jul 2014 19:47:36 +0000 (19:47 +0000)]
Merge "Rename HotspotListener to BssidListener" into lmp-dev
ztenghui [Thu, 31 Jul 2014 18:16:05 +0000 (11:16 -0700)]
Correct the tag's name in the exceptions
Change-Id: I9d1499fbcf8adb6bf0c5c0b7a10a8b480a708c09
Joe Fernandez [Thu, 31 Jul 2014 18:43:21 +0000 (18:43 +0000)]
am
441e7aa2: am
eb4bc851: am
69ed58ac: Merge "docs: Adding TIF one-pager to TV docs in L-Preview" into klp-modular-docs
* commit '
441e7aa23478b8de386efc69d43f889979bc6eee':
docs: Adding TIF one-pager to TV docs in L-Preview
Joe Fernandez [Thu, 31 Jul 2014 18:40:05 +0000 (18:40 +0000)]
am
eb4bc851: am
69ed58ac: Merge "docs: Adding TIF one-pager to TV docs in L-Preview" into klp-modular-docs
* commit '
eb4bc851aade1090c0a4e1f1e6f7ecd136b4a47a':
docs: Adding TIF one-pager to TV docs in L-Preview
Joe Fernandez [Thu, 31 Jul 2014 18:35:02 +0000 (18:35 +0000)]
am
69ed58ac: Merge "docs: Adding TIF one-pager to TV docs in L-Preview" into klp-modular-docs
* commit '
69ed58aced0e884d7758d84067134b04fbcee9c0':
docs: Adding TIF one-pager to TV docs in L-Preview
Wonsik Kim [Thu, 31 Jul 2014 08:50:45 +0000 (17:50 +0900)]
Fix NPE when fused geofence hardware is not available.
b/
16690237
Change-Id: I3ac50c8fd50fc799afcfc76126a5fd0c9ba0a5f4
Eunae Kim [Fri, 25 Jul 2014 00:16:13 +0000 (09:16 +0900)]
Fix a bug that the RecentTask list of other’s may show up to non-primary users.
Cherry-pick from aosp to lmp-dev.
When switching to a newly created user, the user may face this bug
when he opens the RecentTask screen.
A possible bug scenario is described as follows:
A user id of a removed user may be recycled when created a new user.
However, mRecentTasks is not correctly controlled so that old
information may still remain and be possibly mapped to wrong user.
This patch prevents this bug by explicitly removing old information
in mRecentTasks when removing existing user.
Change-Id: I1874dbd604598a5d740ae1e034981e21214c15c6
Signed-off-by: Eunae Kim <eunae.kim@lge.com>
Conflicts:
services/java/com/android/server/am/ActivityManagerService.java
riddle_hsu [Wed, 30 Jul 2014 16:15:05 +0000 (00:15 +0800)]
[ActivityManager] Prevent coredump file may not complete for testing.
Cherry-pick from aosp to lmp-dev
Sympton:
During testing, skip kill native crash process manually because it
will continue to die by default.
Root Cause:
Large process may take some time to do coredump.In auto test, crash
process will be killed immediately that results incomplete coredump
file.
Solution:
If the tester (IActivityController) will handle app crash event,
Do not kill native crashed process if the rom is debuggable.
Change-Id: Ia360af147d694125d440e5ba2f958c4759a50494
Conflicts:
services/java/com/android/server/am/ActivityManagerService.java
Raph Levien [Thu, 31 Jul 2014 17:08:36 +0000 (17:08 +0000)]
Merge "Re-remove AndroidEmoji.ttf." into lmp-dev
Roozbeh Pournader [Thu, 31 Jul 2014 00:18:41 +0000 (17:18 -0700)]
Re-remove AndroidEmoji.ttf.
It was mistakenly re-added in
6feb729b686b902be2520a91281e1a000c055da2.
Change-Id: I99a41ed8e6f1975e9808d8063e594fbb996d4334
(cherry picked from commit
a7d8d7bfa75b283588aacae16cce78f6161acce9)
Roozbeh Pournader [Fri, 25 Jul 2014 02:07:12 +0000 (19:07 -0700)]
Crunch Roboto and fix its digits to have the same width.
Update to upstream version 2.001045, which adds fontcrunch to the font
production process and fixes a problem with uneven digit widths. Should fix
https://code.google.com/p/android-developer-preview/issues/detail?id=330.
The font footprint is reduced by 705KB, most of it due to the crunching, but
also by using a newer version of fonttools that removes extra unnecessary
paddings from the glyf table.
Bug:
15348046
Bug:
16296048
Bug:
16299966
Change-Id: I838711916f8c47db011cfe889b232e60e6f1aa0c
(cherry picked from commit
6feb729b686b902be2520a91281e1a000c055da2)
Mike Lockwood [Tue, 29 Jul 2014 22:04:03 +0000 (15:04 -0700)]
Add toString() methods to some audio classes to help with debugging.
Change-Id: I2b61d8cdfbcaa7671705771325205b074c50ab1e
George Mount [Thu, 31 Jul 2014 17:06:03 +0000 (17:06 +0000)]
Merge "Fix visibility propagation check." into lmp-dev
riddle_hsu [Wed, 30 Jul 2014 16:26:51 +0000 (00:26 +0800)]
[ActivityManager] Avoid mistaking visibility by finishing task.
Cherry-picked from aosp into lmp-dev.
Sympton:
Next activity only adds to history but does not launch/resume then results ANR.
Root Cause:
In a rare timing, some windows are switched at the same time,
it will cause some finishing records on the top temporarily,
then set startIt to false that skip to resume the real top activty.
Solution:
If all activities in a task are finishing, do not use it to check.
The behavior/checking is the same concept as in JellyBean:
// If starting in an existing task, find where that is...
boolean startIt = true;
for (int i = NH-1; i >= 0; i--) {
ActivityRecord p = mHistory.get(i);
if (p.finishing) { // <--
continue;
}
Change-Id: I9d81a7b5182400c52e173da23eee61c74692beee
Conflicts:
services/java/com/android/server/am/ActivityStack.java
George Mount [Thu, 31 Jul 2014 16:58:16 +0000 (09:58 -0700)]
Fix visibility propagation check.
Bug
16704963
Change-Id: I2538bac4b4565ac8c6b27407c7679fea55b1092b
destradaa [Thu, 31 Jul 2014 01:17:21 +0000 (18:17 -0700)]
Fix crash in Volantis because there is not FLP support.
b/
16690237
Change-Id: Ie2dd159ad4e9b5cf4b3e2e66023b456927f18130
Joe Fernandez [Wed, 30 Jul 2014 18:14:04 +0000 (18:14 +0000)]
am
ecf76d1c: am
b83127f0: Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs
* commit '
ecf76d1cfd2846412270e6361ec8ba4cfccf8bec':
docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ
Joe Fernandez [Wed, 30 Jul 2014 18:09:27 +0000 (18:09 +0000)]
am
b83127f0: Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs
* commit '
b83127f0cf35a2d95684293818ca25171f6643e1':
docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ
Alan Lau [Wed, 30 Jul 2014 17:47:03 +0000 (17:47 +0000)]
am
b12318be: Merge "Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""" into klp-modular-dev
* commit '
b12318be13be00842d124e4391ce5eabce2d5104':
Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""
Alan Lau [Wed, 30 Jul 2014 17:44:20 +0000 (17:44 +0000)]
am
06a84554: Merge "Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""" into klp-modular-dev
* commit '
06a8455421978d06597de2abfccabef928d06056':
Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""
Andrew Solovay [Wed, 30 Jul 2014 17:37:06 +0000 (17:37 +0000)]
am
d46bc784: am
81364215: Merge "docs: Revised page to include info about new Publisher API." into klp-modular-docs
* commit '
d46bc7845c221b84f9b4e570b95f407c7fc6d0e7':
docs: Revised page to include info about new Publisher API.
Alan Lau [Wed, 30 Jul 2014 17:37:02 +0000 (17:37 +0000)]
am
c0062272: Merge "Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator""" into klp-modular-dev
* commit '
c006227265d7ac705ebeef2f7d87104fdb63f32a':
Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator""
Andrew Solovay [Wed, 30 Jul 2014 17:34:20 +0000 (17:34 +0000)]
am
81364215: Merge "docs: Revised page to include info about new Publisher API." into klp-modular-docs
* commit '
813642158979aca52b9d3913e52dda877d74a992':
docs: Revised page to include info about new Publisher API.
Ricardo Cervera [Wed, 30 Jul 2014 16:49:57 +0000 (16:49 +0000)]
am
b6bfa9e4: am
a7898781: Merge "docs: Added system requirements for Studio. Bug:
16566355" into klp-modular-docs
* commit '
b6bfa9e45a953b83289ee57da661746deae7a63f':
docs: Added system requirements for Studio. Bug:
16566355
Ricardo Cervera [Wed, 30 Jul 2014 16:46:07 +0000 (16:46 +0000)]
am
a7898781: Merge "docs: Added system requirements for Studio. Bug:
16566355" into klp-modular-docs
* commit '
a7898781d6182b5c73a0a3899b71162f92582f66':
docs: Added system requirements for Studio. Bug:
16566355
Joe Fernandez [Wed, 30 Jul 2014 18:07:11 +0000 (18:07 +0000)]
Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs
Joe Fernandez [Tue, 29 Jul 2014 21:44:28 +0000 (14:44 -0700)]
docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ
Change-Id: Ifa8831e1594470ecf65761efea472de79aaf5ece
Alan Lau [Wed, 30 Jul 2014 17:39:28 +0000 (17:39 +0000)]
Merge "Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""" into klp-modular-dev
Alan Lau [Wed, 30 Jul 2014 17:35:29 +0000 (17:35 +0000)]
Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""
This reverts commit
af60e56b39582ea90ccd7601cd06350a50bf6500.
Change-Id: I1aa698608773b9e540457831e11218f371c71268
Alan Lau [Wed, 30 Jul 2014 17:32:03 +0000 (17:32 +0000)]
Merge "Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator""" into klp-modular-dev
Alan Lau [Wed, 30 Jul 2014 17:30:15 +0000 (17:30 +0000)]
Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator""
This reverts commit
77d6f36bbc76dbed51bea17d1ffcd3c1d6ffd30f.
Change-Id: I10b6d9e3d82b0f2b6dc154465a4b2f1db8eed058
Vinit Deshpande [Tue, 29 Jul 2014 22:52:20 +0000 (15:52 -0700)]
Rename HotspotListener to BssidListener
And other usage of term Hotspot. This is to be technically correct
with the name usage, should the API become public later.
This change also fixes few outstanding requests from GScan API.These
include
a. An event with scan results when REPORT_AFTER_EACH_SCAN is set.
b. ScanSettings now takes in number of APs as an argument.
c. Removed single shot scan API (since it is not implemented anyway)
Change-Id: Id160f9f14193a37cce5f3ab8d6ea528344b788a0
Ricardo Cervera [Wed, 30 Jul 2014 16:42:48 +0000 (16:42 +0000)]
Merge "docs: Added system requirements for Studio. Bug:
16566355" into klp-modular-docs
Alan Lau [Wed, 30 Jul 2014 17:39:37 +0000 (17:39 +0000)]
Merge "Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""" into klp-modular-dev
Alan Lau [Wed, 30 Jul 2014 17:35:20 +0000 (17:35 +0000)]
Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""
This reverts commit
cbeef01cce314e3a3977b042d8ec0744816c0df4.
Change-Id: I170ccb2264941e8a8b090b3bb553970414f0c4eb
Andrew Solovay [Wed, 30 Jul 2014 17:30:05 +0000 (17:30 +0000)]
Merge "docs: Revised page to include info about new Publisher API." into klp-modular-docs
Dirk Dougherty [Tue, 29 Jul 2014 21:07:53 +0000 (21:07 +0000)]
am
4ff57a9a: am
fa3d1b2a: Doc change: add notice for admob sdk upgrade.
* commit '
4ff57a9aee76bdfe6808ac9c64f2e90bc14a25ae':
Doc change: add notice for admob sdk upgrade.
Dirk Dougherty [Tue, 29 Jul 2014 21:03:25 +0000 (21:03 +0000)]
am
fa3d1b2a: Doc change: add notice for admob sdk upgrade.
* commit '
fa3d1b2a27448b82ec1aa6f75c95ed17c4f46748':
Doc change: add notice for admob sdk upgrade.
Andrew Solovay [Fri, 25 Jul 2014 23:27:44 +0000 (16:27 -0700)]
docs: Revised page to include info about new Publisher API.
Also moved the blurb to the "Google Play Distribution" cover page, and
adjusted the TOC accordingly. Per DDoughterty@ 's request, moved the
"Purchase Verification Strategies" section to billing_subscriptions.jd
Page is staged to:
http://asolovay.mtv:9543/google/play/billing/gp-purchase-status-api.html
http://asolovay.mtv:9543/google/play/billing/billing_subscriptions.html#strategies
Change-Id: I884e2f3f25c76fcb055e663058d1a4f4642fb558
Dirk Dougherty [Tue, 29 Jul 2014 01:19:46 +0000 (18:19 -0700)]
Doc change: add notice for admob sdk upgrade.
Change-Id: I9281b17e4ff277ef99ae57ce0360e05f4231e7ff
Ricardo Cervera [Fri, 25 Jul 2014 16:42:28 +0000 (09:42 -0700)]
docs: Added system requirements for Studio. Bug:
16566355
Change-Id: I1d3d80ce718d64e01fd939aa177c950d56065555
Robert Ly [Tue, 29 Jul 2014 16:34:01 +0000 (16:34 +0000)]
am
58967bfb: am
1c977b37: Merge "docs: fix typo bug
16623189" into klp-modular-docs
* commit '
58967bfbe824f020194872a6d0a5204b54e6043a':
docs: fix typo bug
16623189
Robert Ly [Tue, 29 Jul 2014 16:30:07 +0000 (16:30 +0000)]
am
1c977b37: Merge "docs: fix typo bug
16623189" into klp-modular-docs
* commit '
1c977b3744dbe916edde2e256a39c30e5888ef4f':
docs: fix typo bug
16623189
Robert Ly [Tue, 29 Jul 2014 15:42:24 +0000 (15:42 +0000)]
am
dadb473e: am
9613b433: Merge "docs: fix typo" into klp-modular-docs
* commit '
dadb473e2b9dc7bf2691dea7153c6700102e6562':
docs: fix typo
Robert Ly [Tue, 29 Jul 2014 15:38:02 +0000 (15:38 +0000)]
am
9613b433: Merge "docs: fix typo" into klp-modular-docs
* commit '
9613b433f47162d008f034afbb16deac16532662':
docs: fix typo
Ricardo Cervera [Tue, 29 Jul 2014 15:32:57 +0000 (15:32 +0000)]
am
8d1aa957: am
652e5c7e: Merge "docs: Describe the alloc tracker in Android Studio" into klp-modular-docs
* commit '
8d1aa95729a44a953dd5cd434f2c7380e6d1f641':
docs: Describe the alloc tracker in Android Studio
Ricardo Cervera [Tue, 29 Jul 2014 15:29:00 +0000 (15:29 +0000)]
am
652e5c7e: Merge "docs: Describe the alloc tracker in Android Studio" into klp-modular-docs
* commit '
652e5c7ef1f8176dc680f7c4ba782164269b03b0':
docs: Describe the alloc tracker in Android Studio
Ricardo Cervera [Tue, 29 Jul 2014 15:07:56 +0000 (15:07 +0000)]
am
df881ccc: am
321e0302: docs: Fix Wear docs issues.
* commit '
df881ccc1fe5efefa4a71cf8e5f663f9e2911151':
docs: Fix Wear docs issues.
Ricardo Cervera [Tue, 29 Jul 2014 15:01:11 +0000 (15:01 +0000)]
am
321e0302: docs: Fix Wear docs issues.
* commit '
321e030202cb74cad0dd8a4950cffe361a5072c8':
docs: Fix Wear docs issues.
Filip Gruszczynski [Mon, 28 Jul 2014 23:40:13 +0000 (23:40 +0000)]
am
d0e03392: Merge "Fix double chin issue, where bottom inset is applied twice." into klp-modular-dev
* commit '
d0e03392394164e1e261ef8829e187ad2362d426':
Fix double chin issue, where bottom inset is applied twice.
Craig Mautner [Mon, 28 Jul 2014 23:28:59 +0000 (23:28 +0000)]
am
0fa45d93: Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev
* commit '
0fa45d93f7265c130d5dc49a51130ed74db5cec9':
Remove PendingActivityLaunches based on stack.
Robert Ly [Tue, 29 Jul 2014 16:26:51 +0000 (16:26 +0000)]
Merge "docs: fix typo bug
16623189" into klp-modular-docs
Robert Ly [Tue, 29 Jul 2014 16:25:45 +0000 (09:25 -0700)]
docs: fix typo bug
16623189
Change-Id: Ia790587cf60cbf4e9f699605a5ad6a7dc5a06799
Robert Ly [Tue, 29 Jul 2014 15:33:17 +0000 (08:33 -0700)]
docs: fix typo
Change-Id: I4d76d625dc508e7279162d1d3ace9c32625e1358
Craig Mautner [Mon, 28 Jul 2014 23:25:55 +0000 (23:25 +0000)]
Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev
Craig Mautner [Mon, 28 Jul 2014 21:00:35 +0000 (14:00 -0700)]
Remove PendingActivityLaunches based on stack.
Was previously removing by trying to match activities, but the
activity being matched would not have been in the stack yet. Since
it doesn't get added to the stack when it goes into the list
of pending activities. By removing all pending activities associated
with the stack we clean up all such pending activities.
Fixes bug
16045752.
Change-Id: I6b5981ffcce674139837b06362e573299bbc9e52
Alan Lau [Mon, 28 Jul 2014 20:07:23 +0000 (20:07 +0000)]
am
77d6f36b: Revert "DO NOT MERGE Implement line breaking using ICU break iterator"
* commit '
77d6f36bbc76dbed51bea17d1ffcd3c1d6ffd30f':
Revert "DO NOT MERGE Implement line breaking using ICU break iterator"
Alan Lau [Mon, 28 Jul 2014 19:58:00 +0000 (19:58 +0000)]
am
40b0d4d7: Merge "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"" into klp-modular-dev
* commit '
40b0d4d7519b6a1999742534513406f94c169f1f':
Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"
Alan Lau [Mon, 28 Jul 2014 19:57:55 +0000 (19:57 +0000)]
am
af60e56b: Revert "DO NOT MERGE Fix extraneous allocation and copying"
* commit '
af60e56b39582ea90ccd7601cd06350a50bf6500':
Revert "DO NOT MERGE Fix extraneous allocation and copying"
Alan Lau [Mon, 28 Jul 2014 19:50:14 +0000 (19:50 +0000)]
Revert "DO NOT MERGE Implement line breaking using ICU break iterator"
This reverts commit
0c87dfd25d5a305fb67eb328d114aada87055dd7.
Change-Id: Ibc300bb945776594099b69965cabe7220d10de2f
Anish Athalye [Mon, 28 Jul 2014 19:53:26 +0000 (19:53 +0000)]
am
1a408a34: DO NOT MERGE Fix extraneous allocation and copying
* commit '
1a408a344c7921d7c943826bea3ce0cdd822583d':
DO NOT MERGE Fix extraneous allocation and copying
Alan Lau [Mon, 28 Jul 2014 19:52:11 +0000 (19:52 +0000)]
Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"
This reverts commit
a28e4764994283c3595dd41f12e425cf7dc0d985.
Change-Id: I73fe7b3e6bdba327e55a58afd36a7f58f49945d0
Alan Lau [Mon, 28 Jul 2014 19:51:01 +0000 (19:51 +0000)]
Revert "DO NOT MERGE Fix extraneous allocation and copying"
This reverts commit
1a408a344c7921d7c943826bea3ce0cdd822583d.
Change-Id: If5a19a4cc54e76aeddac0923e28bbf310e78feb4
Alan Lau [Mon, 28 Jul 2014 19:10:29 +0000 (19:10 +0000)]
am
97170e0c: Merge "DO NOT MERGE Implement line breaking using ICU break iterator" into klp-modular-dev
* commit '
97170e0c48bbff21ef6773110d950621131cf9dd':
DO NOT MERGE Implement line breaking using ICU break iterator
Anish Athalye [Mon, 28 Jul 2014 19:10:19 +0000 (19:10 +0000)]
am
a28e4764: DO NOT MERGE Fix line breaking for clusters in narrow views
* commit '
a28e4764994283c3595dd41f12e425cf7dc0d985':
DO NOT MERGE Fix line breaking for clusters in narrow views
Anish Athalye [Tue, 8 Jul 2014 20:27:14 +0000 (13:27 -0700)]
DO NOT MERGE Fix extraneous allocation and copying
With breaks being allocated the way it was, there were 16 ints with
value 0 being stored in the beginning of the vector. Because of the way
the rest of the code is structured, this did not result in incorrect
operation, but it still wasted time and memory.
Change-Id: Ic0df3e5484417da51f2465ec2d72222fefffc18a
(cherry picked from commit
733b3c0f8b77fefcd234c94170faa4e7bd76074c)
Anish Athalye [Fri, 27 Jun 2014 21:37:53 +0000 (14:37 -0700)]
DO NOT MERGE Fix line breaking for clusters in narrow views
Clusters were broken incorrectly when in narrow views (when the width of
the cluster was greater than the width of a view). Also, out() calls
were modifying fm, so clusters that were too wide were not positioned
correctly.
Change-Id: I521f8dc6338f5f1de6858af3f0c0bd320aa46bc0
(cherry picked from commit
162713dd0b72af79c1b2286985f7e79f043cd915)
Ricardo Cervera [Tue, 29 Jul 2014 15:26:56 +0000 (15:26 +0000)]
Merge "docs: Describe the alloc tracker in Android Studio" into klp-modular-docs
Ricardo Cervera [Mon, 28 Jul 2014 17:50:32 +0000 (10:50 -0700)]
docs: Fix Wear docs issues.
Bug:
16624918
Bug:
16626217
Bug:
16626415
Bug:
16624384
Bug:
16623147
Change-Id: I774f19aded22562b891f9d2ccc35f0befb50f21c
Filip Gruszczynski [Mon, 28 Jul 2014 23:34:59 +0000 (23:34 +0000)]
Merge "Fix double chin issue, where bottom inset is applied twice." into klp-modular-dev
Alan Lau [Mon, 28 Jul 2014 19:53:43 +0000 (19:53 +0000)]
Merge "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"" into klp-modular-dev
Alan Lau [Mon, 28 Jul 2014 19:05:45 +0000 (19:05 +0000)]
Merge "DO NOT MERGE Implement line breaking using ICU break iterator" into klp-modular-dev
Anish Athalye [Tue, 24 Jun 2014 21:39:43 +0000 (14:39 -0700)]
DO NOT MERGE Implement line breaking using ICU break iterator
Change-Id: I4ad98757aa2eab5dbc2ae44c0391e900ef20c4d0
(cherry picked from commit
f8133ae5896926aaf70f12bc0dd1f36a6704c0f5)
Joe Fernandez [Thu, 31 Jul 2014 18:30:42 +0000 (18:30 +0000)]
Merge "docs: Adding TIF one-pager to TV docs in L-Preview" into klp-modular-docs
Joe Fernandez [Tue, 29 Jul 2014 04:31:16 +0000 (21:31 -0700)]
docs: Adding TIF one-pager to TV docs in L-Preview
Change-Id: I89960cb9c2c8af0ccb010b91ee42d6cffab42f95
Filip Gruszczynski [Fri, 25 Jul 2014 21:25:16 +0000 (14:25 -0700)]
Fix double chin issue, where bottom inset is applied twice.
This changes how windowOutsetBottom is applied. Instead of being added to
whatever inset is already set, it overwrites it.
Bug:
16567038
Change-Id: Idedae93b790652e9de0519764ea7a03841f9e8fd
Robert Ly [Tue, 29 Jul 2014 15:34:47 +0000 (15:34 +0000)]
Merge "docs: fix typo" into klp-modular-docs
Ricardo Cervera [Thu, 24 Jul 2014 17:15:09 +0000 (10:15 -0700)]
docs: Describe the alloc tracker in Android Studio
Change-Id: Ic3cfc94950029104ec75ab04a9fac51ba64dd9a9
Craig Mautner [Fri, 25 Jul 2014 02:19:53 +0000 (02:19 +0000)]
am
a0bb44ef: Merge "Finish crashed activities immediately" into klp-modular-dev
* commit '
a0bb44efe96ca70635b64dac8922b225d1a19407':
Finish crashed activities immediately
Craig Mautner [Fri, 25 Jul 2014 01:30:51 +0000 (01:30 +0000)]
Merge "Finish crashed activities immediately" into klp-modular-dev
Craig Mautner [Thu, 24 Jul 2014 20:32:37 +0000 (13:32 -0700)]
Finish crashed activities immediately
By finishing crashed activities right away the VirtualDisplays
associated with ActivityView are removed immediately rather than
being deferred. Also there is no waiting for Pause (0.5 sec) and
Destroy (10 sec) timeouts to expire.
Fixes bug
15092354.
Change-Id: Ie4941cb19dcc6f6fc61b2475162ea2794c9558a2
Prashant Malani [Thu, 24 Jul 2014 18:06:03 +0000 (18:06 +0000)]
am
b4dcc64f: Merge "Revert "Remove circular mask"" into klp-modular-dev
* commit '
b4dcc64fe6314b139ac17aa296419bbf153df2f6':
Revert "Remove circular mask"
Sandeep Siddhartha [Thu, 31 Jul 2014 16:42:50 +0000 (16:42 +0000)]
Merge "Don't unload sound model in start recognition unless the model changes" into lmp-dev
Sandeep Siddhartha [Wed, 30 Jul 2014 20:40:56 +0000 (13:40 -0700)]
Don't unload sound model in start recognition unless the model changes
This helps in start -> detected -> start again scenarios
Change-Id: I6d8d55e469e0623b9eb07595df8897ad4942aa11
Evan Charlton [Thu, 31 Jul 2014 16:09:54 +0000 (09:09 -0700)]
Fix a small typo in javadocs
Service#START_FLAG_RETRY has an extra word; remove it.
Change-Id: I4743e2ea474c70fe5d31f1a4ef257f9752f8e823
Alexandra Gherghina [Wed, 30 Jul 2014 12:43:39 +0000 (13:43 +0100)]
Use the appropriate default icon
ComponentInfo subclasses and ApplicationInfo have different ways to retrieving
the default icon. Previously, in CL I2db300a69a08030eacc245ee91556f0443ba5878
we defaulted everything to the green Android. This makes sure that they get the
right default.
Bug:
16630068
Change-Id: Ifa499eac6f1543523d6ecf0831175bfd6b772edb
Jorim Jaggi [Thu, 31 Jul 2014 15:23:56 +0000 (17:23 +0200)]
Fix a few StatusBarHeaderView regressions
Change-Id: Iae1af96f80caf4978c5a6ec6ef81b83543e9fe0e
Geoff Mendal [Wed, 30 Jul 2014 19:48:41 +0000 (19:48 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Geoff Mendal [Wed, 30 Jul 2014 19:36:23 +0000 (12:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iac3087ace0ea7c351d1606f37000bfa134249184
Auto-generated-cl: translation import
Christoph Studer [Thu, 31 Jul 2014 15:23:51 +0000 (15:23 +0000)]
Merge "NoMan: Use Notification.isGroupX() methods" into lmp-dev
Christoph Studer [Thu, 31 Jul 2014 14:55:32 +0000 (16:55 +0200)]
NoMan: Use Notification.isGroupX() methods
Change-Id: I041f449361959440a5be7375e655a31fd14e7862
Christoph Studer [Thu, 31 Jul 2014 13:41:26 +0000 (13:41 +0000)]
Merge "NoMan: Filter group children for pre-L listeners" into lmp-dev
Christoph Studer [Fri, 25 Jul 2014 12:18:17 +0000 (14:18 +0200)]
NoMan: Filter group children for pre-L listeners
Bug:
16189575
Change-Id: I5297b5273ab0aaee599981738eb736a49f21ce53
Narayan Kamath [Thu, 31 Jul 2014 12:49:39 +0000 (12:49 +0000)]
Merge "Switch TextUtils over to new ICU API." into lmp-dev
Narayan Kamath [Wed, 30 Jul 2014 15:51:27 +0000 (16:51 +0100)]
Switch TextUtils over to new ICU API.
.. and use Locale.getScript() instead of ICU.getScript.
bug:
15876704
(cherry picked from commit
08b3516984850e04e9bb6feae29d691a7557191c)
Change-Id: Ifac179e0577d66062f32c95372b631bf574dfdf9
Alexandra Gherghina [Thu, 31 Jul 2014 10:25:23 +0000 (11:25 +0100)]
Upload new icons from ux
Change-Id: I47da0780b1a4cce1104ae8fc00fcf01701a6d27a
Sander Alewijnse [Tue, 29 Jul 2014 11:01:38 +0000 (12:01 +0100)]
Fix deadlock window manager and device policy manager.
Removed all communication from wm to device policy manager.
Added initialization of cache in wm by dpms.
Change-Id: Ifa0b8bfcd625464b156d5cc0fb66d342deda1c27
Jae Seo [Thu, 24 Jul 2014 22:54:23 +0000 (15:54 -0700)]
TIF: Make TvTrackInfo methods more explicit.
This change addresses the following API council feedback:
TvTrackInfo:
-- Remove all KEY_/VALUE_ constants, and replace with explicit,
strongly-typed accessor methods.
-- Add additional Bundle getExtras() method (in addition to the explicit
types); most of the time this Bundle will be null.
Bug:
16542165
Change-Id: Ie48cb170b2bbf07d9460fdc8ed77d7db01799772