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

5158 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
e39d42db00 Merge "Revert "DO NOT MERGE: Remove SMS shortcode warning feature."" into jb-dev-plus-aosp 2012-07-02 14:48:48 -07:00
Jean-Baptiste Queru
5709f43dd8 Merge "Revert "DO NOT MERGE: Remove SMS shortcode warning feature."" into jb-dev-plus-aosp 2012-07-02 14:48:44 -07:00
Eric Fischer
82b141e267 am c70ec659: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'c70ec659e8f63b31e11f5f0a82c638261d67056e':
  Import translations. DO NOT MERGE
 2012-07-02 14:09:49 -07:00
Jean-Baptiste Queru
7ebd4bae74 Revert "DO NOT MERGE: Remove SMS shortcode warning feature." 
This reverts commit 004ff5ad2aa02daff607bcf1712f3efbb84c58ca.
 2012-07-02 12:36:47 -07:00
Jean-Baptiste Queru
a02bce1d5b Revert "DO NOT MERGE: Remove SMS shortcode warning feature." 
This reverts commit b1fc08ca082db8ecad54c792485ff7915e3513ce.
 2012-07-02 12:30:32 -07:00
Eric Fischer
a2b17b8895 Import translations. DO NOT MERGE 
Change-Id: I5eae952127a0af6618ab96065cd50d78bbaea189
Auto-generated-cl: translation import
 2012-07-02 12:25:39 -07:00
Ying Wang
6979f52208 am 2612de14: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '2612de14d2dcfd5a6eedf882cf5cd9ac3e6fb73a':
  Import translations. DO NOT MERGE
 2012-06-29 17:53:20 -07:00
Ying Wang
c01ba1cd72 Import translations. DO NOT MERGE 
Change-Id: Iaf052543d1c7cd9afb6fe415df2ad72c5de94ea8
Auto-generated-cl: translation import
 2012-06-29 11:40:36 -07:00
Eric Fischer
615f4cf22c am 9aa2d2a5: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '9aa2d2a5a56c5ec0bb8517f46cb39f6c12215d92':
  Import translations. DO NOT MERGE
 2012-06-28 11:51:33 -07:00
Eric Fischer
a57b7a8ce4 Import translations. DO NOT MERGE 
Change-Id: I5c3a2f0d534df06cf7d3385a2d369ba6edd09df7
Auto-generated-cl: translation import
 2012-06-28 11:30:35 -07:00
Ying Wang
809705c331 am 7bdc151e: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '7bdc151eecf5cb01af19964c43e99f41069d093d':
  Import translations. DO NOT MERGE
 2012-06-27 14:44:43 -07:00
Ying Wang
0503ae7451 Import translations. DO NOT MERGE 
Change-Id: I887e4963f5e4f7690461900b5f5c993d42c8db67
 2012-06-27 14:00:38 -07:00
Gilles Debunne
034a57764b am f6656b80: Merge "Reducing the contrast of text underline" into jb-dev 
* commit 'f6656b80c203a2537aa30682f7e682a69e742e21':
  Reducing the contrast of text underline
 2012-06-26 13:14:23 -07:00
Gilles Debunne
f6656b80c2 Merge "Reducing the contrast of text underline" into jb-dev 2012-06-26 13:12:07 -07:00
Gilles Debunne
fca8947f49 Reducing the contrast of text underline 
Alpha set to 50%.

Bug: 6712694
Change-Id: Ic292b6e24a97426e835fa379b1fd60d3b7912e99
 2012-06-25 16:42:51 -07:00
Eric Fischer
764d1368d6 am c5fc8f5c: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'c5fc8f5c1b97665d6b8b0a9d18d737f9fd2460f4':
  Import translations. DO NOT MERGE
 2012-06-25 11:34:58 -07:00
Eric Fischer
d7e646d6d7 Import translations. DO NOT MERGE 
Change-Id: I829c0795e2bf76fe1e2315977aeab8d63d3ed76d
 2012-06-25 11:24:00 -07:00
Scott Main
0c51198806 am b0efc7fc: eat comment so it doesn\'t appear in docs 
* commit 'b0efc7fce7967b043dae8896e8f9bf4d11274cf4':
  eat comment so it doesn't appear in docs
 2012-06-23 12:46:23 -07:00
