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

96268 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Jurka
3a22636222 am 3366a5d5: am cf474b1a: am 7b0c8779: Merge "Delete appWidgetId when removing lockscreen widgets" into jb-mr1.1-dev 
* commit '3366a5d54eccbbe861bcc765653664d80eae5398':
  Delete appWidgetId when removing lockscreen widgets
 2012-11-16 15:37:08 -08:00
Michael Jurka
3366a5d54e am cf474b1a: am 7b0c8779: Merge "Delete appWidgetId when removing lockscreen widgets" into jb-mr1.1-dev 
* commit 'cf474b1a10a1349d0d6d6f7cbb5d48489bacfb09':
  Delete appWidgetId when removing lockscreen widgets
 2012-11-16 15:34:20 -08:00
Michael Jurka
cf474b1a10 am 7b0c8779: Merge "Delete appWidgetId when removing lockscreen widgets" into jb-mr1.1-dev 
* commit '7b0c877959ee15c766cc7366ec6b4c024c211cd6':
  Delete appWidgetId when removing lockscreen widgets
 2012-11-16 15:31:07 -08:00
Michael Jurka
7b0c877959 Merge "Delete appWidgetId when removing lockscreen widgets" into jb-mr1.1-dev 2012-11-16 15:29:17 -08:00
Michael Jurka
75b5cfb4a4 Delete appWidgetId when removing lockscreen widgets 
Bug: 7550012

Change-Id: Ia9f5266256016eb91bfd6a2d5a7f910c42948f1e
 2012-11-16 15:22:06 -08:00
Guang Zhu
dc0b84b129 am e9019d90: am dbcdb1a8: am a9c0bb4a: Merge "grant shell user EXPAND_STATUS_BAR permission" into jb-mr1.1-dev 
* commit 'e9019d90a3eed0dae98d5502e386212e56a92267':
  grant shell user EXPAND_STATUS_BAR permission
 2012-11-16 14:13:48 -08:00
Guang Zhu
e9019d90a3 am dbcdb1a8: am a9c0bb4a: Merge "grant shell user EXPAND_STATUS_BAR permission" into jb-mr1.1-dev 
* commit 'dbcdb1a854b155605fe69dc47b8f6e4e441c817d':
  grant shell user EXPAND_STATUS_BAR permission
 2012-11-16 14:12:19 -08:00
Guang Zhu
dbcdb1a854 am a9c0bb4a: Merge "grant shell user EXPAND_STATUS_BAR permission" into jb-mr1.1-dev 
* commit 'a9c0bb4a579a98cb7694e36454425c84a8c6510e':
  grant shell user EXPAND_STATUS_BAR permission
 2012-11-16 14:09:47 -08:00
Guang Zhu
a9c0bb4a57 Merge "grant shell user EXPAND_STATUS_BAR permission" into jb-mr1.1-dev 2012-11-16 14:06:01 -08:00
Marco Nelissen
68cc52cf67 am 803db164: am aeb62686: Merge "Fallback to fallbackring if ringtone can\'t be played." 
* commit '803db1646aedb451b76d33a4f30b16942c5d3ca4':
  Fallback to fallbackring if ringtone can't be played.
 2012-11-16 13:07:04 -08:00
Marco Nelissen
803db1646a am aeb62686: Merge "Fallback to fallbackring if ringtone can\'t be played." 
* commit 'aeb6268645d571dfc9f2d387a7ad2471039ddb54':
  Fallback to fallbackring if ringtone can't be played.
 2012-11-16 13:03:33 -08:00
Robert Greenwalt
60bfacd8ef Merge "Support for dns domain." 2012-11-16 12:56:56 -08:00
Marco Nelissen
aeb6268645 Merge "Fallback to fallbackring if ringtone can't be played." 2012-11-16 11:48:14 -08:00
Amith Yamasani
f9f1ca9e96 am 8f97174a: am 4ad8a4bd: am acddb72c: Merge "Make sure that the owner user is marked initialized." into jb-mr1.1-dev 
* commit '8f97174a9c9ea637301ffc19bb64369b74e1ab54':
  Make sure that the owner user is marked initialized.
 2012-11-16 11:37:34 -08:00
Scott Main
432a36bcd7 am 3ed08b1e: am a1095620: am 159cdd92: am 33e499ea: docs: move articles into group directory 
* commit '3ed08b1e03adad7f6e75efc749253460b198eab8':
  docs: move articles into group directory
 2012-11-16 11:37:24 -08:00
Robert Greenwalt
8058f62189 Support for dns domain. 
bug:6799630
Change-Id: I10070eddb65b7b60f0bc2b3e1e320e1aa4ec6e98
 2012-11-16 11:25:32 -08:00
Amith Yamasani
8f97174a9c am 4ad8a4bd: am acddb72c: Merge "Make sure that the owner user is marked initialized." into jb-mr1.1-dev 
* commit '4ad8a4bd89c0a93705864e9beda39065b34545d6':
  Make sure that the owner user is marked initialized.
 2012-11-16 10:50:29 -08:00
