drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
94,954 Commits 1 Branch 0 Tags
Commit Graph

6450 Commits

Author SHA1 Message Date
Elliott Hughes
cdafd37f31 Clean up (some of) our many clocks to use H instead of k. 
Bug: 8359981
Change-Id: I3c0c38c2bf5adc4b5bdc11c3d10cf41dd8fb6462
 2013-03-18 17:21:33 -07:00
Robert Greenwalt
519ba7b10c Merge "update APN version for MVNO" 2013-03-16 00:18:52 +00:00
Sungmin Choi
dfe4db1450 update APN version for MVNO 
As adding MVNO feature, update APN version from 7 to 8.
To recognize MVNO, use new elements, spn, imsi, gid, mvno_type.

Bug: 8143480

Change-Id: Ib8e7370ebc99c1518e6d9337621e64966c128a0b
 2013-02-06 12:09:20 +09:00
Doug Zongker
9c4ba4fe75 am b616f0c2: add android.permission.LOOP_RADIO for access to loop radio device 
# Via Doug Zongker
* commit 'b616f0c239ad61f818741909821b86aceff60b60':
  add android.permission.LOOP_RADIO for access to loop radio device
 2013-01-29 17:01:01 -08:00
Doug Zongker
b616f0c239 add android.permission.LOOP_RADIO for access to loop radio device 
Change-Id: I811d70fa67aa758122678809f32b8aade42ced0f
 2013-01-29 10:39:13 -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
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
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
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
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
Adam Powell
d28f30a9e0 Prevent simultaneous interaction with action bar and content 
Bug 8034744

Change-Id: I72cf4f5d2443e1cd6e40785b4d06d9bd363ab3e4
 2013-01-23 14:23:06 -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
Sungmin Choi
05a96d11dd fix typo for symbol 
remove duplicated symbol (sliding_layout)

Change-Id: I401de3832328731d554dd4cda991b77b99454579
 2013-01-17 10:25:40 +09: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
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
aebeea4cf3 am 5d6d6aab: am 8e45679a: am 026f9191: am 08342698: Merge "docs: Fix a bunch of issues" into jb-mr1-dev 
* commit '5d6d6aab255aa17fde979d954c839402837b4243':
  docs: Fix a bunch of issues
 2013-01-14 11:15:55 -08:00
Scott Kennedy
026f91915f am 08342698: Merge "docs: Fix a bunch of issues" into jb-mr1-dev 
* commit '083426980dbe6607a0cfc8b4ec5944d5b414ecbe':
  docs: Fix a bunch of issues
 2013-01-14 11:09:27 -08:00
Scott Kennedy
7ed189e457 docs: Fix a bunch of issues 
External tracker 42609
External tracker 42607
External tracker 42604
External tracker 42600
External tracker 42574
External tracker 42450
External tracker 41050
External tracker 40995
External tracker 40970
External tracker 40935
External tracker 40507
External tracker 40481
External tracker 40435
External tracker 40406
External tracker 40297
External tracker 40281
External tracker 39978
External tracker 39929
External tracker 39803
External tracker 39715
External tracker 39441

Change-Id: If4215cef850ba8e4e8df356a68192566806e7914
 2013-01-11 23:44:11 -08:00
Baligh Uddin
4e7ec51472 am 0ec825ed: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '0ec825ed70dd8383b0248608aa7abe0e8ed81854':
  Import translations. DO NOT MERGE
 2012-12-14 11:55:37 -08:00
Baligh Uddin
0c2f090d23 Import translations. DO NOT MERGE 
Change-Id: I4e8489952075f530451f167537a5f996380ae63d
Auto-generated-cl: translation import
 2012-12-14 11:25:30 -08:00
Baligh Uddin
5d3316d603 Import translations. DO NOT MERGE 
Change-Id: Idc82d91525857387cf867e8ac14859900fb5f1a3
Auto-generated-cl: translation import
 2012-12-14 11:23:14 -08:00
Baligh Uddin
47d2db689d am f1c6f1d3: Import translations. DO NOT MERGE 
* commit 'f1c6f1d3870707c4f76261219de0bb2968bf2d31':
  Import translations. DO NOT MERGE
 2012-12-12 11:22:04 -08:00
Baligh Uddin
90e41469fe Import translations. DO NOT MERGE 
Change-Id: I19d85dc7580e4a4e20a89bc3d56fe8a434d8f585
Auto-generated-cl: translation import
 2012-12-12 11:14:26 -08:00
Baligh Uddin
f1c6f1d387 Import translations. DO NOT MERGE 
Change-Id: I6079f968a77282ed15f6a46b05dd2318c1c39ba2
Auto-generated-cl: translation import
 2012-12-12 11:11:44 -08:00
Jeff Brown
d7337fb97a am 3781523b: am eaae7d97: Merge "Play a tone when wireless charging begins." into jb-mr1.1-dev 
* commit '3781523becbb2d576761c2701763ff3588294a97':
  Play a tone when wireless charging begins.
 2012-12-11 14:19:41 -08:00
Jeff Brown
eaae7d976a Merge "Play a tone when wireless charging begins." into jb-mr1.1-dev 2012-12-11 14:14:54 -08:00
Jeff Brown
84e2756c0f Play a tone when wireless charging begins. 
Only plays a tone if the battery level is below 95% which
is the same heuristic used when determining whether to turn
the screen on.

Use new low battery and wireless charging sounds on Mako.

Bug: 7371658
Change-Id: Ia4527ec398d024ee418a4287e1fcbf0ec83bcc24
 2012-12-11 12:55:03 -08:00
Baligh Uddin
8672f044ff am 73f6e3f5: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '73f6e3f583b1ff2948fd82e68a3f813750165b14':
  Import translations. DO NOT MERGE
 2012-12-10 20:20:17 -08:00
Baligh Uddin
d39a0d8041 Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 2012-12-10 20:19:06 -08:00
Baligh Uddin
73f6e3f583 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-12-10 20:17:14 -08:00
Alex Yakavenka
176c7a2b72 am 4d56777e: am 32b424f7: Add config_speed_up_audio_on_mt_calls option 
* commit '4d56777e678ab17379ec54a0875a14299817da8e':
  Add config_speed_up_audio_on_mt_calls option
 2012-12-10 17:08:58 -08:00
Alex Yakavenka
32b424f724 Add config_speed_up_audio_on_mt_calls option 
Bug: 7612431
Change-Id: Ia2758f81b78a2576df8dd23c700dba3eaaef8efc
 2012-12-10 15:47:35 -08:00
Baligh Uddin
ca4d4f7c90 Import translations. DO NOT MERGE 
Change-Id: I7bae78f78c7b112e6084791607023cc6154efa27
Auto-generated-cl: translation import
 2012-12-10 09:18:48 -08:00
Baligh Uddin
9f106549bc Import translations. DO NOT MERGE 
Change-Id: Idecee06e6e72dcc9112b92b793af1bb8f8ce3916
Auto-generated-cl: translation import
 2012-12-10 09:16:28 -08:00
Baligh Uddin
6063862966 am 5885a734: Import translations. DO NOT MERGE 
* commit '5885a7349ee456765d0b63eac9581f9d1ff1685d':
  Import translations. DO NOT MERGE
 2012-12-07 11:51:28 -08:00
Baligh Uddin
ef489fe9ed Import translations. DO NOT MERGE 
Change-Id: I4aaf67f3d31f73092284f9ebc09e7f619591cf5e
Auto-generated-cl: translation import
 2012-12-07 11:50:46 -08:00