Scott Main
b0efc7fce7 eat comment so it doesn't appear in docs 
Change-Id: Id2b539fc80422edb32c86fa17ad888abbc48ba49
 2012-06-23 12:36:17 -07:00
Jean-Baptiste Queru
695b2d089e am 5f77f82e: Merge "Another case of extra ">"" 
* commit '5f77f82e609b24504e026751228b399b8dc57ab5':
  Another case of extra ">"
 2012-06-23 07:12:19 -07:00
Jean-Baptiste Queru
6c1f2b136b am b8b47c22: Merge "Remove redundant ">"" 
* commit 'b8b47c22c8dc1f5facfbb4729511772630cc3aa6':
  Remove redundant ">"
 2012-06-23 07:12:16 -07:00
Ying Wang
5539e720b4 am ddeb7bd3: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'ddeb7bd3c7593d51d4d2bfd9fe39d5f0ffa05d89':
  Import translations. DO NOT MERGE
 2012-06-22 15:01:52 -07:00
Ying Wang
8f2acd0a2b Import translations. DO NOT MERGE 
Change-Id: Idcb453e08823c584fb0f748ebe46ed036046c9d4
 2012-06-22 12:53:57 -07:00
RoboErik
a3bd05f212 am b047b1f7: Merge "b/6705777 Remove \'speaker\' from strings" into jb-dev 
* commit 'b047b1f73800ff92eea4ff4b3adc62e5a20eb8df':
  b/6705777 Remove 'speaker' from strings
 2012-06-21 17:22:50 -07:00
RoboErik
be76e21543 b/6705777 Remove 'speaker' from strings 
We should just say Tablet or Phone when selecting the local
playback instead of Tablet speakers or Phone speaker.

Change-Id: Ia6c439f711bacb7b1e70fbcf4887df8141f91b61
 2012-06-21 17:05:52 -07:00
Eric Fischer
242f1323d2 am cda69964: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'cda6996408d785f368e67afaca79a6afa6f57b1b':
  Import translations. DO NOT MERGE
 2012-06-21 13:12:08 -07:00
Eric Fischer
cda6996408 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-21 13:10:49 -07:00
Eric Fischer
ed6103d573 Import translations. DO NOT MERGE 
Change-Id: If3ebb62b4c2a912512600e51129551e23cf31553
 2012-06-21 12:57:27 -07:00
Jake Hamby
dcd6e38c6a am 65d4445b: Merge "Add config option to enable links to Cell Broadcast app." into jb-dev 
* commit '65d4445bfd3351609f786fdf6038ddd362a3d6ca':
  Add config option to enable links to Cell Broadcast app.
 2012-06-21 12:34:35 -07:00
Jake Hamby
43af7e0756 Add config option to enable links to Cell Broadcast app. 
Add "config_cellBroadcastAppLinks" internal boolean config item,
defaulting to false. For devices with the Cell Broadcast app,
setting this config option to true will add a menu item to the
MMS app to jump to the list of received cell broadcasts, and a
preferences item to Settings to jump to cell broadcast settings.

Bug: 6709985
Change-Id: I9fe1919e6d76ba1dfe1e1381e2c38ecdd5e0a867
 2012-06-21 12:17:18 -07:00
Eric Fischer
7059a022fe am da036c8a: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'da036c8a5709d5b985e0dd63c379e93135768c81':
  Import translations. DO NOT MERGE
 2012-06-21 11:52:11 -07:00
Eric Fischer
da036c8a57 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-20 22:42:58 -07:00
Craig Mautner
e96f06ae16 am 255cb779: Merge "Make animations persist after completion." into jb-dev 
* commit '255cb7798160a083124cd2033e0619f8b3ed731c':
  Make animations persist after completion.
 2012-06-20 22:31:09 -07:00
Eric Fischer
c23e54b4e1 Import translations. DO NOT MERGE 
Change-Id: Ic5c7a282f3ce75cba92d8cda741ecaa9088d12be
 2012-06-20 19:48:35 -07:00
Craig Mautner
255cb77981 Merge "Make animations persist after completion." into jb-dev 2012-06-20 19:28:16 -07:00
Craig Mautner
a371154f08 Make animations persist after completion. 
Transition animations were set to fillAfter=false which caused them
to revert when they had completed. Normally this would not have
mattered as the final state was obscured by the new Activity. In
the case of the Phone app the Activities churn so much that the
original Activity was exposed.