Amith Yamasani
4ad8a4bd89 am acddb72c: Merge "Make sure that the owner user is marked initialized." into jb-mr1.1-dev 
* commit 'acddb72c58dbab029d1acbaea61755e79ef8b2a4':
  Make sure that the owner user is marked initialized.
 2012-11-16 10:47:11 -08:00
Amith Yamasani
acddb72c58 Merge "Make sure that the owner user is marked initialized." into jb-mr1.1-dev 2012-11-16 10:43:48 -08:00
Scott Main
7cb60b4949 am 0584c558: am f428b4dd: am e3ac5321: am fa1320e6: docs: revise getting started intro 
* commit '0584c5585c2c1b11b9b0a147d1153396e6fccb88':
  docs: revise getting started intro
 2012-11-16 10:43:18 -08:00
Scott Main
7d2a39e4f6 am 6ef004a3: am 4b6eb950: am 4c7a5d6a: am 4e2e9bae: docs: update checksums/sizes for new adt bundles 
* commit '6ef004a3b5359406c1a1dca046b4fa40ce7abb0f':
  docs: update checksums/sizes for new adt bundles
 2012-11-16 10:43:07 -08:00
Scott Main
e8929cdeee am b6ef1640: am fb4d6af6: am 4f784509: am d4ff8249: Merge "docs: update sdk install to handle both 32 and 64-bit bundles" into jb-mr1-dev 
* commit 'b6ef1640ca9c6f264f40ff0c3b5516934aa3c7c0':
  docs: update sdk install to handle both 32 and 64-bit bundles
 2012-11-16 10:42:48 -08:00
Adam Cohen
de9e974e7c am a2d25079: am 5a0f5ba2: am 6189888a: Merge "Making sure launcher doesn\'t show keyguard-only widgets (issue 7550090)" into jb-mr1.1-dev 
* commit 'a2d250791d73396ee1f7c6bc90757defccee4669':
  Making sure launcher doesn't show keyguard-only widgets (issue 7550090)
 2012-11-16 10:42:40 -08:00
Adam Cohen
f5983a9511 am af958dce: am b82ee0c7: am b02eb4bb: Merge "Pushing state persistence to a background thread" into jb-mr1.1-dev 
* commit 'af958dce341b0046808d544a040445bd2941f6a1':
  Pushing state persistence to a background thread
 2012-11-16 10:38:19 -08:00
Fabrice Di Meglio
cf0a5865f4 am e054ab85: am 348cf60d: am 674a131c: Merge "Fix bug #6638582 Password fields appears RTL in Arabic locale , it should be LTR" into jb-mr1.1-dev 
* commit 'e054ab85388d71c8b1d46fa4e67018ff2aaa97ae':
  Fix bug #6638582 Password fields appears RTL in Arabic locale , it should be LTR
 2012-11-16 10:38:08 -08:00
Jeff Sharkey
8e2ffc76a9 am 9634e970: am bfea4f04: am f5377a72: Merge "Useful annotations for code documentation." into jb-mr1.1-dev 
* commit '9634e970679c687572e2da84250adc8baf91a8c3':
  Useful annotations for code documentation.
 2012-11-16 10:37:59 -08:00
Jeff Sharkey
6dd028cbb9 am 9f43afad: am 68363456: am 7420ab68: Merge "Utility to format human-friendly durations." into jb-mr1.1-dev 
* commit '9f43afad9de92fc36dc7b242585ef734e834285c':
  Utility to format human-friendly durations.
 2012-11-16 10:37:54 -08:00
Jeff Sharkey
f99ddad6e3 am 91b57293: am 64f369a5: am a319d655: Merge "Avoid runtime restart after vold reconnects." into jb-mr1.1-dev 
* commit '91b57293233e005ce97c655578c775aaaf95a745':
  Avoid runtime restart after vold reconnects.
 2012-11-16 10:37:50 -08:00
Jeff Sharkey
2654442b5b am 9077ca58: am dcb72dbb: am 445767c1: Merge "Watch for leaked ParcelFileDescriptors." into jb-mr1.1-dev 
* commit '9077ca586e083fd0e2913c4232915416b3719e7d':
  Watch for leaked ParcelFileDescriptors.
 2012-11-16 10:37:46 -08:00
Jeff Sharkey
0ace4de5c2 am f838eb40: am fa0fb7c5: am f6ba84b4: Merge "Reduce verbosity of service event logging." into jb-mr1.1-dev 
* commit 'f838eb40e8f53263c10d251ec4ec72f167f82541':
  Reduce verbosity of service event logging.
 2012-11-16 10:37:42 -08:00
Scott Main
8bce2984ec am f4868068: am 8361b846: am 1f4c9d3e: am 7425bf86: Merge "docs: fix ndk tos layout for small screens" into jb-mr1-dev 
* commit 'f4868068f8787370e0d96b259c37c3c156f300b4':
  docs: fix ndk tos layout for small screens
 2012-11-16 10:37:34 -08:00
