Jim Miller
9210016ff9
am 449f48ff: am bb9e7dca: am be2ca79a: am 7dfc588a: Workaround for layout bug in SIM PIN/PUK views
...
* commit '449f48ff3bc99544ecf1676ed15a4126beea1f1e':
Workaround for layout bug in SIM PIN/PUK views
2012-11-07 15:10:12 -08:00
Jim Miller
91cc386e55
am d3bd6eb8: am 16ddf343: am 8eb3048a: am 87d0366d: Fix NPE caused by applications that try to hide keyguard while it\'s not showing
...
* commit 'd3bd6eb8b2f348c19fbbe79a11c0dc9aa5f27637':
Fix NPE caused by applications that try to hide keyguard while it's not showing
2012-11-07 15:10:08 -08:00
Svetoslav Ganov
d80d13b3c2
am 63121bd6: am ab77b5e6: am e97c6faa: am bb8abae5: am 0f4d5df5: Merge "View\'s visibility to the user not checking predecessor alpha." into jb-mr1-dev
...
* commit '63121bd6c14a80fe839c617e8fb11cf07d490cc1':
2012-11-07 15:10:04 -08:00
Mike Cleron
b8a9ec3e1c
am fe583a70: am d97d16f0: am f154c9bd: am 624ea441: am c87f198b: Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev
...
* commit 'fe583a70248709289e3865de62fdc34c92d393b3':
2012-11-07 15:10:00 -08:00
Romain Guy
c60d328b63
am 39fe96c7: am c4101b2b: am a8e1d119: am 06da3378: am 6c642089: Merge "Add programmatic access to setters in TextClock Bug #7478328 " into jb-mr1-dev
...
* commit '39fe96c7b8ec870e7fa30893f0b4f41fa796b55d':
2012-11-07 15:09:56 -08:00
Jim Miller
449f48ff3b
am bb9e7dca: am be2ca79a: am 7dfc588a: Workaround for layout bug in SIM PIN/PUK views
...
* commit 'bb9e7dcae96c8913050166c9cc949e9f1c3c8d1f':
Workaround for layout bug in SIM PIN/PUK views
2012-11-07 15:06:37 -08:00
Jim Miller
d3bd6eb8b2
am 16ddf343: am 8eb3048a: am 87d0366d: Fix NPE caused by applications that try to hide keyguard while it\'s not showing
...
* commit '16ddf343a61dfc93ff9a6fc4721b8fb16010da48':
Fix NPE caused by applications that try to hide keyguard while it's not showing
2012-11-07 15:06:33 -08:00
Svetoslav Ganov
63121bd6c1
am ab77b5e6: am e97c6faa: am bb8abae5: am 0f4d5df5: Merge "View\'s visibility to the user not checking predecessor alpha." into jb-mr1-dev
...
* commit 'ab77b5e6a251075fdfc7990f4d34a8d5896cfbce':
2012-11-07 15:06:29 -08:00
Mike Cleron
fe583a7024
am d97d16f0: am f154c9bd: am 624ea441: am c87f198b: Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev
...
* commit 'd97d16f0d1693657938a9c08099ad352d0946b6f':
2012-11-07 15:06:26 -08:00
Romain Guy
39fe96c7b8
am c4101b2b: am a8e1d119: am 06da3378: am 6c642089: Merge "Add programmatic access to setters in TextClock Bug #7478328 " into jb-mr1-dev
...
* commit 'c4101b2b96d7958e26da5a7b3d14cc2540f8002a':
2012-11-07 15:06:22 -08:00
Jean-Baptiste Queru
f5a79d313e
am 476fceab: Merge 5418dd92
...
* commit '476fceaba3e8c8d5b775fc07ad098792fc757f76':
Adding bouncer animation on PagedView. (Bug 7459660)
2012-11-07 14:54:34 -08:00
Jean-Baptiste Queru
476fceaba3
Merge 5418dd92
...
Change-Id: I50cd61c9dce55d528005b8d36dddf5cc62af89a8
2012-11-07 14:41:18 -08:00
Mike Lockwood
13d9d4ffaf
Merge "SerialManager: Only allow opening files that are whitelisted serial port devices"
2012-11-07 14:04:55 -08:00
Kenny Root
7b172a49a9
am 58ed5d74: am 768d9e1a: Merge "Correct executable bit for source files"
...
* commit '58ed5d748c0b9b64845975ef5844ad313de7c3f6':
Correct executable bit for source files
2012-11-07 13:08:25 -08:00
Elliott Hughes
e4d08f11c4
am 9197d170: am fec5f611: Merge "It\'s 2012. We\'re always WITH_JIT."
...
* commit '9197d170b770f2b87abd0cd0e13dcf71e5a181c2':
It's 2012. We're always WITH_JIT.
2012-11-07 13:08:11 -08:00
Kenny Root
58ed5d748c
am 768d9e1a: Merge "Correct executable bit for source files"
...
* commit '768d9e1a72ceee7d4a5f608776b87b62d6ce4a04':
Correct executable bit for source files
2012-11-07 11:52:12 -08:00
Kenny Root
768d9e1a72
Merge "Correct executable bit for source files"
2012-11-07 11:45:14 -08:00
Elliott Hughes
9197d170b7
am fec5f611: Merge "It\'s 2012. We\'re always WITH_JIT."
...
* commit 'fec5f611fef4fc3b7afa5d7194f4f40d156157ac':
It's 2012. We're always WITH_JIT.
2012-11-07 10:48:26 -08:00
Kenny Root
3a084af2e9
Correct executable bit for source files
...
Many media files and source code files were marked as executable in Git.
Remove those.
Also a shell script and python script were not marked as executable.
Change-Id: Ieb51bafb46c895a21d2e83696f5a901ba752b2c5
2012-11-07 10:27:31 -08:00
Elliott Hughes
fec5f611fe
Merge "It's 2012. We're always WITH_JIT."
2012-11-07 09:57:16 -08:00
Baligh Uddin
b7135adf72
Merge "Import translations. DO NOT MERGE"
2012-11-07 09:49:12 -08:00
Baligh Uddin
f6a4a04cad
Merge "Import translations. DO NOT MERGE"
2012-11-07 09:41:08 -08:00
Elliott Hughes
be8b47f6ce
It's 2012. We're always WITH_JIT.
...
Change-Id: Ia3d1a1b1df06816f2cfa3879ec669b34c62cf9b9
2012-11-06 17:16:21 -08:00
Doris Liu
de05b93a1e
Merge "Adding width and height into screenshot metadata"
2012-11-06 16:57:17 -08:00
Doris Liu
5aa011b18a
Adding width and height into screenshot metadata
...
Bug: 7486020
Change-Id: I375cf9f1065bd1c75558d5f986e7e483cfd4a404
2012-11-06 16:29:46 -08:00
Craig Mautner
184b2c1ed1
Merge "Layout windows that are about to animate."
2012-11-06 16:22:50 -08:00
Romain Guy
474a930030
am a1ca6d39: am a75a41e9: am 9d547d69: Merge "Clarify ViewStub.setVisibility() documentation to state that it works after inflation."
...
* commit 'a1ca6d39f9c0089aaab05249269ee8fbfe66f035':
Clarify ViewStub.setVisibility() documentation to state that it works after inflation.
2012-11-06 16:01:50 -08:00
Romain Guy
a1ca6d39f9
am a75a41e9: am 9d547d69: Merge "Clarify ViewStub.setVisibility() documentation to state that it works after inflation."
...
* commit 'a75a41e9b12c90638fbff9ce69b2820f334bdda3':
Clarify ViewStub.setVisibility() documentation to state that it works after inflation.
2012-11-06 15:58:08 -08:00
Romain Guy
a75a41e9b1
am 9d547d69: Merge "Clarify ViewStub.setVisibility() documentation to state that it works after inflation."
...
* commit '9d547d6934f64189e368c0b190fb4cf49c95a557':
Clarify ViewStub.setVisibility() documentation to state that it works after inflation.
2012-11-06 15:55:22 -08:00
Adam Powell
b3224e8c9e
am b5f27ddb: am dd1dd607: am d811f27f: am 9ff6d4f8: Merge "Keyguard sanity checks for when layout is not yet complete" into jb-mr1-lockscreen-dev
...
* commit 'b5f27ddb3e56929db3cc9f4705a760caea371eb7':
Keyguard sanity checks for when layout is not yet complete
2012-11-06 15:33:46 -08:00
Adam Powell
b5f27ddb3e
am dd1dd607: am d811f27f: am 9ff6d4f8: Merge "Keyguard sanity checks for when layout is not yet complete" into jb-mr1-lockscreen-dev
...
* commit 'dd1dd60770dccf83bba3e4abab2221f2bb7f1e1d':
Keyguard sanity checks for when layout is not yet complete
2012-11-06 15:30:49 -08:00
Jean-Baptiste Queru
45e99647dd
am ecf37221: Merge eead9274
...
* commit 'ecf372213db4a1e12f07b4684f3357a838b90daa':
Fix small widgets not showing up on tablet (issue 7471516)
2012-11-06 15:26:54 -08:00
Jean-Baptiste Queru
ecf372213d
Merge eead9274
...
Change-Id: If59b9cf13297d3a556810501621cce65947ccf95
2012-11-06 15:16:09 -08:00
Craig Mautner
f02296f599
Layout windows that are about to animate.
...
Do not treat windows that are animating as "gone" for layout
purposes.
Bug 7453222 fixed.
Change-Id: I521a44127eafdfee18ff0cf858861d85efdcac93
2012-11-06 14:33:46 -08:00
Baligh Uddin
db964a8b3b
Import translations. DO NOT MERGE
...
Change-Id: I6da4a0967102a618cf11aa507c2269281d88f936
Auto-generated-cl: translation import
2012-11-06 14:31:41 -08:00
Baligh Uddin
8949fd828a
Import translations. DO NOT MERGE
...
Change-Id: Ib3047c233de6d48ceffc7edb5c9a03dd56175090
Auto-generated-cl: translation import
2012-11-06 14:19:45 -08:00
Baligh Uddin
acff0272d6
am 3ee5aeb2: am 59880dfd: am 0ca353fb: am af0d09be: am 00b5ed8f: Merge commit \'b3f87c24ee86227e22b2db9b04f3d94519f230f9\' into jb-mr1-dev
...
* commit '3ee5aeb2decab58108a0d2e7b45f873196718193':
2012-11-06 12:53:20 -08:00
Adam Powell
f194f6532f
am 2d5a68b4: am 833b29a8: am 58bbc5f7: am 5da6430f: Optimize keyguard/IME interactions
...
* commit '2d5a68b4a7b4aea5fbcdce983d9e4514afa73db7':
Optimize keyguard/IME interactions
2012-11-06 12:53:16 -08:00
Joe Malin
461c00cd19
am aa0762b7: am 82ecdcc0: am cc2a14a8: am ff91b179: am db426cc0: am 046671af: am fbcfb5d0: am 50c2275c: Android Training: CursorLoader
...
* commit 'aa0762b7b50c6cf0bbe7825cdf71d3c236a570ee':
2012-11-06 12:53:12 -08:00
Baligh Uddin
3ee5aeb2de
am 59880dfd: am 0ca353fb: am af0d09be: am 00b5ed8f: Merge commit \'b3f87c24ee86227e22b2db9b04f3d94519f230f9\' into jb-mr1-dev
...
* commit '59880dfd2e2078a21a9d4f79a8ea2ae52aa8bdb3':
2012-11-06 12:51:09 -08:00
Adam Powell
2d5a68b4a7
am 833b29a8: am 58bbc5f7: am 5da6430f: Optimize keyguard/IME interactions
...
* commit '833b29a82dfdcdce22e4035aa79edb52c9281f18':
Optimize keyguard/IME interactions
2012-11-06 12:51:05 -08:00
Joe Malin
aa0762b7b5
am 82ecdcc0: am cc2a14a8: am ff91b179: am db426cc0: am 046671af: am fbcfb5d0: am 50c2275c: Android Training: CursorLoader
...
* commit '82ecdcc0f78b55dbb38a99f36e2ebac4148c99be':
2012-11-06 12:51:02 -08:00
Jim Miller
bb9e7dcae9
am be2ca79a: am 7dfc588a: Workaround for layout bug in SIM PIN/PUK views
...
* commit 'be2ca79abf2b1e5eb257560aa99ab48059e48cc8':
Workaround for layout bug in SIM PIN/PUK views
2012-11-06 12:48:26 -08:00
Jim Miller
16ddf343a6
am 8eb3048a: am 87d0366d: Fix NPE caused by applications that try to hide keyguard while it\'s not showing
...
* commit '8eb3048acc2a3fddf0d6acfb43e69696672ae706':
Fix NPE caused by applications that try to hide keyguard while it's not showing
2012-11-06 12:48:22 -08:00
Svetoslav Ganov
ab77b5e6a2
am e97c6faa: am bb8abae5: am 0f4d5df5: Merge "View\'s visibility to the user not checking predecessor alpha." into jb-mr1-dev
...
* commit 'e97c6faadb7d1b51d1dd194d4ccc47e299d09ba9':
2012-11-06 12:48:19 -08:00
Mike Cleron
d97d16f0d1
am f154c9bd: am 624ea441: am c87f198b: Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev
...
* commit 'f154c9bdf81f20cf813064dd4e7e43805095b97a':
2012-11-06 12:48:15 -08:00
Romain Guy
c4101b2b96
am a8e1d119: am 06da3378: am 6c642089: Merge "Add programmatic access to setters in TextClock Bug #7478328 " into jb-mr1-dev
...
* commit 'a8e1d119630ca3d351262ca3f3a11dda4e6edf75':
2012-11-06 12:48:11 -08:00
Winson Chung
5418dd92ac
am 6d47e9fc: am 48275d2d: Adding bouncer animation on PagedView. (Bug 7459660)
...
* commit '6d47e9fc867ece4340869f72d9484c9e5eb71873':
Adding bouncer animation on PagedView. (Bug 7459660)
2012-11-06 12:48:06 -08:00
Adam Powell
dd1dd60770
am d811f27f: am 9ff6d4f8: Merge "Keyguard sanity checks for when layout is not yet complete" into jb-mr1-lockscreen-dev
...
* commit 'd811f27f777d71da7ff226e72a68b09f30c39324':
Keyguard sanity checks for when layout is not yet complete
2012-11-06 12:48:02 -08:00
Adam Cohen
eead927499
am 4e8a47e0: am 79e0f875: Merge "Fix small widgets not showing up on tablet (issue 7471516)" into jb-mr1-lockscreen-dev
...
* commit '4e8a47e01cd0fd409f998e00976b1249c6b2f963':
Fix small widgets not showing up on tablet (issue 7471516)
2012-11-06 12:47:58 -08:00