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

92730 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
d2dcd7ada3 Fix AndroidHttpClient documentation error. 
AndroidHttpClient doesn't let the user add HttpRequestInterceptor classes.

Bug: http://code.google.com/p/android/issues/detail?id=37294
Change-Id: I66f6581fa321dc16ddfe35c8f4242bc31f79bdfa
 2012-11-29 08:32:13 -08:00
Adam Powell
6e8c1495f6 Merge "Re-read shortcut labels if the language has changed" 2012-11-20 13:59:45 -08:00
Mattias Falk
eb573418a7 Re-read shortcut labels if the language has changed 
The shortcut label isn't updated to the current language
if the phone's language has changed.

The problem was that the shortcut label is stored in a
static variable which is set once and kept throughout the
life time of the process.

Change-Id: I89c5875fbf28fb82e073166c472ca205d28674fb
 2012-11-19 09:31:19 +01:00
Marco Nelissen
aeb6268645 Merge "Fallback to fallbackring if ringtone can't be played." 2012-11-16 11:48:14 -08:00
Oscar Rydhé
1c25a21ffc Fallback to fallbackring if ringtone can't be played. 
If the specified ringtone file exists but cannot be played
the Ringtone will try to play the ringtone in a remote player.
But since the file is corrupt it will not be played in the
remote player either.
According to the documentation it should attempt to
fallback on another sound. This commit will do that.

Change-Id: I0216d61ca874eef0f168ad4d5bfb07491e01e654
 2012-11-16 14:22:14 +01:00
Kenny Root
e4163e96e0 Merge "Switch keystore to binder" 2012-11-14 14:17:28 -08:00
Kenny Root
be37b5fa24 Merge "Free resources in correct order in ResStringPool::uninit" 2012-11-14 09:33:49 -08:00
Kenny Root
6b77645aa9 Switch keystore to binder 
Change-Id: I9fa1fc05068bee1eed3f618fb32f70cf3d4c05d4
 2012-11-14 08:45:52 -08:00
Kenny Root
87ed0a10f5 Merge "Bug fix on installd with SELinux enabled kernel." 2012-11-14 08:38:35 -08:00
rpcraig
2e59369dca Bug fix on installd with SELinux enabled kernel. 
setfilecon is not required on libsymlinks when target
doesn't exist. A bootloop is caused without this
change.

Change-Id: I96dbd4b1f47a752bfcaf6016c81fd43083c4a6e1
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
 2012-11-14 10:16:03 -05:00
John Spurlock
4299f63e54 am b340fe4f: am f6f47e95: Merge "Disable navbar searchlight if search assist not available." into jb-mr1.1-dev 
* commit 'b340fe4f88226ec35f0a4058f514b764b0f3977d':
  Disable navbar searchlight if search assist not available.
 2012-11-12 07:58:09 -08:00
John Spurlock
b340fe4f88 am f6f47e95: Merge "Disable navbar searchlight if search assist not available." into jb-mr1.1-dev 
* commit 'f6f47e950ddbb91fcce30f2f3e610a4d249b9bdb':
  Disable navbar searchlight if search assist not available.
 2012-11-12 07:55:24 -08:00
John Spurlock
f6f47e950d Merge "Disable navbar searchlight if search assist not available." into jb-mr1.1-dev 2012-11-12 07:52:08 -08:00
The Android Open Source Project
3d8e66ab76 am f1159e6b: am 725a2ffe: Reconcile with jb-mr1-release - do not merge 
* commit 'f1159e6b5e796d597286da8d8d842947a4044ce3':
  When in vibrate mode, all notifications will vibrate.
 2012-11-12 07:31:18 -08:00
The Android Open Source Project
f1159e6b5e am 725a2ffe: Reconcile with jb-mr1-release - do not merge 
* commit '725a2ffe3b615515acd14b8b379078930de64249':
  When in vibrate mode, all notifications will vibrate.
 2012-11-12 07:28:38 -08:00
The Android Open Source Project
725a2ffe3b Reconcile with jb-mr1-release - do not merge 
Change-Id: I310560c329cb0d8aeb664c67ea6e67e006809637
 2012-11-12 07:26:14 -08:00