Scott Main
0d853ef573 am 1d9ccfd4: am db86f5d2: am 988571a8: am bce26803: docs: fix broken youtube playlists 
* commit '1d9ccfd40070bb702242a3fd9b52e8cab7c50875':
  docs: fix broken youtube playlists
 2012-11-16 10:37:28 -08:00
kmccormick@google.com
214d618d95 am 9fd5f094: am afbf515b: am 47972cea: am 480ac7fc: am 596d0e38: am f53c5f36: am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs 
* commit '9fd5f0940b7d69ab82332389042b94cb25d9f924':
  Doc Update: Fixing images
 2012-11-16 10:37:17 -08:00
Baligh Uddin
15fb33165a am e872b738: (-s ours) am a3a2c6a9: am ecc2bcb5: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit 'e872b738e823fb91e3010b65976e8deab5bb1ea1':
  Import translations. DO NOT MERGE
 2012-11-16 10:37:02 -08:00
Baligh Uddin
e45edaffa1 am a0bee9f0: (-s ours) am 2028f8e0: am 38939259: am c3b6ee60: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'a0bee9f097da3f9441a0db70fac441e29bafa273':
  Import translations. DO NOT MERGE
 2012-11-16 10:36:58 -08:00
Baligh Uddin
8b7887b19b am 31431cd5: (-s ours) am 5a1b49b1: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '31431cd558faba5b42ba05604307678761eddf13':
  Import translations. DO NOT MERGE
 2012-11-16 10:36:47 -08:00
Baligh Uddin
1d0d666905 am d1846e02: (-s ours) am 59ae7069: am 8264bd80: am 36c7d313: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'd1846e021f952d0be9681677d9d00b2ad1ea2073':
  Import translations. DO NOT MERGE
 2012-11-16 10:36:43 -08:00
Baligh Uddin
2d5e545371 am 8ce25752: (-s ours) am defe7615: am aaf3fbc6: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit '8ce25752f78245c513a055378804f1e16f71d831':
  Import translations. DO NOT MERGE
 2012-11-16 10:36:39 -08:00
Baligh Uddin
498cd4f4fe am 9d6cf4e1: (-s ours) am f118bcc5: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '9d6cf4e1c3de8415c3c466ac940cafe0d867a4f3':
  Import translations. DO NOT MERGE
 2012-11-16 10:36:35 -08:00
Daniel Sandler
3639beff7a am 8ff32d81: am 00679b5b: am 020d6529: Merge "Do not vibe when the default notification sound is Silent." into jb-mr1.1-dev 
* commit '8ff32d81134cc6a73b9c58e720e8d2ad79a9c119':
  Do not vibe when the default notification sound is Silent.
 2012-11-16 10:36:23 -08:00
Daniel Sandler
c89da9e28a am 1812b345: am 2bb5dc6a: am 83b25961: Merge "Notification vibration improvements:" into jb-mr1.1-dev 
* commit '1812b3450389b37bc069061cc69cb20754816f62':
  Notification vibration improvements:
 2012-11-16 10:36:19 -08:00
Scott Main
51691e4365 am b80d578c: am 2da041f0: am 0622ed7f: am 0034beab: resolved conflicts for merge of 783e115b to jb-mr1-dev 
* commit 'b80d578c8f66302584969aadbac3e723e1717f81':
  implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the list of classes/lessons on each course landing page.
 2012-11-16 10:36:02 -08:00
Scott Main
3ed08b1e03 am a1095620: am 159cdd92: am 33e499ea: docs: move articles into group directory 
* commit 'a10956203cd118b95c5f9d81b47ee176f53ba3a6':
  docs: move articles into group directory
 2012-11-16 09:58:44 -08:00
Scott Main
a10956203c am 159cdd92: am 33e499ea: docs: move articles into group directory 
* commit '159cdd925db2cf6d5b2d4cdaa718c1d537ac4fcd':
  docs: move articles into group directory
 2012-11-16 09:56:21 -08:00
Scott Main
159cdd925d am 33e499ea: docs: move articles into group directory 
* commit '33e499ea364e4e061964bc8fe16365fd632eb39d':
  docs: move articles into group directory
 2012-11-16 09:52:27 -08:00
Scott Main
33e499ea36 docs: move articles into group directory 
Change-Id: If90f5ac284d8df16b830d5744fbd684e5b1b34e3
 2012-11-16 08:54:27 -08:00
Wink Saville
b8a3f5550a Merge "Separate voice and data radio technology/network type & registration state." 2012-11-16 08:19:34 -08:00
Glenn Kasten
856a48a011 Merge "Use size_t for frame count" 2012-11-16 08:13:10 -08:00
Wink Saville
0dde2c20a0 Separate voice and data radio technology/network type & registration state. 
Change-Id: Ic9622e3fd637751b427c1627bbdf4d142acbc66e
 2012-11-16 08:12:11 -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