OSDN Git Service
Roman Nurik [Thu, 8 Nov 2012 14:29:50 +0000 (06:29 -0800)]
am
4b214cdd: am
7a00ac7c: am
a93f94d3: am
512950a9: Merge "docs: Minor Nexus 10 fix in Device Art Generator" into jb-mr1-dev
* commit '
4b214cddb0be3d988b2334898279923ec29ec3f1':
docs: Minor Nexus 10 fix in Device Art Generator
Baligh Uddin [Thu, 8 Nov 2012 14:29:46 +0000 (06:29 -0800)]
am
c1bd157f: (-s ours) am
d98e6dc6: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
c1bd157f50472a96025721e26e697b33c6f44b5b':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 8 Nov 2012 14:29:42 +0000 (06:29 -0800)]
am
b7232a2e: (-s ours) am
20040daf: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
b7232a2e45d5b113334915ff7d94636f6ddfb807':
Import translations. DO NOT MERGE
Roman Nurik [Thu, 8 Nov 2012 14:26:51 +0000 (06:26 -0800)]
am
7a00ac7c: am
a93f94d3: am
512950a9: Merge "docs: Minor Nexus 10 fix in Device Art Generator" into jb-mr1-dev
* commit '
7a00ac7cb74e957bed6580cc209f8035cd34f58d':
docs: Minor Nexus 10 fix in Device Art Generator
Baligh Uddin [Thu, 8 Nov 2012 14:26:45 +0000 (06:26 -0800)]
am
d98e6dc6: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
d98e6dc68021dad263783a0f21e3f861589eb694':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 8 Nov 2012 14:26:41 +0000 (06:26 -0800)]
am
20040daf: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
20040dafbc5f0a0b432d9c41c2da6d7ba7791327':
Import translations. DO NOT MERGE
Svetoslav Ganov [Thu, 8 Nov 2012 14:18:51 +0000 (06:18 -0800)]
am
f3e03e23: am
dc564945: am
7ccb2806: am
5fff5f01: Merge "Make partially visible widget pages not important for accessibility." into jb-mr1-dev
* commit '
f3e03e234f47a85ba25d7a0038253951e94df3b8':
Make partially visible widget pages not important for accessibility.
Irfan Sheriff [Thu, 8 Nov 2012 14:18:47 +0000 (06:18 -0800)]
am
37794c20: am
f264e8e3: am
567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev
* commit '
37794c200fa24e622d842d420b49a2a2a87a38bb':
Stop supplicant and dhcp before start
Sascha Prueter [Thu, 8 Nov 2012 14:18:43 +0000 (06:18 -0800)]
am
f107bda0: am
a517fc3a: am
ee8fab8b: am
872965bb: Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev
* commit '
f107bda0ad3c16dfc85cd2119445e63a937be6bd':
Use a consistent policy for filtering wake keys.
Romain Guy [Thu, 8 Nov 2012 14:18:40 +0000 (06:18 -0800)]
am
a965fc5e: am
b37e5d75: am
7b9b41c1: am
1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #
7442935" into jb-mr1-dev
* commit '
a965fc5e8f0c84cbeeaae7006eddbaf3bba64586':
Dismiss error icon on setError(null) [regression] Bug #
7442935
Eino-Ville Talvala [Thu, 8 Nov 2012 14:18:36 +0000 (06:18 -0800)]
am
f4334f63: am
9671e6e1: am
e980adfd: am
4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev
* commit '
f4334f63c5162035ead3b44131c48015dfc6be58':
Camera: Document new video snapshot picture size behavior.
Victoria Lease [Thu, 8 Nov 2012 14:18:31 +0000 (06:18 -0800)]
am
44d927ca: am
66f3d7f3: am
446ffe00: am
e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev
* commit '
44d927ca837f03e99a4dda52377275da2863ecbb':
Fires geofence if the device is already in the geofence area.
Robert Greenwalt [Thu, 8 Nov 2012 14:18:25 +0000 (06:18 -0800)]
am
744c5204: am
08db1ceb: am
bbe5cafe: Merge "Add Coin graphic to premium-sms dialog." into jb-mr1.1-dev
* commit '
744c520472d59c59f5320e1b0cf0801418eba773':
Add Coin graphic to premium-sms dialog.
The Android Open Source Project [Thu, 8 Nov 2012 14:18:20 +0000 (06:18 -0800)]
am
71390072: (-s ours) am
927372ae: am
f3456803: Reconcile with jb-mr1-release - do not merge
* commit '
71390072023ec559b88f7a06111ffb458d8880f9':
Justin Koh [Thu, 8 Nov 2012 14:18:15 +0000 (06:18 -0800)]
am
4608a0ae: am
41048d67: Merge "Support new touchpad event protocol." into jb-mr1-aah-dev
* commit '
4608a0aec230a1a4857b54354afc3f233af7c1f2':
Support new touchpad event protocol.
Justin Koh [Thu, 8 Nov 2012 14:18:07 +0000 (06:18 -0800)]
am
a1459793: am
58e0fb9a: Merge "Trigger Google Now intent with swipe from bottom" into jb-mr1-aah-dev
* commit '
a1459793d4e2ea483deb8baa733abbac56c2c199':
Trigger Google Now intent with swipe from bottom
Amith Yamasani [Thu, 8 Nov 2012 14:17:59 +0000 (06:17 -0800)]
am
cb5cb740: am
aecee8a9: am
717797db: am
f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev
* commit '
cb5cb740b587744150df7414bdc2974144e9167a':
Authenticate correct user's account when pattern fails multiple times.
Svetoslav Ganov [Thu, 8 Nov 2012 14:14:37 +0000 (06:14 -0800)]
am
dc564945: am
7ccb2806: am
5fff5f01: Merge "Make partially visible widget pages not important for accessibility." into jb-mr1-dev
* commit '
dc564945bb7382768e28e45c6fc2452e3f4d9da9':
Make partially visible widget pages not important for accessibility.
Irfan Sheriff [Thu, 8 Nov 2012 14:14:33 +0000 (06:14 -0800)]
am
f264e8e3: am
567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev
* commit '
f264e8e34e32bfb8e7e75b61b9da9b6f219690b0':
Stop supplicant and dhcp before start
Sascha Prueter [Thu, 8 Nov 2012 14:14:25 +0000 (06:14 -0800)]
am
a517fc3a: am
ee8fab8b: am
872965bb: Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev
* commit '
a517fc3a393b075a677ef3052e22749951ede8fa':
Use a consistent policy for filtering wake keys.
Romain Guy [Thu, 8 Nov 2012 14:14:11 +0000 (06:14 -0800)]
am
b37e5d75: am
7b9b41c1: am
1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #
7442935" into jb-mr1-dev
* commit '
b37e5d756f04489ff95226e26ebfdf141d135f91':
Dismiss error icon on setError(null) [regression] Bug #
7442935
Eino-Ville Talvala [Thu, 8 Nov 2012 14:14:01 +0000 (06:14 -0800)]
am
9671e6e1: am
e980adfd: am
4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev
* commit '
9671e6e116bbb8a82784457382cab3f90289e31b':
Camera: Document new video snapshot picture size behavior.
Victoria Lease [Thu, 8 Nov 2012 14:13:21 +0000 (06:13 -0800)]
am
66f3d7f3: am
446ffe00: am
e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev
* commit '
66f3d7f3c8247b59516cbc4ad13bea4e0b8c0ef9':
Fires geofence if the device is already in the geofence area.
Robert Greenwalt [Thu, 8 Nov 2012 14:13:17 +0000 (06:13 -0800)]
am
08db1ceb: am
bbe5cafe: Merge "Add Coin graphic to premium-sms dialog." into jb-mr1.1-dev
* commit '
08db1ceba24925cd8a710aa0153519351a9fa2c7':
Add Coin graphic to premium-sms dialog.
The Android Open Source Project [Thu, 8 Nov 2012 14:12:45 +0000 (06:12 -0800)]
am
927372ae: am
f3456803: Reconcile with jb-mr1-release - do not merge
* commit '
927372aec399b7c63d193c57c69b57065e7b66e5':
Justin Koh [Thu, 8 Nov 2012 14:12:30 +0000 (06:12 -0800)]
am
41048d67: Merge "Support new touchpad event protocol." into jb-mr1-aah-dev
* commit '
41048d670d42075732723e72d7f303498690ea99':
Support new touchpad event protocol.
Justin Koh [Thu, 8 Nov 2012 14:12:26 +0000 (06:12 -0800)]
am
58e0fb9a: Merge "Trigger Google Now intent with swipe from bottom" into jb-mr1-aah-dev
* commit '
58e0fb9adbe579a068849a7865a7f1bce7531d1c':
Trigger Google Now intent with swipe from bottom
Amith Yamasani [Thu, 8 Nov 2012 14:12:21 +0000 (06:12 -0800)]
am
aecee8a9: am
717797db: am
f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev
* commit '
aecee8a98543118dacec14a94052243754560e9d':
Authenticate correct user's account when pattern fails multiple times.
John Spurlock [Thu, 8 Nov 2012 13:58:09 +0000 (05:58 -0800)]
am
805337ab: resolved conflicts for merge of
ef44a77f to jb-mr1-dev-plus-aosp
* commit '
805337ab5fb2adf108726b351319d77007577bb4':
Remove add widget transition jank (insecure).
John Spurlock [Thu, 8 Nov 2012 12:43:15 +0000 (07:43 -0500)]
resolved conflicts for merge of
ef44a77f to jb-mr1-dev-plus-aosp
Change-Id: Iad4319796be4b9ad74580f8c20a4e8cb30569f87
John Spurlock [Wed, 7 Nov 2012 23:10:20 +0000 (15:10 -0800)]
am
9a962d7c: am
64091a1d: am
8aa62362: am
ae73c690: Fix regression in camera transition.
* commit '
9a962d7c7df9ff762e3d9798cde868ad73b164db':
Fix regression in camera transition.
Michael Jurka [Wed, 7 Nov 2012 23:10:16 +0000 (15:10 -0800)]
am
e4cc20d1: am
7dfbe2d6: am
3eaa876c: am
08924d00: Merge "Supporting EXTRA_APPWIDGET_OPTIONS correctly" into jb-mr1-lockscreen-dev
* commit '
e4cc20d1148addab9f6f27bad70b3f6d437ea06c':
Supporting EXTRA_APPWIDGET_OPTIONS correctly
Jim Miller [Wed, 7 Nov 2012 23:10:12 +0000 (15:10 -0800)]
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
Jim Miller [Wed, 7 Nov 2012 23:10:08 +0000 (15:10 -0800)]
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
Svetoslav Ganov [Wed, 7 Nov 2012 23:10:04 +0000 (15:10 -0800)]
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':
Mike Cleron [Wed, 7 Nov 2012 23:10:00 +0000 (15:10 -0800)]
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':
Romain Guy [Wed, 7 Nov 2012 23:09:56 +0000 (15:09 -0800)]
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':
John Spurlock [Wed, 7 Nov 2012 23:06:45 +0000 (15:06 -0800)]
am
64091a1d: am
8aa62362: am
ae73c690: Fix regression in camera transition.
* commit '
64091a1da0e87937ad42c8ae0d5e3dd3913b297b':
Fix regression in camera transition.
Michael Jurka [Wed, 7 Nov 2012 23:06:41 +0000 (15:06 -0800)]
am
7dfbe2d6: am
3eaa876c: am
08924d00: Merge "Supporting EXTRA_APPWIDGET_OPTIONS correctly" into jb-mr1-lockscreen-dev
* commit '
7dfbe2d6a7a3d6f11d522f44b5339c7a6d3f2a1b':
Supporting EXTRA_APPWIDGET_OPTIONS correctly
Jim Miller [Wed, 7 Nov 2012 23:06:37 +0000 (15:06 -0800)]
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
Jim Miller [Wed, 7 Nov 2012 23:06:33 +0000 (15:06 -0800)]
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
Svetoslav Ganov [Wed, 7 Nov 2012 23:06:29 +0000 (15:06 -0800)]
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':
Mike Cleron [Wed, 7 Nov 2012 23:06:26 +0000 (15:06 -0800)]
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':
Romain Guy [Wed, 7 Nov 2012 23:06:22 +0000 (15:06 -0800)]
am
c4101b2b: am
a8e1d119: am
06da3378: am
6c642089: Merge "Add programmatic access to setters in TextClock Bug #
7478328" into jb-mr1-dev
* commit '
c4101b2b96d7958e26da5a7b3d14cc2540f8002a':
Jean-Baptiste Queru [Wed, 7 Nov 2012 22:54:34 +0000 (14:54 -0800)]
am
476fceab: Merge
5418dd92
* commit '
476fceaba3e8c8d5b775fc07ad098792fc757f76':
Adding bouncer animation on PagedView. (Bug
7459660)
Jean-Baptiste Queru [Wed, 7 Nov 2012 22:41:18 +0000 (14:41 -0800)]
Merge
5418dd92
Change-Id: I50cd61c9dce55d528005b8d36dddf5cc62af89a8
Mike Lockwood [Wed, 7 Nov 2012 22:04:54 +0000 (14:04 -0800)]
Merge "SerialManager: Only allow opening files that are whitelisted serial port devices"
Kenny Root [Wed, 7 Nov 2012 21:08:25 +0000 (13:08 -0800)]
am
58ed5d74: am
768d9e1a: Merge "Correct executable bit for source files"
* commit '
58ed5d748c0b9b64845975ef5844ad313de7c3f6':
Correct executable bit for source files
Elliott Hughes [Wed, 7 Nov 2012 21:08:11 +0000 (13:08 -0800)]
am
9197d170: am
fec5f611: Merge "It\'s 2012. We\'re always WITH_JIT."
* commit '
9197d170b770f2b87abd0cd0e13dcf71e5a181c2':
It's 2012. We're always WITH_JIT.
Kenny Root [Wed, 7 Nov 2012 19:52:12 +0000 (11:52 -0800)]
am
768d9e1a: Merge "Correct executable bit for source files"
* commit '
768d9e1a72ceee7d4a5f608776b87b62d6ce4a04':
Correct executable bit for source files
Kenny Root [Wed, 7 Nov 2012 19:45:14 +0000 (11:45 -0800)]
Merge "Correct executable bit for source files"
Elliott Hughes [Wed, 7 Nov 2012 18:48:26 +0000 (10:48 -0800)]
am
fec5f611: Merge "It\'s 2012. We\'re always WITH_JIT."
* commit '
fec5f611fef4fc3b7afa5d7194f4f40d156157ac':
It's 2012. We're always WITH_JIT.
Kenny Root [Wed, 7 Nov 2012 18:19:47 +0000 (10:19 -0800)]
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
Elliott Hughes [Wed, 7 Nov 2012 17:57:15 +0000 (09:57 -0800)]
Merge "It's 2012. We're always WITH_JIT."
Roman Nurik [Wed, 7 Nov 2012 17:55:38 +0000 (09:55 -0800)]
am
a93f94d3: am
512950a9: Merge "docs: Minor Nexus 10 fix in Device Art Generator" into jb-mr1-dev
* commit '
a93f94d32cf3780cd8e4ff4edae90dbc27ed7fb8':
docs: Minor Nexus 10 fix in Device Art Generator
Roman Nurik [Wed, 7 Nov 2012 17:52:36 +0000 (09:52 -0800)]
am
512950a9: Merge "docs: Minor Nexus 10 fix in Device Art Generator" into jb-mr1-dev
* commit '
512950a9713f79f2900c73201906436d12da8639':
docs: Minor Nexus 10 fix in Device Art Generator
Roman Nurik [Wed, 7 Nov 2012 17:49:37 +0000 (09:49 -0800)]
Merge "docs: Minor Nexus 10 fix in Device Art Generator" into jb-mr1-dev
Baligh Uddin [Wed, 7 Nov 2012 17:49:11 +0000 (09:49 -0800)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 7 Nov 2012 17:44:32 +0000 (09:44 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Wed, 7 Nov 2012 17:41:07 +0000 (09:41 -0800)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 7 Nov 2012 17:38:30 +0000 (09:38 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Svetoslav Ganov [Wed, 7 Nov 2012 01:51:53 +0000 (17:51 -0800)]
am
7ccb2806: am
5fff5f01: Merge "Make partially visible widget pages not important for accessibility." into jb-mr1-dev
* commit '
7ccb280611f885850f1ff8168fc7a4505b92789d':
Make partially visible widget pages not important for accessibility.
Svetoslav Ganov [Wed, 7 Nov 2012 01:49:15 +0000 (17:49 -0800)]
am
5fff5f01: Merge "Make partially visible widget pages not important for accessibility." into jb-mr1-dev
* commit '
5fff5f01f8af05164d5d7be72bdadee46360ba92':
Make partially visible widget pages not important for accessibility.
Svetoslav Ganov [Wed, 7 Nov 2012 01:46:32 +0000 (17:46 -0800)]
Merge "Make partially visible widget pages not important for accessibility." into jb-mr1-dev
Irfan Sheriff [Wed, 7 Nov 2012 01:43:05 +0000 (17:43 -0800)]
am
567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev
* commit '
567a2919f3ad66dcb972e45411d18a4515d9f0b1':
Stop supplicant and dhcp before start
Irfan Sheriff [Wed, 7 Nov 2012 01:39:45 +0000 (17:39 -0800)]
Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev
Sascha Prueter [Wed, 7 Nov 2012 01:17:51 +0000 (17:17 -0800)]
am
ee8fab8b: am
872965bb: Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev
* commit '
ee8fab8be5806381904e1fec4ed0123ca39e2b4f':
Use a consistent policy for filtering wake keys.
Elliott Hughes [Wed, 7 Nov 2012 01:16:21 +0000 (17:16 -0800)]
It's 2012. We're always WITH_JIT.
Change-Id: Ia3d1a1b1df06816f2cfa3879ec669b34c62cf9b9
Sascha Prueter [Wed, 7 Nov 2012 01:14:59 +0000 (17:14 -0800)]
am
872965bb: Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev
* commit '
872965bb22ba74a06b755547883c5d0de62bb956':
Use a consistent policy for filtering wake keys.
Sascha Prueter [Wed, 7 Nov 2012 01:11:26 +0000 (17:11 -0800)]
Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev
Doris Liu [Wed, 7 Nov 2012 00:57:16 +0000 (16:57 -0800)]
Merge "Adding width and height into screenshot metadata"
Jeff Brown [Wed, 7 Nov 2012 00:32:01 +0000 (16:32 -0800)]
Use a consistent policy for filtering wake keys.
Previously wake keys were filtered differently depending on whether
a keyguard was showing. If the user disables the keyguard then
no filtering was applied, which means that the volume key may
wake your device while in your pocket.
This change ensures that we use the same policy consistently
regardless of whether keyguard is showing. The behavior is
otherwise the same.
Removed the "Locked" suffix on a method that was actually
being called without a lock held and which in fact does not
require it.
Bug:
7481025
Change-Id: I704c71ca009bc5437f349f858b9de7c77ea73e4b
Doris Liu [Wed, 7 Nov 2012 00:29:46 +0000 (16:29 -0800)]
Adding width and height into screenshot metadata
Bug:
7486020
Change-Id: I375cf9f1065bd1c75558d5f986e7e483cfd4a404
Craig Mautner [Wed, 7 Nov 2012 00:22:49 +0000 (16:22 -0800)]
Merge "Layout windows that are about to animate."
Romain Guy [Wed, 7 Nov 2012 00:21:05 +0000 (16:21 -0800)]
am
7b9b41c1: am
1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #
7442935" into jb-mr1-dev
* commit '
7b9b41c18d0dc9d238111fa1865c72e4a5bb22cc':
Dismiss error icon on setError(null) [regression] Bug #
7442935
Romain Guy [Wed, 7 Nov 2012 00:18:23 +0000 (16:18 -0800)]
am
1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #
7442935" into jb-mr1-dev
* commit '
1b3b2544e647a40094b9c9df2c94e34df7921da5':
Dismiss error icon on setError(null) [regression] Bug #
7442935
Romain Guy [Wed, 7 Nov 2012 00:15:26 +0000 (16:15 -0800)]
Merge "Dismiss error icon on setError(null) [regression] Bug #
7442935" into jb-mr1-dev
Eino-Ville Talvala [Wed, 7 Nov 2012 00:13:42 +0000 (16:13 -0800)]
am
e980adfd: am
4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev
* commit '
e980adfd7085e99e57722e5576798c0ccdfb3f20':
Camera: Document new video snapshot picture size behavior.
Eino-Ville Talvala [Wed, 7 Nov 2012 00:10:55 +0000 (16:10 -0800)]
am
4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev
* commit '
4a1b6e42424d08da0d22a24464e568034ea557ee':
Camera: Document new video snapshot picture size behavior.
Eino-Ville Talvala [Wed, 7 Nov 2012 00:06:00 +0000 (16:06 -0800)]
Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev
Romain Guy [Tue, 6 Nov 2012 01:43:25 +0000 (17:43 -0800)]
Dismiss error icon on setError(null) [regression]
Bug #
7442935
Change-Id: I783d868173637007be326e20795cbb4cb8c7b899
Romain Guy [Wed, 7 Nov 2012 00:01:50 +0000 (16:01 -0800)]
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.
Romain Guy [Tue, 6 Nov 2012 23:58:08 +0000 (15:58 -0800)]
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.
Romain Guy [Tue, 6 Nov 2012 23:55:22 +0000 (15:55 -0800)]
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.
Irfan Sheriff [Sun, 4 Nov 2012 06:20:38 +0000 (23:20 -0700)]
Stop supplicant and dhcp before start
Bug:
7227463
Change-Id: Iaa0df7522edc38d25fae2bbda8d24490e997e733
Adam Powell [Tue, 6 Nov 2012 23:33:46 +0000 (15:33 -0800)]
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
Adam Powell [Tue, 6 Nov 2012 23:30:49 +0000 (15:30 -0800)]
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
Jean-Baptiste Queru [Tue, 6 Nov 2012 23:26:54 +0000 (15:26 -0800)]
am
ecf37221: Merge
eead9274
* commit '
ecf372213db4a1e12f07b4684f3357a838b90daa':
Fix small widgets not showing up on tablet (issue
7471516)
Svetoslav Ganov [Tue, 6 Nov 2012 23:22:11 +0000 (15:22 -0800)]
Make partially visible widget pages not important for accessibility.
1. If the lockscreen has more than one widet, the left and right widget
pages are partially on the screen and visible. Therefore they may
take accessibility focus so the user will hear a prompt that he is
on the partially visible widget page but will not be able to interact
with it - confusing. This change makes partially shown windget frames
not important for accessibility.
bug:
7454355
Change-Id: I475b21e215474a4421acaec485cde64dc4e2aee5
Jean-Baptiste Queru [Tue, 6 Nov 2012 23:16:09 +0000 (15:16 -0800)]
Merge
eead9274
Change-Id: If59b9cf13297d3a556810501621cce65947ccf95
Victoria Lease [Tue, 6 Nov 2012 23:12:44 +0000 (15:12 -0800)]
am
446ffe00: am
e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev
* commit '
446ffe00cd402e18c041fb36c4d0d03429186224':
Fires geofence if the device is already in the geofence area.
Robert Greenwalt [Tue, 6 Nov 2012 23:11:04 +0000 (15:11 -0800)]
am
bbe5cafe: Merge "Add Coin graphic to premium-sms dialog." into jb-mr1.1-dev
* commit '
bbe5cafeebbbd08516909a3d9d12d5d319cba345':
Add Coin graphic to premium-sms dialog.
Victoria Lease [Tue, 6 Nov 2012 23:09:37 +0000 (15:09 -0800)]
am
e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev
* commit '
e6299d5af702dd17eb3585dbe84d29c289bfa8da':
Fires geofence if the device is already in the geofence area.
Robert Greenwalt [Tue, 6 Nov 2012 23:07:35 +0000 (15:07 -0800)]
Merge "Add Coin graphic to premium-sms dialog." into jb-mr1.1-dev
Victoria Lease [Tue, 6 Nov 2012 23:06:15 +0000 (15:06 -0800)]
Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev
Craig Mautner [Tue, 6 Nov 2012 22:33:46 +0000 (14:33 -0800)]
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
Baligh Uddin [Tue, 6 Nov 2012 22:31:41 +0000 (14:31 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6da4a0967102a618cf11aa507c2269281d88f936
Auto-generated-cl: translation import
Baligh Uddin [Tue, 6 Nov 2012 22:27:46 +0000 (14:27 -0800)]
Import translations. DO NOT MERGE
Change-Id: I37daca17d62112249577b66dde31621f041eff62
Auto-generated-cl: translation import
Baligh Uddin [Tue, 6 Nov 2012 22:19:45 +0000 (14:19 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib3047c233de6d48ceffc7edb5c9a03dd56175090
Auto-generated-cl: translation import
Baligh Uddin [Tue, 6 Nov 2012 21:57:58 +0000 (13:57 -0800)]
Import translations. DO NOT MERGE
Change-Id: I45d540fce163bd0eb6e2edbb6358a1aa6f50193b
Auto-generated-cl: translation import