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

87242 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
584aace0d7 Import translations. DO NOT MERGE 
Change-Id: I5018e41ee380fcfa8a0fe68b2d483493fd781f3a
Auto-generated-cl: translation import
 2012-09-20 16:03:39 -07:00
Irfan Sheriff
b42fb03b79 am 6c0fcc96: am 314488b7: Merge "Captive check for both mobile and wifi" into jb-mr1-dev 
* commit '6c0fcc961e1650113947918dc105c2a459ebf40d':
  Captive check for both mobile and wifi
 2012-09-20 13:39:30 -07:00
Irfan Sheriff
6c0fcc961e am 314488b7: Merge "Captive check for both mobile and wifi" into jb-mr1-dev 
* commit '314488b791d36756504ee593f818f04b4cd24893':
  Captive check for both mobile and wifi
 2012-09-20 13:37:07 -07:00
Irfan Sheriff
314488b791 Merge "Captive check for both mobile and wifi" into jb-mr1-dev 2012-09-20 13:33:52 -07:00
Glenn Kasten
1d824dfdda am 27001b52: am d86077c3: Merge "Expose android.media.AudioManager.getProperty()" into jb-mr1-dev 
* commit '27001b528e14e6fbfa9de67d1224f4bd96af290a':
  Expose android.media.AudioManager.getProperty()
 2012-09-20 13:01:12 -07:00
Wink Saville
f57fe0e07e am b538ba1e: am ca2cb184: Merge "Suppress location information for non-active users." into jb-mr1-dev 
* commit 'b538ba1e90fbc29d59a923ecd1d1d86d72eacffa':
  Suppress location information for non-active users.
 2012-09-20 13:01:07 -07:00
Geremy Condra
d25ce3a8a7 am 50caa25a: am d053554f: Merge "Push dropbox logging into libcore." into jb-mr1-dev 
* commit '50caa25a53efaa6f9338064436599945d6d8d616':
  Push dropbox logging into libcore.
 2012-09-20 13:01:03 -07:00
Geremy Condra
5f3becdbce am 3f1a9260: am f6e24d62: Merge "Remove pointless exception supression." into jb-mr1-dev 
* commit '3f1a92607be5f8f1448c1b2f87fa801f84ca874f':
  Remove pointless exception supression.
 2012-09-20 13:00:58 -07:00
Eric Laurent
2bb7e677b6 am 13bd3ed4: am f9fac2c5: Merge "Add multi user volume management" into jb-mr1-dev 
* commit '13bd3ed4796fae13f0daaa8ce062fdd8effec737':
  Add multi user volume management
 2012-09-20 13:00:55 -07:00
Geremy Condra
fadd42395f am eaac57e1: am 4dd3c379: Merge "Remove logging for old version mismatches." into jb-mr1-dev 
* commit 'eaac57e1fbcb7e0e6245591e2c399542bc3f5822':
  Remove logging for old version mismatches.
 2012-09-20 13:00:51 -07:00
John Reck
91249ce452 am cfe353ba: am b6610d82: Merge "Fix DPI scaling on TVDPI" into jb-mr1-dev 
* commit 'cfe353bad0e5daed9f2166ce37973f2a6b3d9c54':
  Fix DPI scaling on TVDPI
 2012-09-20 13:00:47 -07:00
Elliott Hughes
dbd0abd6f9 am ce14f217: am 3d5be42e: Merge changes I87c2ab9e,I2dafcc34,I731c96c2 into jb-mr1-dev 
* commit 'ce14f2176028108b649b3b068ac1275b81287b21':
  Fix formatDateRange month names for Farsi.
  Use localized digits for Time formatting.
  Use proper digits in formatElapsedTime and format3339
 2012-09-20 13:00:44 -07:00
Stephen Hines
1bb62cb1ea am 05bdecd2: am 5ca88a10: Merge "Add tests for pass-by-value kernels." into jb-mr1-dev 
* commit '05bdecd2f3ce82c0fd63df0a041ccce560f3d1c8':
  Add tests for pass-by-value kernels.
 2012-09-20 13:00:37 -07:00
Glenn Kasten
27001b528e am d86077c3: Merge "Expose android.media.AudioManager.getProperty()" into jb-mr1-dev 
* commit 'd86077c3792ca03f004376d81e449a3ecdaa5e8b':
  Expose android.media.AudioManager.getProperty()
 2012-09-20 12:51:50 -07:00
Wink Saville
b538ba1e90 am ca2cb184: Merge "Suppress location information for non-active users." into jb-mr1-dev 
* commit 'ca2cb1841099c7206af93149d0326308e0d3f81a':
  Suppress location information for non-active users.
 2012-09-20 12:51:47 -07:00
Geremy Condra
50caa25a53 am d053554f: Merge "Push dropbox logging into libcore." into jb-mr1-dev 
* commit 'd053554f80adaa84d4bdde53656ccce5ae3332b6':
  Push dropbox logging into libcore.
 2012-09-20 12:51:43 -07:00