Fixes bug 6691421.

Change-Id: I96b8a43d0a2cac9a34a14a309548c41451c65a57
 2012-06-20 18:49:38 -07:00
Svetoslav Ganov
0a79d2fbcd am dce5af63: Merge "Fix GlowPadView accessibility behavior." into jb-dev 
* commit 'dce5af632ce8899905fbf187b9505f6753d5a562':
  Fix GlowPadView accessibility behavior.
 2012-06-20 16:55:07 -07:00
alanv
78bfb98295 Fix GlowPadView accessibility behavior. 
Bug: 6702412
Change-Id: If5ab75e77b0090a405004c66da0083e81d59deb4
 2012-06-20 13:22:45 -07:00
Ying Wang
7ea4979835 am edc34cf5: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'edc34cf55482faa25b48e867bd51ecec74dbd0e8':
  Import translations. DO NOT MERGE
 2012-06-20 12:28:33 -07:00
Ying Wang
ddaeed3615 Import translations. DO NOT MERGE 
Change-Id: If50ab67d8bc4570a07cb2e9dba0c22ed4f7d7592
 2012-06-20 11:58:21 -07:00
Adam Powell
da8288037c am 2dde147b: Merge "Add an XML attribute for controlling which route types a MediaRouteButton in a layout will alter." into jb-dev 
* commit '2dde147b28684fc32f03ad748af8eb87d5408c7c':
  Add an XML attribute for controlling which route types a MediaRouteButton in a layout will alter.
 2012-06-19 19:20:05 -07:00
Adam Powell
849df0b5a7 Add an XML attribute for controlling which route types a 
MediaRouteButton in a layout will alter.

Change-Id: I897a68188fa87e4c2dbc88794117a3ef87ffaab0
 2012-06-19 17:47:48 -07:00
Jim Miller
904f26bd26 am f7e820bb: Merge "Fix 6693743: update animation ring for keyguard and search panel" into jb-dev 
* commit 'f7e820bbc9d23e0657bbd6252fe285ba08a2551a':
  Fix 6693743: update animation ring for keyguard and search panel
 2012-06-19 16:43:39 -07:00
Jim Miller
f7e820bbc9 Merge "Fix 6693743: update animation ring for keyguard and search panel" into jb-dev 2012-06-19 16:41:50 -07:00
Victoria Lease
017e916061 am 1b36a68f: Merge "DO NOT MERGE Engineer-asset light-theme findonpage prev/next buttons" into jb-dev 
* commit '1b36a68f607538bd090c33b31bd418169657ff6c':
  DO NOT MERGE Engineer-asset light-theme findonpage prev/next buttons
 2012-06-19 16:17:24 -07:00
Jim Miller
a7da8afe6d Fix 6693743: update animation ring for keyguard and search panel 
This is a partial revert of change Ibce96f45eb6a94582c694108b99e243fd57b1955.

This change:
- shows the expanding ring animation on keyguard and navbar search
- disables the first ping wave animation on both.
- restores the outer ring

Change-Id: I429d23a49ca2868dc00872b8b8fde000d6a53a6d
 2012-06-19 16:17:19 -07:00
Victoria Lease
45f5a76000 DO NOT MERGE Engineer-asset light-theme findonpage prev/next buttons 
This is a cherrypick of Iae2795da from master.

These are provided with the expectation that they will be replaced
with more professional assets as soon as available.

Bug: 6685279
Change-Id: Iae2795dafaffcc337b74f4a178f68de4a96b96bf
 2012-06-19 15:56:20 -07:00
Eric Fischer
7324b21ca0 am c2585467: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'c2585467107995f3130872eb7b721f3dbbcdf505':
  Import translations. DO NOT MERGE
 2012-06-19 14:45:41 -07:00
Eric Fischer
3dc1af6b68 Import translations. DO NOT MERGE 
Change-Id: I050bc722a5a06acc49fc519d57bf16b14158e97a
 2012-06-19 14:38:50 -07:00
Jean-Michel Trivi
586b8ee62e am 2f442304: Merge "Remote volume handling" into jb-dev 
* commit '2f4423043ffeaf232ec984be03743326f08cdc8a':
  Remote volume handling
 2012-06-19 10:56:28 -07:00