Dirk Dougherty
3a4883908a
am 0af622c1: am 3cc88345: am b544af37: am 5f8c2dfe: Merge "Doc change: fix typo in jb docs." into jb-mr1-dev
...
* commit '0af622c1970973756aed5345f7f6fb30b8e49aa3':
Doc change: fix typo in jb docs.
2012-11-27 18:43:55 -08:00
Daniel Sandler
690d2052b2
am 6684a2ce: am bf0e106a: Merge "Cleanups in Notification.java." into jb-mr1.1-dev
...
* commit '6684a2ce1abd94972d5480c2214a9509781c755b':
Cleanups in Notification.java.
2012-11-27 18:43:46 -08:00
Amith Yamasani
f383cdcf3f
am 131ff5b8: am 1c2c48cb: am f426ace9: Merge "Only wipe device if primary user (for failed password attempts)" into jb-mr1.1-dev
...
* commit '131ff5b82134955889277fa38066704298214c87':
Only wipe device if primary user (for failed password attempts)
2012-11-27 18:43:46 -08:00
Christopher Tate
e659cea645
am d51ffbea: am faeabc7b: Merge "Cache resource ID lookups in aapt"
...
* commit 'd51ffbea9435408cf0ceb7c2ffa679f7567ae6f2':
Cache resource ID lookups in aapt
2012-11-27 18:43:36 -08:00
Michael Jurka
e7af10a047
am 739d1ae4: am 712c2686: am 09a526fa: Merge "Fix bug: swiped apps in Recents come back on rotate" into jb-mr1.1-dev
...
* commit '739d1ae4fa5a9f6765645ce3c0cdae2281da2712':
Fix bug: swiped apps in Recents come back on rotate
2012-11-27 18:43:28 -08:00
Baligh Uddin
180cc012d3
am 3ac8060c: (-s ours) am 9e2783ee: am 4df6c629: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
...
* commit '3ac8060c28dc93f3ec9feefe321d2c2e2f3b46db':
Import translations. DO NOT MERGE
2012-11-27 18:43:06 -08:00
Baligh Uddin
ffdc2c1750
am 20db55e8: (-s ours) am 346b6a42: am 18a4aa89: am c8d2abd8: Import translations. DO NOT MERGE
...
* commit '20db55e836a97f04c73e4bf9ea4e0290a8ab6ed8':
Import translations. DO NOT MERGE
2012-11-27 18:43:03 -08:00
Baligh Uddin
15a7384088
am a0082a63: (-s ours) am 12e9bfd6: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit 'a0082a63a61be7e0d1a67248cf7dfb08d7aeb634':
Import translations. DO NOT MERGE
2012-11-27 18:42:55 -08:00
Kenny Root
d5de620c15
am dfb828a1: am ae0edeb3: am c88047bf: Merge "Move NTP updates outside locks"
...
* commit 'dfb828a19641630f99ee87bc856d96a8cad6ee2e':
Move NTP updates outside locks
2012-11-27 18:42:45 -08:00
Daniel Sandler
6684a2ce1a
am bf0e106a: Merge "Cleanups in Notification.java." into jb-mr1.1-dev
...
* commit 'bf0e106a7d755355d7ff53a2b319e2e91c154641':
Cleanups in Notification.java.
2012-11-27 18:41:01 -08:00
Christopher Tate
d51ffbea94
am faeabc7b: Merge "Cache resource ID lookups in aapt"
...
* commit 'faeabc7bcf760a4576637551d8bb578ae08a506e':
Cache resource ID lookups in aapt
2012-11-27 18:40:43 -08:00
Daniel Sandler
bf0e106a7d
Merge "Cleanups in Notification.java." into jb-mr1.1-dev
2012-11-27 18:38:33 -08:00
Christopher Tate
faeabc7bcf
Merge "Cache resource ID lookups in aapt"
2012-11-27 18:30:05 -08:00
Christopher Tate
d8dde13a63
Cache resource ID lookups in aapt
...
This speeds up certain workloads considerably, particularly
those involved in buildling apps via the SDK. Windows-based
use should particularly benefit from the change.
Change-Id: I29f4b3a77400b201ee219729cc28a5e359c0c5e8
2012-11-27 18:28:49 -08:00
Daniel Sandler
07cca31300
am 70f17822: am 54525d8e: Merge "Clean up the Builder test." into jb-mr1.1-dev
...
* commit '70f17822987607e74dd891fe537a20e13d379df1':
Clean up the Builder test.
2012-11-27 18:21:35 -08:00
Daniel Sandler
a158c02ea8
am 7908581b: am 5bff5517: Merge "Refresh the status bar clock format on user switch." into jb-mr1.1-dev
...
* commit '7908581bc023cc1bfe289e7e36fa965f1698cad6':
Refresh the status bar clock format on user switch.
2012-11-27 18:19:54 -08:00
Daniel Sandler
70f1782298
am 54525d8e: Merge "Clean up the Builder test." into jb-mr1.1-dev
...
* commit '54525d8e4b2bcffcf33b5df8292e9ec45b9aaa3d':
Clean up the Builder test.
2012-11-27 18:17:45 -08:00
Daniel Sandler
7908581bc0
am 5bff5517: Merge "Refresh the status bar clock format on user switch." into jb-mr1.1-dev
...
* commit '5bff551710d2f2b9d7c6ea814b18b042ee0fe663':
Refresh the status bar clock format on user switch.
2012-11-27 18:16:10 -08:00
Daniel Sandler
54525d8e4b
Merge "Clean up the Builder test." into jb-mr1.1-dev
2012-11-27 18:13:29 -08:00
Daniel Sandler
5bff551710
Merge "Refresh the status bar clock format on user switch." into jb-mr1.1-dev
2012-11-27 18:12:47 -08:00
Chet Haase
b17905f38f
am d8f270a0: (-s ours) am 3b2b3aaf: am 47a8e863: Merge "Fix infinite recursive loop DO NOT MERGE" into jb-mr1.1-dev
...
* commit 'd8f270a0d36601ca4565aa9cb9399eada1030ef3':
Fix infinite recursive loop DO NOT MERGE
2012-11-27 17:34:41 -08:00
Dianne Hackborn
816a5d9c27
am 360acd03: am 78551bc7: am ba4ac518: Merge "Improve debugging for issue #7586414 : AlarmManager wakelocks held" into jb-mr1.1-dev
...
* commit '360acd03bfe0d597ee845d2392d715633a89e12b':
Improve debugging for issue #7586414 : AlarmManager wakelocks held
2012-11-27 17:34:11 -08:00
The Android Open Source Project
df44ef074a
am 664ac3ce: (-s ours) am 3407c24d: am 6f3b20cc: Reconcile with jb-mr1-release - do not merge
...
* commit '664ac3ceb1dbaf8acf032862e131f4ec75e4405f':
Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back)
Notification vibration improvements: [DO NOT MERGE]
2012-11-27 17:34:08 -08:00
Satoshi Kataoka
48d3111ef1
am c86ae7cf: am 1c37b800: am 1af08411: Merge "Hide current soft input when a background user gains window focus." into jb-mr1.1-dev
...
* commit 'c86ae7cf318f6c9d8cf581447e8897fbc1245ef3':
Hide current soft input when a background user gains window focus.
2012-11-27 17:34:02 -08:00
Svetoslav Ganov
e44a51ba10
am 30913478: am 37eaac1d: am de0bf8bc: am abb4a700: Update the content shell command\'s usage instructions.
...
* commit '30913478b083de92e75755adef3b8a32a3cb2fd5':
2012-11-27 17:33:58 -08:00
Amith Yamasani
7f9ac6461f
am 83965c80: am eb933360: am 7be52cbc: Merge "Logging to help find the cause of widget crash in clock widget." into jb-mr1.1-dev
...
* commit '83965c80a2c7d574a6f2a056383278270ac42dd0':
Logging to help find the cause of widget crash in clock widget.
2012-11-27 17:33:54 -08:00
Winson Chung
fb8ca912e8
am d0079891: am 9f6e8ddf: am 2b847c39: Merge "Removing unecessary additional lock metadata from QuickSettings user tile." into jb-mr1.1-dev
...
* commit 'd0079891e3a8034f560eaf88d5be692b61ca4b9a':
Removing unecessary additional lock metadata from QuickSettings user tile.
2012-11-27 17:33:46 -08:00
Michael Jurka
74789bb336
am d3de7953: am e020af83: am ab972a6d: Merge "Fix bug where icon animation is sometimes skipped" into jb-mr1.1-dev
...
* commit 'd3de79538bc87e769e876866f38b8c9048940d4b':
Fix bug where icon animation is sometimes skipped
2012-11-27 17:33:42 -08:00
kmccormick@google.com
b263373a3b
am b217b825: am 1f301634: am 58d55b04: am d60ea46f: am a880436f: am b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev-docs
...
* commit 'b217b825a0ca2c18ee1b470c248b75685bf3ad20':
Doc update: new Notify User AU class
2012-11-27 17:02:07 -08:00
kmccormick@google.com
b217b825a0
am 1f301634: am 58d55b04: am d60ea46f: am a880436f: am b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev-docs
...
* commit '1f301634d3a9765decad91327d732064f11aae77':
Doc update: new Notify User AU class
2012-11-27 17:00:27 -08:00
kmccormick@google.com
1f301634d3
am 58d55b04: am d60ea46f: am a880436f: am b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev-docs
...
* commit '58d55b0456a72daaf31c4e02227e82a8707ecf73':
Doc update: new Notify User AU class
2012-11-27 16:57:51 -08:00
kmccormick@google.com
58d55b0456
am d60ea46f: am a880436f: am b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev-docs
...
* commit 'd60ea46fe7a9856ca592ff7dea79aa8ce80f5e66':
Doc update: new Notify User AU class
2012-11-27 16:56:03 -08:00
kmccormick@google.com
d60ea46fe7
am a880436f: am b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev-docs
...
* commit 'a880436f4416168d256822a23bd23f936136706d':
Doc update: new Notify User AU class
2012-11-27 16:54:01 -08:00
kmccormick@google.com
a880436f44
am b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev-docs
...
* commit 'b7863a3ce4db964322783ff7e84acc5713e04d1d':
Doc update: new Notify User AU class
2012-11-27 16:52:00 -08:00
&& repo sync -j8
b7863a3ce4
Merge "Doc update: new Notify User AU class" into jb-dev-docs
2012-11-27 16:49:37 -08:00
Robert Ly
14d580850d
am e03a213e: am e3a94e9d: am d29457e4: Merge "docs: add new GMS landing and reference" into jb-mr1-dev
...
* commit 'e03a213e123d9a055b5f43469842ebf644bb6fb7':
docs: add new GMS landing and reference
2012-11-27 16:38:15 -08:00
&& repo sync -j8
0aae00051c
Doc update: new Notify User AU class
...
Change-Id: Idcda9535c5aa2602cf4f0aecb3ab4b1518ab966b
2012-11-27 16:37:36 -08:00
Robert Ly
e03a213e12
am e3a94e9d: am d29457e4: Merge "docs: add new GMS landing and reference" into jb-mr1-dev
...
* commit 'e3a94e9dd21c002b003ec1a946e2ec6df25c9e0d':
docs: add new GMS landing and reference
2012-11-27 16:36:35 -08:00
Robert Ly
e3a94e9dd2
am d29457e4: Merge "docs: add new GMS landing and reference" into jb-mr1-dev
...
* commit 'd29457e40379d6df0cbf8bbbe5945f0827a0d19c':
docs: add new GMS landing and reference
2012-11-27 16:35:19 -08:00
Robert Ly
d29457e403
Merge "docs: add new GMS landing and reference" into jb-mr1-dev
2012-11-27 16:32:05 -08:00
Dirk Dougherty
cf62cbca10
Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc.
...
Change-Id: I45de360c45426ab6d2e04ef6a9e5fa920ff63c57
2012-11-27 16:29:40 -08:00
Sangkyu Lee
7bb3cfe1cc
Another optimization of glyph cache uploads
...
Previously, cache textures were updated whenever mCurrentCacheTexuture was changed.
Since updating cache textures needs glTexSubImage2D call, frequent changing
of mCurrentCacheTexture (which can easily happen when an app uses lots of unique glyphs
even with precaching) caused many glTexSubImage2D calls and bad framerates.
This patch optimized isssueDrawCommand function. Consequently, changing mCurrentCacheTexture doesn't
cause glTexSubImage2D call any more and it will improve font rendering performance.
Change-Id: Id19d959fa0e69eeb2a39f83a57e311d7394586b2
Signed-off-by: Sangkyu Lee <geteuid@gmail.com>
2012-11-28 09:28:50 +09:00
Tim Murray
8aece09443
Merge "Update JNI for strided 2D copies."
2012-11-27 16:27:50 -08:00
Craig Mautner
ae336a08dd
am 067a7ac4: am 9e98927e: Merge "Retain configuration change info and sync access." into jb-mr1.1-dev
...
* commit '067a7ac494c8a248840b9a7a46f22a0efff9e52f':
Retain configuration change info and sync access.
2012-11-27 16:23:15 -08:00
Daniel Sandler
bdc9c83ba5
New timings for default & fallback notification vibration.
...
Bug: 7599791
Change-Id: Ieae1cba864537b192be013e4f00131bcc59c6369
2012-11-27 19:22:22 -05:00
Craig Mautner
067a7ac494
am 9e98927e: Merge "Retain configuration change info and sync access." into jb-mr1.1-dev
...
* commit '9e98927e2dd3e9498753e6878709b2625e96feea':
Retain configuration change info and sync access.
2012-11-27 16:20:34 -08:00
Craig Mautner
9e98927e2d
Merge "Retain configuration change info and sync access." into jb-mr1.1-dev
2012-11-27 16:17:45 -08:00
Dirk Dougherty
0af622c197
am 3cc88345: am b544af37: am 5f8c2dfe: Merge "Doc change: fix typo in jb docs." into jb-mr1-dev
...
* commit '3cc883459a29d73cc1401b72eecf1ab47a5397cc':
Doc change: fix typo in jb docs.
2012-11-27 16:12:59 -08:00
Dirk Dougherty
3cc883459a
am b544af37: am 5f8c2dfe: Merge "Doc change: fix typo in jb docs." into jb-mr1-dev
...
* commit 'b544af3796b43afa9ae6f2196df569de175e0d24':
Doc change: fix typo in jb docs.
2012-11-27 16:10:07 -08:00
Robert Ly
6519ca0c5f
docs: add new GMS landing and reference
...
Change-Id: I48c75dd5924bdf297b5368887084d148efcd66ba
2012-11-27 16:09:58 -08:00