Geremy Condra
3f1a92607b am f6e24d62: Merge "Remove pointless exception supression." into jb-mr1-dev 
* commit 'f6e24d62b6fa863700e5f72d461846f2aa506109':
  Remove pointless exception supression.
 2012-09-20 12:51:40 -07:00
Eric Laurent
13bd3ed479 am f9fac2c5: Merge "Add multi user volume management" into jb-mr1-dev 
* commit 'f9fac2c5fe3f304ee866b1afc3191d36835e96bd':
  Add multi user volume management
 2012-09-20 12:51:36 -07:00
Geremy Condra
eaac57e1fb am 4dd3c379: Merge "Remove logging for old version mismatches." into jb-mr1-dev 
* commit '4dd3c3797060b35c8e6ebbbdd164c17c6db7b5ec':
  Remove logging for old version mismatches.
 2012-09-20 12:51:32 -07:00
John Reck
cfe353bad0 am b6610d82: Merge "Fix DPI scaling on TVDPI" into jb-mr1-dev 
* commit 'b6610d8289f5c682a7f66d419afcfbd6541d0367':
  Fix DPI scaling on TVDPI
 2012-09-20 12:51:29 -07:00
Elliott Hughes
ce14f21760 am 3d5be42e: Merge changes I87c2ab9e,I2dafcc34,I731c96c2 into jb-mr1-dev 
* commit '3d5be42eaa35914d9b37fe052fa7222dc1992dc0':
  Fix formatDateRange month names for Farsi.
  Use localized digits for Time formatting.
  Use proper digits in formatElapsedTime and format3339
 2012-09-20 12:51:25 -07:00
Stephen Hines
05bdecd2f3 am 5ca88a10: Merge "Add tests for pass-by-value kernels." into jb-mr1-dev 
* commit '5ca88a103c2841b64bfa01b4848aec4b8aa64687':
  Add tests for pass-by-value kernels.
 2012-09-20 12:51:21 -07:00
Glenn Kasten
d86077c379 Merge "Expose android.media.AudioManager.getProperty()" into jb-mr1-dev 2012-09-20 12:45:45 -07:00
Wink Saville
ca2cb18410 Merge "Suppress location information for non-active users." into jb-mr1-dev 2012-09-20 12:37:19 -07:00
Glenn Kasten
62796aac59 Expose android.media.AudioManager.getProperty() 
Also fix minor documentation errors.

Bug: 6635041
Change-Id: I6bbbf1b7c5ab705ac374436ea0c098cb3c27fd4a
 2012-09-20 12:28:20 -07:00
Irfan Sheriff
9538bdd3c7 Captive check for both mobile and wifi 
Bug: 7113195
Bug: 7102238
Bug: 7087564

Change-Id: Iac08db9de3935338ad498aa3983d2ca82057dda1
 2012-09-20 12:13:06 -07:00
Geremy Condra
d053554f80 Merge "Push dropbox logging into libcore." into jb-mr1-dev 2012-09-20 11:24:14 -07:00
Geremy Condra
f6e24d62b6 Merge "Remove pointless exception supression." into jb-mr1-dev 2012-09-20 11:22:14 -07:00
Eric Laurent
f9fac2c5fe Merge "Add multi user volume management" into jb-mr1-dev 2012-09-20 11:18:17 -07:00
Geremy Condra
4dd3c37970 Merge "Remove logging for old version mismatches." into jb-mr1-dev 2012-09-20 10:33:03 -07:00
John Reck
b6610d8289 Merge "Fix DPI scaling on TVDPI" into jb-mr1-dev 2012-09-20 10:21:41 -07:00
Wink Saville
a12a7b3d3d Suppress location information for non-active users. 
Specifically, don't allow call backs for LISTEN_CELL_LOCATION and
LISTEN_CELL_INFO.

Bug: 7087342
Change-Id: Ida7f60b5bde3f28264dcb454b38fcfb1f1616d11
 2012-09-20 10:09:45 -07:00
Elliott Hughes
3d5be42eaa Merge changes I87c2ab9e,I2dafcc34,I731c96c2 into jb-mr1-dev 
* changes:
  Fix formatDateRange month names for Farsi.
  Use localized digits for Time formatting.
  Use proper digits in formatElapsedTime and format3339
 2012-09-20 10:05:44 -07:00
Stephen Hines
5ca88a103c Merge "Add tests for pass-by-value kernels." into jb-mr1-dev 2012-09-20 09:55:25 -07:00
Jason Sams
93941683c2 am 8908034d: am 95cd451e: Merge "add cleanspec." into jb-mr1-dev 
* commit '8908034dcea1ae3e2a69d4690fd90dea8ccf6339':
  add cleanspec.
 2012-09-20 09:35:55 -07:00
