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

5184 Commits

Author SHA1 Message Date
Geremy Condra
b14c9900cb am a295ba44: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-dev 
* commit 'a295ba44793e5601c8574bdcb07313420aa6500c':
  Change android.permission.SERIAL_PORT to signature|system.
 2012-11-02 14:22:31 -07:00
Geremy Condra
7dcacd559a Change android.permission.SERIAL_PORT to signature|system. 
Bug: 7367956
Change-Id: I0bc65936ba59c43c18d9a6ba52affff4c921f2fb
 2012-11-01 14:10:21 -07:00
Jean-Baptiste Queru
b4ac801c47 am 1ca2fee9: Merge "Make default value of auto-sync in SyncStorageEngine configurable" 
* commit '1ca2fee9547dbdd7008211ac318b1f8f40ce1e35':
  Make default value of auto-sync in SyncStorageEngine configurable
 2012-09-05 12:10:44 -07:00
Yameng Huang
2b5d0ea5e9 Make default value of auto-sync in SyncStorageEngine configurable 
This will make the default value of the automatic synchronization
in the SyncStorageEngine configurable with overlays for use by
vendors who want or have legal requirements to have the synchronization
off by default.

Change-Id: Iabdb355c4a1169fe8e254e91c43e162c5913d5e0
 2012-09-03 12:49:31 +02:00
Jean-Baptiste Queru
82c2ff5546 am d7b9c6c3: Merge "Added missing viewport meta tag to html resources" 
* commit 'd7b9c6c356038ebced3461bb098b6a1ea1c7b222':
  Added missing viewport meta tag to html resources
 2012-08-13 10:53:58 -07:00
Jean-Baptiste Queru
d7b9c6c356 Merge "Added missing viewport meta tag to html resources" 2012-08-13 10:38:23 -07:00
Amith Yamasani
6232812a8a am 61408a7e: Merge "Use correct layout style for Theme.Holo.Light." into jb-dev 
* commit '61408a7ed230b636263e6c410f62b1932a486ef9':
  Use correct layout style for Theme.Holo.Light.
 2012-07-26 11:49:12 -07:00
Amith Yamasani
61408a7ed2 Merge "Use correct layout style for Theme.Holo.Light." into jb-dev 2012-07-26 11:46:54 -07:00
Amith Yamasani
bfd070cfe1 Use correct layout style for Theme.Holo.Light. 
Layout inherited from Theme.Light is incorrect.

Needed for fixes related to:
Bug: 6882764

Change-Id: I1c8217f8d9fcf7ece8fa5513766e7536a7c7e13d
 2012-07-25 21:09:07 -07:00
John Huang
4c259f3d7b am 3e6a9f01: Merge "Fix tethering APNs" into jb-dev 
* commit '3e6a9f01a5e69a3e452e04f92edfc21dcbdca3c3':
  Fix tethering APNs
 2012-07-25 10:51:44 -07:00
Robert Greenwalt
8e49278672 Fix tethering APNs 
Move DUN settings into carrier specific configs which also turn on dun-requirements.

bug:6828962
Change-Id: I2a79a58b385a04c4c534172af62182424cf2022b
 2012-07-24 16:59:48 -07:00
Ying Wang
d173b10a93 am a4d4df16: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'a4d4df16a6d18add37971bbd41ba58b4ce2ee608':
  Import translations. DO NOT MERGE
 2012-07-18 20:14:46 -07:00
Ying Wang
eebabd6e47 Import translations. DO NOT MERGE 
Change-Id: I5077a3d3cb71f2dff0f460174134bdc49663e27b
Auto-generated-cl: translation import
 2012-07-18 14:19:56 -07:00
Ying Wang
166615f243 am 1ed1c399: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '1ed1c399939e035707dd6da7057570a8da96394e':
  Import translations. DO NOT MERGE
 2012-07-17 12:22:31 -07:00
Ying Wang
7b3813340d Import translations. DO NOT MERGE 
Change-Id: I5c3c2a4556764f14d354ea0431b6cba175b2c49f
Auto-generated-cl: translation import
 2012-07-17 11:31:03 -07:00
Ying Wang
6d1e7ca30e am 6b7b9b4a: Import translations. DO NOT MERGE 
* commit '6b7b9b4abe3a55a5349951f64a348826e90996c9':
  Import translations. DO NOT MERGE
 2012-07-16 11:50:32 -07:00
Ying Wang
6b7b9b4abe Import translations. DO NOT MERGE 
Change-Id: I90c2a81acb707d11c4268ed78c8c06871370faa6
Auto-generated-cl: translation import
 2012-07-16 11:29:20 -07:00
Ying Wang
d304e8bfc7 am df523ec5: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'df523ec5780aece1f63ce05a0ae57773fef50fbf':
  Import translations. DO NOT MERGE
 2012-07-13 13:41:02 -07:00
Ying Wang
3b1ca7888c Import translations. DO NOT MERGE 
Change-Id: Iac7759bb253431f5b75c246938a3cc3a726c8439
Auto-generated-cl: translation import
 2012-07-13 11:41:59 -07:00
Ying Wang
d7b7c2cead am 23edefc6: Import translations. DO NOT MERGE 
* commit '23edefc6c6d12dd84ff6b7bd8694b50abf0cc158':
  Import translations. DO NOT MERGE
 2012-07-12 11:46:49 -07:00
Ying Wang
23edefc6c6 Import translations. DO NOT MERGE 
Change-Id: I115e6356599b76597f52d5f0006d61f4324ae48b
Auto-generated-cl: translation import
 2012-07-12 11:41:58 -07:00
Ying Wang
0ddea75be4 am 04ca8e57: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '04ca8e577859235a68fa9a5268af528d547310be':
  Import translations. DO NOT MERGE
 2012-07-11 13:57:43 -07:00
Ying Wang
2ba281577a Import translations. DO NOT MERGE 
Change-Id: Idabf12464d73bf707daf0f870de2349731b574e2
Auto-generated-cl: translation import
 2012-07-11 12:51:31 -07:00
Ying Wang
b8c5df8562 am 40a4ab13: Import translations. DO NOT MERGE 
* commit '40a4ab130a3e3c99afb1a57e9aa30de03a89b51e':
  Import translations. DO NOT MERGE
 2012-07-10 12:36:11 -07:00
Ying Wang
40a4ab130a Import translations. DO NOT MERGE 
Change-Id: I8e0e293c98a3659ef6e9a07c3a62e0056f5ea4cb
Auto-generated-cl: translation import
 2012-07-10 12:15:26 -07:00
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