OSDN Git Service
Amith Yamasani [Mon, 28 Jan 2013 19:52:29 +0000 (11:52 -0800)]
am
a0d089f2: am
b3eab8ff: am
1f6178fd: am
abcb9b96: Merge "Added focusable true on search_button for D-pad."
# By Ki-Hwan Lee
# Via Android Git Automerger (3) and others
* commit '
a0d089f2b2cad1a18345428c0ac8fd5210f942d5':
Added focusable true on search_button for D-pad.
Adam Powell [Mon, 28 Jan 2013 19:52:26 +0000 (11:52 -0800)]
am
9122187f: am
bb74d8b9: am
783fe429: am
e305e5f6: Merge "show SELECT ALL icon with text in landscape mode"
# By Sungmin Choi
# Via Android Git Automerger (3) and others
* commit '
9122187fca67c7509ba2a040b602f67928fc9a98':
show SELECT ALL icon with text in landscape mode
Amith Yamasani [Mon, 28 Jan 2013 19:44:05 +0000 (11:44 -0800)]
am
b3eab8ff: am
1f6178fd: am
abcb9b96: Merge "Added focusable true on search_button for D-pad."
# By Ki-Hwan Lee
# Via Android Git Automerger (2) and others
* commit '
b3eab8ff6169ec6f9e5fe7c00a5dc8925e95b1e6':
Added focusable true on search_button for D-pad.
Adam Powell [Mon, 28 Jan 2013 19:44:02 +0000 (11:44 -0800)]
am
bb74d8b9: am
783fe429: am
e305e5f6: Merge "show SELECT ALL icon with text in landscape mode"
# By Sungmin Choi
# Via Android Git Automerger (2) and others
* commit '
bb74d8b9f632bdda2f5639a9516a83f58374b936':
show SELECT ALL icon with text in landscape mode
Amith Yamasani [Mon, 28 Jan 2013 19:41:06 +0000 (11:41 -0800)]
am
1f6178fd: am
abcb9b96: Merge "Added focusable true on search_button for D-pad."
# By Ki-Hwan Lee
# Via Android Git Automerger (1) and others
* commit '
1f6178fd0442338c94cef2fcf12e59c9ce1cf556':
Added focusable true on search_button for D-pad.
Adam Powell [Mon, 28 Jan 2013 19:41:03 +0000 (11:41 -0800)]
am
783fe429: am
e305e5f6: Merge "show SELECT ALL icon with text in landscape mode"
# By Sungmin Choi
# Via Android Git Automerger (1) and others
* commit '
783fe4295372cee8d024388221414c253802c995':
show SELECT ALL icon with text in landscape mode
Amith Yamasani [Mon, 28 Jan 2013 19:37:48 +0000 (11:37 -0800)]
am
abcb9b96: Merge "Added focusable true on search_button for D-pad."
# By Ki-Hwan Lee
# Via Gerrit Code Review (1) and Ki-Hwan Lee (1)
* commit '
abcb9b96f8d1e3780cf63502ca86a00b3f314b39':
Added focusable true on search_button for D-pad.
Adam Powell [Mon, 28 Jan 2013 19:37:41 +0000 (11:37 -0800)]
am
e305e5f6: Merge "show SELECT ALL icon with text in landscape mode"
# By Sungmin Choi
# Via Gerrit Code Review (1) and Sungmin Choi (1)
* commit '
e305e5f68df8338cb3c4bdcf099d23ec9abce564':
show SELECT ALL icon with text in landscape mode
Amith Yamasani [Mon, 28 Jan 2013 18:46:37 +0000 (18:46 +0000)]
Merge "Added focusable true on search_button for D-pad."
Adam Powell [Mon, 28 Jan 2013 18:44:10 +0000 (18:44 +0000)]
Merge "show SELECT ALL icon with text in landscape mode"
Amith Yamasani [Mon, 28 Jan 2013 18:40:36 +0000 (10:40 -0800)]
am
6d2def71: am
c28fde57: am
0b515aec: am
3cfca67b: Merge "Fix possible integer overflow in MtpStorage"
# By Henrik Engström
# Via Android Git Automerger (3) and others
* commit '
6d2def71e0a7f6ed81b96444fb1cce7177251b36':
Fix possible integer overflow in MtpStorage
Amith Yamasani [Mon, 28 Jan 2013 18:33:55 +0000 (10:33 -0800)]
am
c28fde57: am
0b515aec: am
3cfca67b: Merge "Fix possible integer overflow in MtpStorage"
# By Henrik Engström
# Via Android Git Automerger (2) and others
* commit '
c28fde57f0c7762913615b16d651d4e7991d6175':
Fix possible integer overflow in MtpStorage
Amith Yamasani [Mon, 28 Jan 2013 18:31:01 +0000 (10:31 -0800)]
am
0b515aec: am
3cfca67b: Merge "Fix possible integer overflow in MtpStorage"
# By Henrik Engström
# Via Android Git Automerger (1) and others
* commit '
0b515aece642283a25c6a4416f0aecdaf17bdb58':
Fix possible integer overflow in MtpStorage
Amith Yamasani [Mon, 28 Jan 2013 18:28:38 +0000 (10:28 -0800)]
am
3cfca67b: Merge "Fix possible integer overflow in MtpStorage"
# By Henrik Engström
# Via Gerrit Code Review (1) and Henrik Baard (1)
* commit '
3cfca67b0f1e3f464274fa5d3b2e31e5288d8f38':
Fix possible integer overflow in MtpStorage
Siva Velusamy [Mon, 28 Jan 2013 18:12:04 +0000 (10:12 -0800)]
am
a6a5c8f6: Merge "Support invoking view methods from hierarchy viewer"
# Via Android (Google) Code Review (1) and Siva Velusamy (1)
* commit '
a6a5c8f6b66c0750a28d2ad9cba18d0c730c4393':
Support invoking view methods from hierarchy viewer
Amith Yamasani [Mon, 28 Jan 2013 18:09:59 +0000 (18:09 +0000)]
Merge "Fix possible integer overflow in MtpStorage"
Siva Velusamy [Mon, 28 Jan 2013 18:02:49 +0000 (18:02 +0000)]
Merge "Support invoking view methods from hierarchy viewer"
Baligh Uddin [Mon, 28 Jan 2013 17:57:49 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE" into master-chromium
Baligh Uddin [Mon, 28 Jan 2013 17:53:25 +0000 (09:53 -0800)]
am
d7368563: (-s ours) Merge "Import translations. DO NOT MERGE"
# Via Android (Google) Code Review (1) and Baligh Uddin (1)
* commit '
d73685635217a88595eeaa010f92cac65bd59543':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 28 Jan 2013 17:49:24 +0000 (17:49 +0000)]
Merge "Import translations. DO NOT MERGE"
Victoria Lease [Mon, 28 Jan 2013 17:11:18 +0000 (09:11 -0800)]
am
de07d41f: Merge "Annotate Locations coming from mock providers"
# Via Android (Google) Code Review (1) and Victoria Lease (1)
* commit '
de07d41f6396f9f040fed2b6780932d8e5dbb482':
Annotate Locations coming from mock providers
Victoria Lease [Mon, 28 Jan 2013 17:07:39 +0000 (17:07 +0000)]
Merge "Annotate Locations coming from mock providers"
Irfan Sheriff [Mon, 28 Jan 2013 16:21:23 +0000 (08:21 -0800)]
am
e6a6d838: am
be3d6457: am
a56711a0: am
169dc398: Merge "Remove config_wifi_p2p_support from config.xml."
# By Yoshihiko Ikenaga
# Via Android Git Automerger (3) and others
* commit '
e6a6d83845d40526cab2d91d0c92b32d4267f5e1':
Remove config_wifi_p2p_support from config.xml.
Irfan Sheriff [Mon, 28 Jan 2013 16:18:26 +0000 (08:18 -0800)]
am
be3d6457: am
a56711a0: am
169dc398: Merge "Remove config_wifi_p2p_support from config.xml."
# By Yoshihiko Ikenaga
# Via Android Git Automerger (2) and others
* commit '
be3d6457984cbb3c39ab0741fe8cb721a98139c3':
Remove config_wifi_p2p_support from config.xml.
Irfan Sheriff [Mon, 28 Jan 2013 16:16:23 +0000 (08:16 -0800)]
am
a56711a0: am
169dc398: Merge "Remove config_wifi_p2p_support from config.xml."
# By Yoshihiko Ikenaga
# Via Android Git Automerger (1) and others
* commit '
a56711a04618bbdcdaecf15e1815a5618e6b4737':
Remove config_wifi_p2p_support from config.xml.
Irfan Sheriff [Mon, 28 Jan 2013 16:13:42 +0000 (08:13 -0800)]
am
169dc398: Merge "Remove config_wifi_p2p_support from config.xml."
# By Yoshihiko Ikenaga
# Via Gerrit Code Review (1) and Yoshihiko Ikenaga (1)
* commit '
169dc398ed946edae6fffa997e92871b711561d6':
Remove config_wifi_p2p_support from config.xml.
Irfan Sheriff [Mon, 28 Jan 2013 16:01:43 +0000 (16:01 +0000)]
Merge "Remove config_wifi_p2p_support from config.xml."
Baligh Uddin [Mon, 28 Jan 2013 15:37:30 +0000 (07:37 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icec6b5cb98bc7c93fcac9bd2d04213ce3a3fb659
Auto-generated-cl: translation import
Baligh Uddin [Mon, 28 Jan 2013 15:35:56 +0000 (07:35 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id85cf1077c4053fd9987c6a66f614503b1a616d8
Auto-generated-cl: translation import
Kenny Root [Sat, 26 Jan 2013 01:18:44 +0000 (17:18 -0800)]
am
572ec703: am
a6472811: am
2e99d3c9: am
ebb61ca2: Merge "Track libcore changes for OpenSSLKey"
# Via Android Git Automerger (3) and others
* commit '
572ec703d5b647cb7de4f30f2db4dc35a5e1a17e':
Track libcore changes for OpenSSLKey
Kenny Root [Sat, 26 Jan 2013 01:18:40 +0000 (17:18 -0800)]
am
e7e0a072: am
4dca3946: am
df1498dc: am
bf043b50: Merge "Add TLS Channel ID support to SSLCertificateSocketFactory."
# By Alex Klyubin
# Via Android Git Automerger (3) and others
* commit '
e7e0a072704a5dec3d709fce60762e515382ee42':
Add TLS Channel ID support to SSLCertificateSocketFactory.
Kenny Root [Sat, 26 Jan 2013 01:12:08 +0000 (17:12 -0800)]
am
a6472811: am
2e99d3c9: am
ebb61ca2: Merge "Track libcore changes for OpenSSLKey"
# Via Android Git Automerger (2) and others
* commit '
a647281109584d96ba2265c0faa14432deeb9815':
Track libcore changes for OpenSSLKey
Kenny Root [Sat, 26 Jan 2013 01:11:57 +0000 (17:11 -0800)]
am
4dca3946: am
df1498dc: am
bf043b50: Merge "Add TLS Channel ID support to SSLCertificateSocketFactory."
# By Alex Klyubin
# Via Android Git Automerger (2) and others
* commit '
4dca3946177aaea54d78d39273324caacf74a7bb':
Add TLS Channel ID support to SSLCertificateSocketFactory.
Kenny Root [Sat, 26 Jan 2013 00:41:33 +0000 (16:41 -0800)]
am
2e99d3c9: am
ebb61ca2: Merge "Track libcore changes for OpenSSLKey"
# Via Android Git Automerger (1) and others
* commit '
2e99d3c9646861ca92faf6708c18e36c7530fd93':
Track libcore changes for OpenSSLKey
Kenny Root [Sat, 26 Jan 2013 00:39:33 +0000 (16:39 -0800)]
am
ebb61ca2: Merge "Track libcore changes for OpenSSLKey"
# Via Gerrit Code Review (1) and Kenny Root (1)
* commit '
ebb61ca2ed20472d684ab1490b61482392121051':
Track libcore changes for OpenSSLKey
Kenny Root [Sat, 26 Jan 2013 00:26:01 +0000 (00:26 +0000)]
Merge "Track libcore changes for OpenSSLKey"
Kenny Root [Fri, 25 Jan 2013 22:32:04 +0000 (14:32 -0800)]
am
df1498dc: am
bf043b50: Merge "Add TLS Channel ID support to SSLCertificateSocketFactory."
# By Alex Klyubin
# Via Alex Klyubin (1) and others
* commit '
df1498dcbac86018b719cda8bf2e9ff3a6dedec8':
Add TLS Channel ID support to SSLCertificateSocketFactory.
Kenny Root [Fri, 25 Jan 2013 22:25:36 +0000 (14:25 -0800)]
am
bf043b50: Merge "Add TLS Channel ID support to SSLCertificateSocketFactory."
# By Alex Klyubin
# Via Alex Klyubin (1) and Gerrit Code Review (1)
* commit '
bf043b505c945403752227d89b74bacd7fbcd608':
Add TLS Channel ID support to SSLCertificateSocketFactory.
Kenny Root [Fri, 25 Jan 2013 22:08:52 +0000 (22:08 +0000)]
Merge "Add TLS Channel ID support to SSLCertificateSocketFactory."
Dianne Hackborn [Fri, 25 Jan 2013 19:37:24 +0000 (11:37 -0800)]
am
b9781fe0: Merge "App ops: you can now turn off operations."
# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit '
b9781fe08c5b1afba086857aa18b46862550ae88':
App ops: you can now turn off operations.
Dianne Hackborn [Fri, 25 Jan 2013 19:32:52 +0000 (19:32 +0000)]
Merge "App ops: you can now turn off operations."
Dianne Hackborn [Fri, 25 Jan 2013 03:13:44 +0000 (19:13 -0800)]
App ops: you can now turn off operations.
Also add new ops for calendar and wi-fi scans, finish
implementing rejection of content provider calls, fix
issues with rejecting location calls, fix bug in the
new pm call to retrieve apps with permissions.
Change-Id: I29d9f8600bfbbf6561abf6d491907e2bbf6af417
Fergus Henderson [Fri, 25 Jan 2013 15:29:24 +0000 (07:29 -0800)]
am
1c2df382: Fix logic error in Pszczepaniak\'s recent change.
# Via Fergus Henderson
* commit '
1c2df38242c29cd7f359a6fb13dc13b387264310':
Fix logic error in Pszczepaniak's recent change.
Fergus Henderson [Fri, 25 Jan 2013 14:59:59 +0000 (14:59 +0000)]
Fix logic error in Pszczepaniak's recent change.
Also improve wording of error message.
Bug:
7666482
Change-Id: I2d2316b10fdf394bec8963327529723cbd5fbb32
Sungmin Choi [Fri, 25 Jan 2013 12:39:01 +0000 (21:39 +0900)]
show SELECT ALL icon with text in landscape mode
Though set config_allowActionMenuItemTextWithIcon as true,
icon for the "SELECT ALL" menu on ActionBar is not shown as staring
in landscape mode.
To fix it, use "SELECT ALL" icon in onCreateActionMode() to show the
icon and text together.
To show or hide text is decided by updateTextButtonVisibility() of
core/java/com/android/internal/view/menu/ActionMenuItemView.java
STEPS TO REPRODUCE: (please be specific)
1. launch Browser/Chrome and go to google.com
2. rotate to landscape mode
3. long press on URL address
Bug:
8073761
Change-Id: Ie0e0aa45f0dff609ed8c03e4423b163bad5452ed
Yoshihiko Ikenaga [Fri, 25 Jan 2013 02:35:33 +0000 (11:35 +0900)]
Remove config_wifi_p2p_support from config.xml.
"config_wifi_p2p_support" is no longer used.
It was replaced with PackageManager.FEATURE_WIFI_DIRECT.
Change-Id: Ib57c5246b2ad218e65b4cbbb77fd37c04b5d9682
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
Irfan Sheriff [Fri, 25 Jan 2013 00:19:01 +0000 (16:19 -0800)]
am
526603b1: am
441a90dc: am
3a0acc03: am
381fb8bd: Merge "Fix WPS configuration method of BSS enrollee."
# By Yoshihiko Ikenaga
# Via Android Git Automerger (3) and others
* commit '
526603b1d8404432256b03507187f50c6b21b31d':
Fix WPS configuration method of BSS enrollee.
Irfan Sheriff [Fri, 25 Jan 2013 00:15:29 +0000 (16:15 -0800)]
am
441a90dc: am
3a0acc03: am
381fb8bd: Merge "Fix WPS configuration method of BSS enrollee."
# By Yoshihiko Ikenaga
# Via Android Git Automerger (2) and others
* commit '
441a90dc72d05082f0d1a4b227d48420a0b99a54':
Fix WPS configuration method of BSS enrollee.
Irfan Sheriff [Fri, 25 Jan 2013 00:12:00 +0000 (16:12 -0800)]
am
3a0acc03: am
381fb8bd: Merge "Fix WPS configuration method of BSS enrollee."
# By Yoshihiko Ikenaga
# Via Android Git Automerger (1) and others
* commit '
3a0acc03bb0f57df23b2c8e859acd37b80f42620':
Fix WPS configuration method of BSS enrollee.
Laurent Tu [Thu, 24 Jan 2013 23:44:47 +0000 (15:44 -0800)]
am
377fc095: Merge "Fix GpsLocationProvider.enable/disable/isEnabled"
# Via Android (Google) Code Review (1) and Laurent Tu (1)
* commit '
377fc095e142b160b5093ed1d3717d0b18aff0f9':
Fix GpsLocationProvider.enable/disable/isEnabled
Laurent Tu [Thu, 24 Jan 2013 23:42:03 +0000 (23:42 +0000)]
Merge "Fix GpsLocationProvider.enable/disable/isEnabled"
Laurent Tu [Thu, 24 Jan 2013 23:10:24 +0000 (15:10 -0800)]
Fix GpsLocationProvider.enable/disable/isEnabled
Fix the issue where GpsLocationProvider.isEnabled() returns true when it
is really false (and the other way around), when the handler hasn't
processed the enable/disable messages yet.
This can be systematically reproduced when the caller code is using the
same thread as the thread of the handler in GpsLocationProvider.
For example, this was happening in LocationManagerService.switchUser().
It would start by disabling all the providers (with
updateProviderListenersLocked()), then re-enable them in
updateProvidersLocked() only when isEnalbed()==false, which was in the
wrong state since the GpsLocationProvider.ENABLE message hadn't been
processed yet. As a result, the GpsLocationProvider was disabled upon
startup of the phone.
This is a slight problem for the enable() contract, which specifies that
getStatus() must be handled, getStatus() will be handled but might have
slighty not-up-to-date info in this case.
Bug:
8028017
Change-Id: Iff91a11cc150e9029a6db85b64a10a926e12b0ba
Fabrice Di Meglio [Thu, 24 Jan 2013 21:52:54 +0000 (13:52 -0800)]
am
de71ce1a: Merge "Fix recent apps item text position in RTL mode"
# Via Android (Google) Code Review (1) and Fabrice Di Meglio (1)
* commit '
de71ce1ab3cda6030b5838f4cadb4fe974d522c2':
Fix recent apps item text position in RTL mode
Fabrice Di Meglio [Thu, 24 Jan 2013 21:51:32 +0000 (13:51 -0800)]
am
5e3b0452: Merge "Fix SystemUI navigation bar in RTL mode"
# Via Android (Google) Code Review (1) and Fabrice Di Meglio (1)
* commit '
5e3b0452667e2f73b16bfffde873334525582308':
Fix SystemUI navigation bar in RTL mode
Fabrice Di Meglio [Thu, 24 Jan 2013 21:48:51 +0000 (21:48 +0000)]
Merge "Fix recent apps item text position in RTL mode"
Fabrice Di Meglio [Thu, 24 Jan 2013 21:46:33 +0000 (21:46 +0000)]
Merge "Fix SystemUI navigation bar in RTL mode"
Irfan Sheriff [Thu, 24 Jan 2013 18:22:28 +0000 (10:22 -0800)]
am
381fb8bd: Merge "Fix WPS configuration method of BSS enrollee."
# By Yoshihiko Ikenaga
# Via Gerrit Code Review (1) and Yoshihiko Ikenaga (1)
* commit '
381fb8bdd10e6426f829e90f57686103529adb77':
Fix WPS configuration method of BSS enrollee.
Irfan Sheriff [Thu, 24 Jan 2013 17:38:51 +0000 (17:38 +0000)]
Merge "Fix WPS configuration method of BSS enrollee."
Wink Saville [Thu, 24 Jan 2013 04:54:04 +0000 (20:54 -0800)]
am
36b8d75f: am
311ef539: (-s ours) am
f0bf29df: am
1842f2ed: Merge "frameworks: Display missing text on SimUnlockScreen"
# By Anju Mathapati
# Via Android Git Automerger (3) and others
* commit '
36b8d75f485b0dc4a87328bb88c391daefd4887f':
frameworks: Display missing text on SimUnlockScreen
Wink Saville [Thu, 24 Jan 2013 04:52:28 +0000 (20:52 -0800)]
am
311ef539: (-s ours) am
f0bf29df: am
1842f2ed: Merge "frameworks: Display missing text on SimUnlockScreen"
# By Anju Mathapati
# Via Android Git Automerger (2) and others
* commit '
311ef539cffa35163eae64a93700ab049ceaf827':
frameworks: Display missing text on SimUnlockScreen
Yoshihiko Ikenaga [Thu, 24 Jan 2013 04:48:58 +0000 (13:48 +0900)]
Fix WPS configuration method of BSS enrollee.
Remove keypad from WPS configuration method of BSS enrollee
becuase JB UI does NOT support keypad, only supports pbc and
display.
Change-Id: I9ab6f1514805e8307b46e38261f1c657568aeb59
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
Ki-Hwan Lee [Tue, 8 Jan 2013 09:15:56 +0000 (18:15 +0900)]
Added focusable true on search_button for D-pad.
To give focus to search_button on ActionBar by using D-pad,
the search_button should be set focusable true.
How to reproduce:
(1) Open "API Demos" application -> App -> Action Bar -> Action Bar Usage
(2) Try to focus the Search View, using the D-pad.
Change-Id: Idc0b8e8d88391c152e0fc20467c23d03ab558f62
Wink Saville [Thu, 24 Jan 2013 01:37:28 +0000 (17:37 -0800)]
am
f0bf29df: am
1842f2ed: Merge "frameworks: Display missing text on SimUnlockScreen"
# By Anju Mathapati
# Via Android Git Automerger (1) and others
* commit '
f0bf29df0cff4b7e370b7c329de92e90a4bab194':
frameworks: Display missing text on SimUnlockScreen
Wink Saville [Thu, 24 Jan 2013 01:32:38 +0000 (17:32 -0800)]
am
1842f2ed: Merge "frameworks: Display missing text on SimUnlockScreen"
# By Anju Mathapati
# Via Anju Mathapati (1) and Gerrit Code Review (1)
* commit '
1842f2ed745af0d0f8cc457d448ba552e40a6b34':
frameworks: Display missing text on SimUnlockScreen
Wink Saville [Thu, 24 Jan 2013 00:39:38 +0000 (00:39 +0000)]
Merge "frameworks: Display missing text on SimUnlockScreen"
Adam Powell [Wed, 23 Jan 2013 23:54:12 +0000 (15:54 -0800)]
am
7195c8f2: am
a41f9cfb: am
53d49f17: am
17f05497: am
c2469500: Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev
# Via Android Git Automerger (4) and others
* commit '
7195c8f25b6bfc7564701683d3e2e1ed1bdcfcc6':
Touch action bar title text: you will go to space today!
Adam Powell [Wed, 23 Jan 2013 23:52:28 +0000 (15:52 -0800)]
am
a41f9cfb: am
53d49f17: am
17f05497: am
c2469500: Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev
# Via Android Git Automerger (3) and others
* commit '
a41f9cfbbd1d137bf1baab49e0d453a40a0ecd33':
Touch action bar title text: you will go to space today!
Adam Powell [Wed, 23 Jan 2013 23:48:52 +0000 (15:48 -0800)]
am
53d49f17: am
17f05497: am
c2469500: Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev
# Via Android Git Automerger (2) and others
* commit '
53d49f1702df41a4ca342a1df6e720b16e094797':
Touch action bar title text: you will go to space today!
Adam Powell [Wed, 23 Jan 2013 23:46:20 +0000 (15:46 -0800)]
am
17f05497: am
c2469500: Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev
# Via Adam Powell (1) and others
* commit '
17f05497be90004c0263c6de173af8c19ece07b0':
Touch action bar title text: you will go to space today!
Adam Powell [Wed, 23 Jan 2013 23:44:47 +0000 (15:44 -0800)]
am
c2469500: Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev
# Via Adam Powell (1) and Android (Google) Code Review (1)
* commit '
c246950043c4c48beb51d5b56d94473e77c5fad2':
Touch action bar title text: you will go to space today!
Adam Powell [Wed, 23 Jan 2013 23:42:31 +0000 (23:42 +0000)]
Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev
Adam Powell [Wed, 23 Jan 2013 23:35:35 +0000 (15:35 -0800)]
am
7868d748: am
ae041ce8: am
ce2f911d: am
65083049: am
5a32ec32: Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev
# Via Android Git Automerger (4) and others
* commit '
7868d748addd3cd6e3547d545d0ee16317859892':
Prevent simultaneous interaction with action bar and content
Adam Powell [Wed, 23 Jan 2013 23:31:15 +0000 (15:31 -0800)]
am
ae041ce8: am
ce2f911d: am
65083049: am
5a32ec32: Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev
# Via Android Git Automerger (3) and others
* commit '
ae041ce83d32c7b34d7c513e077165764e97871d':
Prevent simultaneous interaction with action bar and content
Adam Powell [Wed, 23 Jan 2013 23:29:02 +0000 (15:29 -0800)]
am
ce2f911d: am
65083049: am
5a32ec32: Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev
# Via Android Git Automerger (2) and others
* commit '
ce2f911d87927850337dcedda39364d59bd4a7ff':
Prevent simultaneous interaction with action bar and content
Adam Powell [Wed, 23 Jan 2013 23:25:50 +0000 (15:25 -0800)]
am
65083049: am
5a32ec32: Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev
# Via Adam Powell (1) and others
* commit '
650830491868b961e98c1837fb4b4ce7917783b5':
Prevent simultaneous interaction with action bar and content
Adam Powell [Wed, 23 Jan 2013 23:24:18 +0000 (15:24 -0800)]
am
5a32ec32: Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev
# Via Adam Powell (1) and Android (Google) Code Review (1)
* commit '
5a32ec323784ad7926bb9dc3b3678c9b60d3a4ba':
Prevent simultaneous interaction with action bar and content
Adam Powell [Wed, 23 Jan 2013 23:20:56 +0000 (23:20 +0000)]
Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev
Adam Powell [Wed, 23 Jan 2013 02:55:20 +0000 (18:55 -0800)]
Touch action bar title text: you will go to space today!
Title/subtitle text in an action bar is now a full alias for home/up.
Add some prototype ActionBar functionality around titles for future
API consideration.
Bug
7966136
Change-Id: I14377121dcb976d0a5f1e1862f35c3d267eb5458
Dianne Hackborn [Wed, 23 Jan 2013 22:51:07 +0000 (14:51 -0800)]
am
d8ba6cc9: Merge "Add new API to propagate contextual data to the assist action"
# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit '
d8ba6cc9217e2e042106870e9d2e70cfd80426d6':
Add new API to propagate contextual data to the assist action
Dianne Hackborn [Wed, 23 Jan 2013 22:48:41 +0000 (14:48 -0800)]
am
51ff575d: Merge "Fix issue #
7649720: ANR occur when OTA with lower version..."
# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit '
51ff575d1bd0337a68ae173ee699ff8298ddb703':
Fix issue #
7649720: ANR occur when OTA with lower version...
Dianne Hackborn [Wed, 23 Jan 2013 22:47:56 +0000 (22:47 +0000)]
Merge "Add new API to propagate contextual data to the assist action"
Dianne Hackborn [Wed, 23 Jan 2013 22:47:17 +0000 (14:47 -0800)]
am
846dda3f: Merge "Add new disabled state for "optional" built-in apps."
# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit '
846dda3fa7a194b57acdb977e443c93c7cddcea1':
Add new disabled state for "optional" built-in apps.
Dianne Hackborn [Wed, 23 Jan 2013 22:45:51 +0000 (22:45 +0000)]
Merge "Fix issue #
7649720: ANR occur when OTA with lower version..."
Dianne Hackborn [Wed, 23 Jan 2013 22:43:11 +0000 (22:43 +0000)]
Merge "Add new disabled state for "optional" built-in apps."
Dianne Hackborn [Wed, 23 Jan 2013 22:39:13 +0000 (14:39 -0800)]
Add new API to propagate contextual data to the assist action
When launching an assist, we have a new API allowing the
current foreground activity/application to provide additional
arbitrary contextual information that is stuffed in the
assist intent before it is launched.
Change-Id: I0b2a6f5a266dc42cc0175327fa76774f814af3b4
Baligh Uddin [Wed, 23 Jan 2013 22:24:47 +0000 (14:24 -0800)]
am
00dcbf8f: (-s ours) Merge "Import translations. DO NOT MERGE"
# Via Android (Google) Code Review (1) and Baligh Uddin (1)
* commit '
00dcbf8f58c36e3e8803336aa947a333411f43d0':
Import translations. DO NOT MERGE
Adam Powell [Wed, 23 Jan 2013 22:23:06 +0000 (14:23 -0800)]
Prevent simultaneous interaction with action bar and content
Bug
8034744
Change-Id: I72cf4f5d2443e1cd6e40785b4d06d9bd363ab3e4
Baligh Uddin [Wed, 23 Jan 2013 22:18:25 +0000 (22:18 +0000)]
Merge "Import translations. DO NOT MERGE" into master-chromium
Baligh Uddin [Wed, 23 Jan 2013 22:15:52 +0000 (22:15 +0000)]
Merge "Import translations. DO NOT MERGE"
Winson Chung [Wed, 23 Jan 2013 22:13:54 +0000 (14:13 -0800)]
am
79703fa0: Merge "Cleaning up listeners and AsyncTasks."
# Via Android (Google) Code Review (1) and Winson Chung (1)
* commit '
79703fa00cc9820ec004555f843880e3b60e5815':
Cleaning up listeners and AsyncTasks.
Winson Chung [Wed, 23 Jan 2013 22:08:14 +0000 (22:08 +0000)]
Merge "Cleaning up listeners and AsyncTasks."
Baligh Uddin [Wed, 23 Jan 2013 18:05:44 +0000 (10:05 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib4afab557f438b2b0c9144e26f5d71c5eae17a95
Auto-generated-cl: translation import
Baligh Uddin [Wed, 23 Jan 2013 18:04:41 +0000 (10:04 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ibe1bebc4f75eb892503bb29519aa62574aa82c7e
Auto-generated-cl: translation import
Wink Saville [Wed, 23 Jan 2013 17:47:00 +0000 (09:47 -0800)]
am
d0c4ce4c: am
24dbdc7d: am
23d85a91: am
d84d289f: Merge "Telephony: Consider EVDO ecio zero value as valid."
* commit '
d0c4ce4c3d7315642d3b06fbb95512a9ce8e498c':
Telephony: Consider EVDO ecio zero value as valid.
Wink Saville [Wed, 23 Jan 2013 17:44:04 +0000 (09:44 -0800)]
am
24dbdc7d: am
23d85a91: am
d84d289f: Merge "Telephony: Consider EVDO ecio zero value as valid."
* commit '
24dbdc7d0e1e20b5c598561e7f5ed9c4dd335b7b':
Telephony: Consider EVDO ecio zero value as valid.
Wink Saville [Wed, 23 Jan 2013 17:42:03 +0000 (09:42 -0800)]
am
23d85a91: am
d84d289f: Merge "Telephony: Consider EVDO ecio zero value as valid."
* commit '
23d85a911e46ac00ecaf146ca729aa3a46d17f59':
Telephony: Consider EVDO ecio zero value as valid.
Wink Saville [Wed, 23 Jan 2013 17:38:19 +0000 (09:38 -0800)]
am
d84d289f: Merge "Telephony: Consider EVDO ecio zero value as valid."
* commit '
d84d289f443f5799fb1a81432428703dadb026dd':
Telephony: Consider EVDO ecio zero value as valid.
Wink Saville [Wed, 23 Jan 2013 17:15:58 +0000 (17:15 +0000)]
Merge "Telephony: Consider EVDO ecio zero value as valid."
Christopher Tate [Wed, 23 Jan 2013 02:47:26 +0000 (18:47 -0800)]
am
7b3b2cfc: am
e93ca308: am
0e95685f: am
b5a72043: Merge "Fix array index oob in Matrix3f.loadRotate()."
* commit '
7b3b2cfc29081605a419c266227b88d9a27c37cb':
Fix array index oob in Matrix3f.loadRotate().
Christopher Tate [Wed, 23 Jan 2013 02:45:50 +0000 (18:45 -0800)]
am
e93ca308: am
0e95685f: am
b5a72043: Merge "Fix array index oob in Matrix3f.loadRotate()."
* commit '
e93ca308c8792b231ec921ba8a00e6c78e87f9ad':
Fix array index oob in Matrix3f.loadRotate().