6845 Commits

Author SHA1 Message Date
Michael Wright
a1deeba325 Merge "Add plumbing for Recent Apps keycode" 2013-01-28 22:32:45 +00:00
Amith Yamasani
a0d089f2b2 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.
2013-01-28 11:44:05 -08:00
Amith Yamasani
b3eab8ff61 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.
2013-01-28 11:41:06 -08:00
Amith Yamasani
1f6178fd04 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.
2013-01-28 11:37:48 -08:00
Amith Yamasani
abcb9b96f8 Merge "Added focusable true on search_button for D-pad." 2013-01-28 18:46:38 +00:00
Baligh Uddin
d736856352 Merge "Import translations. DO NOT MERGE" 2013-01-28 17:49:59 +00:00
Irfan Sheriff
e6a6d83845 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.
2013-01-28 08:18:26 -08:00
Irfan Sheriff
be3d645798 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.
2013-01-28 08:16:23 -08:00
Irfan Sheriff
a56711a046 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.
2013-01-28 08:13:42 -08:00
Baligh Uddin
42cd04dead Import translations. DO NOT MERGE
Change-Id: Id85cf1077c4053fd9987c6a66f614503b1a616d8
Auto-generated-cl: translation import
2013-01-28 07:35:56 -08:00
Yoshihiko Ikenaga
8879343c26 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>
2013-01-25 11:35:33 +09:00
Ki-Hwan Lee
6855733b7f 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
2013-01-24 13:15:30 +09:00
Wink Saville
311ef539cf 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
2013-01-23 17:37:28 -08:00
Wink Saville
f0bf29df0c 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
2013-01-23 17:32:38 -08:00
Wink Saville
1842f2ed74 Merge "frameworks: Display missing text on SimUnlockScreen" 2013-01-24 00:39:38 +00:00
Adam Powell
7195c8f25b 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!
2013-01-23 15:52:28 -08:00
Adam Powell
a41f9cfbbd 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!
2013-01-23 15:48:52 -08:00
Adam Powell
c246950043 Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev 2013-01-23 23:42:36 +00:00
Adam Powell
7868d748ad 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
2013-01-23 15:31:15 -08:00
Adam Powell
ae041ce83d 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
2013-01-23 15:29:02 -08:00
Adam Powell
27cba38952 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
2013-01-23 15:14:31 -08:00
Dianne Hackborn
d8ba6cc921 Merge "Add new API to propagate contextual data to the assist action" 2013-01-23 22:47:57 +00:00
Dianne Hackborn
f9c5e0fe83 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
2013-01-23 14:39:13 -08:00
Adam Powell
d28f30a9e0 Prevent simultaneous interaction with action bar and content
Bug 8034744

Change-Id: I72cf4f5d2443e1cd6e40785b4d06d9bd363ab3e4
2013-01-23 14:23:06 -08:00
Baligh Uddin
455bf078cd Import translations. DO NOT MERGE
Change-Id: Ibe1bebc4f75eb892503bb29519aa62574aa82c7e
Auto-generated-cl: translation import
2013-01-23 10:04:41 -08:00
Michael Wright
c9ebea79b4 Add plumbing for Recent Apps keycode
Change-Id: Id1bd8deced1be924cf9b3bbbf19e689b6b759061
2013-01-22 21:26:18 -08:00
Baligh Uddin
6c6317a8ca Merge "Import translations. DO NOT MERGE" 2013-01-23 00:33:36 +00:00
Elliott Hughes
ba7e0922c0 am ef5d1d63: am 6bcecb20: am b63e39a0: Merge "fix typo for symbol"
* commit 'ef5d1d635585b155ffc7882c916beee2a91e2ef2':
  fix typo for symbol
2013-01-22 16:23:36 -08:00
Elliott Hughes
ef5d1d6355 am 6bcecb20: am b63e39a0: Merge "fix typo for symbol"
* commit '6bcecb20005bf397169a120e9dc3c91d30dba154':
  fix typo for symbol
2013-01-22 16:21:03 -08:00
Elliott Hughes
6bcecb2000 am b63e39a0: Merge "fix typo for symbol"
* commit 'b63e39a076c0643680f501a1c646bca088b4bbfc':
  fix typo for symbol
2013-01-22 16:18:58 -08:00
Baligh Uddin
5e3ea0d01c Import translations. DO NOT MERGE
Change-Id: Iaa7f52a909d7b09c3863a823d103e03568b5ac58
Auto-generated-cl: translation import
2013-01-22 08:15:39 -08:00
Michael Wright
7bf6a5c3c7 Merge "Adds enum value for KEYCODE_ASSIST" 2013-01-19 02:19:09 +00:00
Baligh Uddin
611c8a8900 Merge "Import translations. DO NOT MERGE" 2013-01-17 21:22:37 +00:00
Michael Wright
1e71010e58 Adds enum value for KEYCODE_ASSIST
Change-Id: I5ec0563317cee15407429449d790030905be25af
2013-01-16 19:33:10 -08:00
Sungmin Choi
05a96d11dd fix typo for symbol
remove duplicated symbol (sliding_layout)