Chris Wren
bddf715092 am 82cab1b5: am 683ab00a: fix underfull content bug in inbox and big text templates. 
* commit '82cab1b51d8e05e358951cf457da51af3fe69afc':
  fix underfull content bug in inbox and big text templates.
 2012-09-20 09:35:40 -07:00
Jason Sams
8908034dce am 95cd451e: Merge "add cleanspec." into jb-mr1-dev 
* commit '95cd451ef1b1c7390ec08da730f6bf0b268ed833':
  add cleanspec.
 2012-09-20 09:24:12 -07:00
Jason Sams
95cd451ef1 Merge "add cleanspec." into jb-mr1-dev 2012-09-20 09:21:39 -07:00
Jason Sams
1dd273a7df add cleanspec. 
Change-Id: I5aa58efa7c48809d1f05c8ad48332508597b9869
 2012-09-20 09:12:43 -07:00
Chris Wren
82cab1b51d am 683ab00a: fix underfull content bug in inbox and big text templates. 
* commit '683ab00a2ec2e02f8ad1296efb381aa72d364b57':
  fix underfull content bug in inbox and big text templates.
 2012-09-20 08:40:49 -07:00
Chris Wren
683ab00a2e fix underfull content bug in inbox and big text templates. 
Bug: 7172721
Change-Id: I22019009eec31ca18b54eec5f6ed5b626cee1540
 2012-09-20 10:54:40 -04:00
John Spurlock
1b03ae850c am 03b80dc8: am e0de5bff: Merge "Fire "dreaming started" and "dreaming stopped" broadcasts." into jb-mr1-dev 
* commit '03b80dc8e914f1651ea60f7b6172e8293ac765c5':
  Fire "dreaming started" and "dreaming stopped" broadcasts.
 2012-09-20 06:18:10 -07:00
Jason Sams
e44050e011 am 9fc94c86: am 8e356e08: Merge "Cleanup blur test, remove deprecated functions." into jb-mr1-dev 
* commit '9fc94c86de038c3657bd814599ba44b966f560e3':
  Cleanup blur test, remove deprecated functions.
 2012-09-20 06:18:06 -07:00
Jeff Brown
d6466128a4 am c6493e39: am f803ff4f: Merge "Make wifi display state changes more robust." into jb-mr1-dev 
* commit 'c6493e39204faab2a1326274f0b927e418339fcc':
  Make wifi display state changes more robust.
 2012-09-20 06:18:01 -07:00
Baligh Uddin
21196ee44b am d2812e12: (-s ours) am e02acec9: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'd2812e123f7bb593d30d17c2b3b5a51b361e3c20':
  Import translations. DO NOT MERGE
 2012-09-20 06:17:57 -07:00
Jeff Brown
3e41fefa84 am f271c1ec: am 925ad51b: Merge "Add support for remembering Wifi display devices." into jb-mr1-dev 
* commit 'f271c1ecb9fab2c62f1461026b5c4f7a7152140b':
  Add support for remembering Wifi display devices.
 2012-09-20 06:17:53 -07:00
Jim Miller
ea74b79028 am 57f42e85: am d5d853ec: Merge "Update keyguard selector view to match UX design spec - Use new Roboto-Thin font - Add new keyguard-specific date format - Layout tweaks to keyguard selector screen. - Add smart EmergencyButton class - Add selective upper-casing of com 
* commit '57f42e855038e802c2cea4200a7cd170ea6cbf63':
  Update keyguard selector view to match UX design spec - Use new Roboto-Thin font - Add new keyguard-specific date format - Layout tweaks to keyguard selector screen. - Add smart EmergencyButton class - Add selective upper-casing of components on the display to enable later UX decision - Work around SIM state bug
 2012-09-20 06:17:49 -07:00
Romain Guy
f53b3cfa0c am 3c117db2: am 4c97ef90: Merge "Add support for QCOM_tiled_rendering Bug #7186819" into jb-mr1-dev 
* commit '3c117db2aaac083a2802b62bb8ce15f87cd788c2':
  Add support for QCOM_tiled_rendering Bug #7186819
 2012-09-20 06:17:46 -07:00
Jeff Sharkey
7e5b586a26 am 4747d052: am 4e7b551f: Merge "Move HAS_TRANSIENT_STATE flag into a safe area." into jb-mr1-dev 
* commit '4747d0520035dab151e71d839fee898c3f8dd8ae':
  Move HAS_TRANSIENT_STATE flag into a safe area.
 2012-09-20 06:17:42 -07:00
Jeff Sharkey
9424b68a5e am 116e0ed0: am c3e3311c: Merge "Migrate network stats from removed users." into jb-mr1-dev 
* commit '116e0ed0ed1fee530f32932be7145d64316dce9b':
  Migrate network stats from removed users.
 2012-09-20 06:17:38 -07:00