David Agnew
876a2197b9 am d625f0a1: am 7259d88c: am 4c0fc03b: When in vibrate mode, all notifications will vibrate. 
* commit 'd625f0a1475fb83573bf8a7a7d1899b621de507e':
  When in vibrate mode, all notifications will vibrate.
 2012-11-10 11:55:30 -08:00
David Agnew
d625f0a147 am 7259d88c: am 4c0fc03b: When in vibrate mode, all notifications will vibrate. 
* commit '7259d88c08df220095a4aeaa752bd8e1055f4e83':
  When in vibrate mode, all notifications will vibrate.
 2012-11-10 11:52:38 -08:00
David Agnew
7259d88c08 am 4c0fc03b: When in vibrate mode, all notifications will vibrate. 
* commit '4c0fc03b5ed396d19035ee6a77a70189a0fba31a':
  When in vibrate mode, all notifications will vibrate.
 2012-11-10 11:49:51 -08:00
David Agnew
4c0fc03b5e When in vibrate mode, all notifications will vibrate. 
(Unless the notification specifies no ringtone AND no
vibration, in which case it will remain silent.)

Bug: 7516358
Change-Id: I926d0fe0165b9622cd117e6c3ef6e3637772b444
 2012-11-10 14:35:02 -05:00
Ed Heyl
ffea917025 am 5ec97f4e: am 4f017e75: Merge "When in vibrate mode, all notifications will vibrate." into jb-mr1.1-dev 
* commit '5ec97f4e82e1adc3bffb9c998b302464517e1f04':
  When in vibrate mode, all notifications will vibrate.
 2012-11-09 23:54:08 -08:00
Ed Heyl
5ec97f4e82 am 4f017e75: Merge "When in vibrate mode, all notifications will vibrate." into jb-mr1.1-dev 
* commit '4f017e757bdc87d603d135386c888118fc2653ba':
  When in vibrate mode, all notifications will vibrate.
 2012-11-09 22:53:24 -08:00
David Agnew
9a7debe585 When in vibrate mode, all notifications will vibrate. 
(Unless the notification specifies no ringtone AND no
vibration, in which case it will remain silent.)

Change-Id: I926d0fe0165b9622cd117e6c3ef6e3637772b444
 2012-11-09 22:51:37 -08:00
Ed Heyl
4f017e757b Merge "When in vibrate mode, all notifications will vibrate." into jb-mr1.1-dev 2012-11-09 22:49:35 -08:00
Scott Main
88b0d1e368 am 78f7e807: am e72e2b74: am 85abb087: Merge "docs: update Tools landing page with info for developer options" into jb-mr1-dev 
* commit '78f7e807dfec36fe695f7b2d7241c1a188893d20':
  docs: update Tools landing page with info for developer options
 2012-11-09 22:45:37 -08:00
Jeff Sharkey
1aa4f6fe7e am 5691474c: am ad08e6dc: Merge "Emit event log message when switching users." into jb-mr1.1-dev 
* commit '5691474c9cbaeb37eeb659a3adbc05d31d668611':
  Emit event log message when switching users.
 2012-11-09 22:45:33 -08:00
Baligh Uddin
8baf63d5ba am eba39ec1: am df2670f1: am ba52aff4: Import translations. DO NOT MERGE 
* commit 'eba39ec15c1d07f5fe0c48d7d1176cc0b388d9d0':
  Import translations. DO NOT MERGE
 2012-11-09 22:45:30 -08:00
Andy McFadden
9d42794dde am a7113f70: am 798de53c: Merge "Reduce emulator logspam" into jb-mr1.1-dev 
* commit 'a7113f70c55517b5dbf3c54827c4559304faff4f':
  Reduce emulator logspam
 2012-11-09 22:45:26 -08:00
Scott Main
78f7e807df am e72e2b74: am 85abb087: Merge "docs: update Tools landing page with info for developer options" into jb-mr1-dev 
* commit 'e72e2b74bf5ae66524fc5d1872ba759b85728c65':
  docs: update Tools landing page with info for developer options
 2012-11-09 22:42:13 -08:00
Jeff Sharkey
5691474c9c am ad08e6dc: Merge "Emit event log message when switching users." into jb-mr1.1-dev 
* commit 'ad08e6dcfc54556759a876106419b4169e9caffe':
  Emit event log message when switching users.
 2012-11-09 22:42:06 -08:00