Change-Id: I401de3832328731d554dd4cda991b77b99454579
2013-01-17 10:25:40 +09:00
Dianne Hackborn
35654b61e8 More work on App Ops service.
Implemented reading and writing state to retain information
across boots, API to retrieve state from it, improved location
manager interaction to monitor both coarse and fine access
and only note operations when location data is being delivered
back to app (not when it is just registering to get the data at
some time in the future).

Also implement tracking of read/write ops on contacts and the
call log.  This involved tweaking the content provider protocol
to pass over the name of the calling package, and some
infrastructure in the ContentProvider transport to note incoming
calls with the app ops service.  The contacts provider and call
log provider turn this on for themselves.

This also implements some of the mechanics of being able to ignore
incoming provider calls...  all that is left are some new APIs for
the real content provider implementation to be involved with
providing the correct behavior for query() (return an empty
cursor with the right columns) and insert() (need to figure out
what URI to return).

Change-Id: I36ebbcd63dee58264a480f3d3786891ca7cbdb4c
2013-01-16 12:11:01 -08:00
Baligh Uddin
2125706d42 Import translations. DO NOT MERGE
Change-Id: I5583386d09eb83518341b123d6d415ab48b80f18
Auto-generated-cl: translation import
2013-01-16 09:40:55 -08:00
Chris Wren
59f733acc4 Merge "port system ui over to new ICU date formatting API." 2013-01-15 14:20:44 -08:00
Chris Wren
56018e577e port system ui over to new ICU date formatting API.
Bug: 7288134
Change-Id: Icea2ff96fd91c6db66b3aad6f6653b21203351b1
2013-01-15 17:14:48 -05:00
Baligh Uddin
4ed11353b3 Merge "Import translations. DO NOT MERGE" 2013-01-15 09:27:59 -08:00
Elliott Hughes
0152360d8b am a99a9f4f: am 9fa542a5: am 727adb8b: Merge "Manual fix for some Norwegian format strings."
* commit 'a99a9f4f80ceb47db0c7b3e9e32547cef4e3ee03':
  Manual fix for some Norwegian format strings.
2013-01-14 19:28:24 -08:00
Elliott Hughes
5bd48b528e am 67ae48f3: am fc91d730: am cbfece82: Merge "Switch over to getting 12-/24-hour time formats from CLDR via icu4c."
* commit '67ae48f32545791fe0a0574f02bfe714e106074b':
  Switch over to getting 12-/24-hour time formats from CLDR via icu4c.
2013-01-14 19:28:20 -08:00
Elliott Hughes
a99a9f4f80 am 9fa542a5: am 727adb8b: Merge "Manual fix for some Norwegian format strings."
* commit '9fa542a5032d8adc3f502cef0c5c98d8f10abbc2':
  Manual fix for some Norwegian format strings.
2013-01-14 19:25:56 -08:00
Elliott Hughes
67ae48f325 am fc91d730: am cbfece82: Merge "Switch over to getting 12-/24-hour time formats from CLDR via icu4c."
* commit 'fc91d73067d76e129869fe472238f4c80aa5d435':
  Switch over to getting 12-/24-hour time formats from CLDR via icu4c.
2013-01-14 19:25:52 -08:00
Elliott Hughes
9fa542a503 am 727adb8b: Merge "Manual fix for some Norwegian format strings."
* commit '727adb8b4795dd4eb708c03ecec69ff64fa8d552':
  Manual fix for some Norwegian format strings.
2013-01-14 19:23:51 -08:00
Elliott Hughes
fc91d73067 am cbfece82: Merge "Switch over to getting 12-/24-hour time formats from CLDR via icu4c."
* commit 'cbfece8237cb9cf62547e75ab9572ccbf682369a':
  Switch over to getting 12-/24-hour time formats from CLDR via icu4c.
2013-01-14 19:23:48 -08:00
Elliott Hughes
bfcd162cc2 Manual fix for some Norwegian format strings.
Fixing these properly (by removing these donottranslate-cldr.xml files
completely) is blocked on icu4c, so manually fix a few strings in the
meantime.

Bug: http://code.google.com/p/android/issues/detail?id=21859
Change-Id: If91ec70ad4c9e0944deee1cb55382e94ac1b7278
2013-01-14 17:48:30 -08:00
Baligh Uddin
ac074da78b Import translations. DO NOT MERGE
Change-Id: I7ab149769c739f980106c70f21c285914331c301
Auto-generated-cl: translation import
2013-01-14 16:44:06 -08:00
Elliott Hughes
4caba61ea0 Switch over to getting 12-/24-hour time formats from CLDR via icu4c.
I removed the duplication in DateTimeView rather than fix that copy
of the code.

Bug: 7924970
Change-Id: I60c205d06ad3b50fd2f5d5fc432e4eb186f9c0e7
2013-01-14 15:48:27 -08:00
Scott Kennedy
57b59e025b am aebeea4c: am 5d6d6aab: am 8e45679a: am 026f9191: am 08342698: Merge "docs: Fix a bunch of issues" into jb-mr1-dev
* commit 'aebeea4cf39acae833b1b7f27a4c08d3b55dee37':
  docs: Fix a bunch of issues
2013-01-14 11:19:13 -08:00