Baligh Uddin
eba39ec15c am df2670f1: am ba52aff4: Import translations. DO NOT MERGE 
* commit 'df2670f162dc7756899f4036750ba6866f5326c6':
  Import translations. DO NOT MERGE
 2012-11-09 22:41:59 -08:00
Andy McFadden
a7113f70c5 am 798de53c: Merge "Reduce emulator logspam" into jb-mr1.1-dev 
* commit '798de53cf454595a3a494d26dfa3f08518c24e55':
  Reduce emulator logspam
 2012-11-09 22:41:51 -08:00
Scott Main
e72e2b74bf am 85abb087: Merge "docs: update Tools landing page with info for developer options" into jb-mr1-dev 
* commit '85abb087b9ffd05ff8ecc25575018f4a3fcb966d':
  docs: update Tools landing page with info for developer options
 2012-11-09 21:01:49 -08:00
David Agnew
71789e11cc When in vibrate mode, all notifications will vibrate. 
(Unless the notification specifies no ringtone AND no
vibration, in which case it will remain silent.)

Change-Id: I926d0fe0165b9622cd117e6c3ef6e3637772b444
 2012-11-10 00:01:04 -05:00
Scott Main
85abb087b9 Merge "docs: update Tools landing page with info for developer options" into jb-mr1-dev 2012-11-09 20:59:18 -08:00
Scott Main
002618b2e9 docs: update Tools landing page with info for developer options 
Change-Id: I1b2ce4e6a27b365a7ec8823fce56c613b1651b1d
 2012-11-09 20:50:52 -08:00
Jeff Sharkey
ad08e6dcfc Merge "Emit event log message when switching users." into jb-mr1.1-dev 2012-11-09 17:23:21 -08:00
The Android Automerger
5624af28af merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-09 16:25:31 -08:00
Baligh Uddin
df2670f162 am ba52aff4: Import translations. DO NOT MERGE 
* commit 'ba52aff41b602a68cbe7baed1aeb1adf42f34139':
  Import translations. DO NOT MERGE
 2012-11-09 15:50:41 -08:00
Baligh Uddin
aa29e48b2b am ff87960b: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'ff87960b474609115f20cb9c0fa6e4b15eebc5c5':
  Import translations. DO NOT MERGE
 2012-11-09 15:46:27 -08:00
Baligh Uddin
ff87960b47 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-11-09 15:43:48 -08:00
Andy McFadden
798de53cf4 Merge "Reduce emulator logspam" into jb-mr1.1-dev 2012-11-09 15:38:47 -08:00
Jeff Sharkey
86597df79f Emit event log message when switching users. 
Change-Id: I8e521e177b0e17e2ab9e033e0ff8bc421cd5f784
 2012-11-09 15:09:13 -08:00
Baligh Uddin
ba52aff41b Import translations. DO NOT MERGE 
Change-Id: I293bcd411943a50960328eb2ef836f4b9ba2295e
Auto-generated-cl: translation import
 2012-11-09 09:56:53 -08:00
Baligh Uddin
00eedd3fa5 Import translations. DO NOT MERGE 
Change-Id: I2fe703076ce42275a0f36ba5c1982a76242df6fc
Auto-generated-cl: translation import
 2012-11-09 09:55:52 -08:00
Jean-Baptiste Queru
e499803e82 Re-merge translations - do not merge 
Change-Id: I52f28841a2c2411a331352b8d0da51ae4c7b707b
 2012-11-09 07:32:57 -08:00
John Spurlock
43d84518f2 Disable navbar searchlight if search assist not available. 
Bug:7506441
Change-Id: I55c740d4c3a45b9f7fdfa38346d1bc3fb1299153
 2012-11-09 10:27:33 -05:00
The Android Open Source Project
60acb59089 am 7a396c39: am 18f95189: Reconcile with jb-mr1-release - do not merge 
* commit '7a396c3972de860a4a5874cd3ff1b6b88a610cc2':
 2012-11-09 07:24:10 -08:00
The Android Open Source Project
7a396c3972 am 18f95189: Reconcile with jb-mr1-release - do not merge 
* commit '18f95189727de29246b663ad4557075678217555':
 2012-11-09 07:22:10 -08:00
The Android Open Source Project
18f9518972 Reconcile with jb-mr1-release - do not merge 
Change-Id: I807fafdf3e52abcd291f3f8e593c92f8016ad2ef
 2012-11-09 07:19:27 -08:00