ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
2,405 Commits 2 Branches 0 Tags 54 MiB
8911cdad26
Commit Graph

2405 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
-b master
8911cdad26 resolved conflicts for merge of b7195159 to master 2009-07-06 17:44:41 -07:00
Android (Google) Code Review
8d430cbfca Merge change 6287 into donut 
* changes:
  Restore GPS state and ringer/vibrate toggles.
 2009-07-06 17:32:09 -07:00
Romain Guy
56effbfabd am 870e09fc: Fixes #1963229. Introduces Context#isRestricted(). 
Merge commit '870e09fcd2dfdc12ac318962efd28b0420c562bb'

* commit '870e09fcd2dfdc12ac318962efd28b0420c562bb':
  Fixes #1963229. Introduces Context#isRestricted().
 2009-07-06 17:10:41 -07:00
Android (Google) Code Review
6b4bf81edb am 453dd50e: Merge change 6307 into donut 
Merge commit '453dd50e707aa3a4d24240935f3ff7ea0a08dc7a'

* commit '453dd50e707aa3a4d24240935f3ff7ea0a08dc7a':
  Fixes a compatibility issue with users that have the old TTS
 2009-07-06 16:29:05 -07:00
Android (Google) Code Review
07ab11b4f6 Merge change 6307 into donut 
* changes:
  Fixes a compatibility issue with users that have the old TTS installed already.
 2009-07-06 16:28:03 -07:00
Android (Google) Code Review
eabd0dd50e am 8d07c068: Merge change 6305 into donut 
Merge commit '8d07c0684619b6c30f525d25d92835254a7220a9'

* commit '8d07c0684619b6c30f525d25d92835254a7220a9':
  Fix up permissions for 'dumpsys backup'
 2009-07-06 16:00:27 -07:00
Android (Google) Code Review
352c16e9de Merge change 6256 
* changes:
  Refactoring of VideoView.java class
 2009-07-06 15:54:49 -07:00
Android (Google) Code Review
1b78e260f2 Merge change 6305 into donut 
* changes:
  Fix up permissions for 'dumpsys backup'
 2009-07-06 15:49:26 -07:00
Mathias Agopian
dcab005f07 Merge commit 'goog/master_gl' into merge_master_gl 2009-07-06 14:52:04 -07:00
Android (Google) Code Review
878f6875f3 Merge change 6285 
* changes:
  Make backup agent run in the system process as well.
 2009-07-06 14:48:43 -07:00
Android (Google) Code Review
d76aeb35c5 am da93c26a: Merge change 6271 into donut 
Merge commit 'da93c26a3d2ee0b7d51561b786bde63b7b238c50'

* commit 'da93c26a3d2ee0b7d51561b786bde63b7b238c50':
  Propagating the error codes through the TtsService
 2009-07-06 14:45:20 -07:00
Android (Google) Code Review
9da2c64457 am 21509240: Merge change 6283 into donut 
Merge commit '21509240b0ba00675ffc69038f20726bf8666c57'

* commit '21509240b0ba00675ffc69038f20726bf8666c57':
  Fix a bug where clicking the "more results" suggestion with the trackball
 2009-07-06 14:45:16 -07:00
Android (Google) Code Review
f86e9edd36 Merge change 6271 into donut 
* changes:
  Propagating the error codes through the TtsService
 2009-07-06 14:38:39 -07:00
Android (Google) Code Review
cf39b1574e Merge change 6283 into donut 
* changes:
  Fix a bug where clicking the "more results" suggestion with the trackball did not seem to expand to show the corpus selectors. (http://b/1906643)
 2009-07-06 14:37:54 -07:00
Android (Google) Code Review
6294c9eccf am d2882fa1: Merge change 6282 into donut 
Merge commit 'd2882fa1790a976d939f29a5e39e5e7d1bc677f2'

* commit 'd2882fa1790a976d939f29a5e39e5e7d1bc677f2':
  Fixes #1963214. ProgressDialog was using the wrong indeterminate progress asset.
 2009-07-06 14:33:58 -07:00
Android (Google) Code Review
792ca1d7e0 Merge change 6282 into donut 
* changes:
  Fixes #1963214. ProgressDialog was using the wrong indeterminate progress asset.
 2009-07-06 14:32:18 -07:00
Mathias Agopian
0f7f88db27 Merge commit 'goog/master' into merge_master 2009-07-06 14:16:55 -07:00
Android (Google) Code Review
d1d016be5f Merge change 6269 
* changes:
  Revert "hand rolled out 220f4d633be1098e7887dbd06f179138bf19f1ad due to interface changes on master, the change will need to be made again"
 2009-07-06 14:14:21 -07:00
Android (Google) Code Review
1a16ea88ed am 991eec03: Merge change 6252 into donut 
Merge commit '991eec03a73f8803d0f8c80b418480ea25293cfb'

* commit '991eec03a73f8803d0f8c80b418480ea25293cfb':
  Don't re-parse the framework resources all the time.
 2009-07-06 14:10:36 -07:00
Android (Google) Code Review
71de29ce12 Merge change 6252 into donut 
* changes:
  Don't re-parse the framework resources all the time.
 2009-07-06 14:09:16 -07:00
Android (Google) Code Review
893ad7ed50 am 79ec07b3: Merge change 6241 into donut 
Merge commit '79ec07b333f8982ee83de8eeb0b1927a6cb112ed'

* commit '79ec07b333f8982ee83de8eeb0b1927a6cb112ed':
  Fixes #1444844. Set a maximum fling velocity in scrollable views.
 2009-07-06 13:12:36 -07:00
Android (Google) Code Review
97e665c5ad Merge change 6241 into donut 
* changes:
  Fixes #1444844. Set a maximum fling velocity in scrollable views.
 2009-07-06 13:10:50 -07:00
Android (Google) Code Review
ebdf792b18 am 56fbd8d8: Merge change 6258 into donut 
Merge commit '56fbd8d86a1ea60ae42185349cf8809df24d262a'

* commit '56fbd8d86a1ea60ae42185349cf8809df24d262a':
  Fix the comment -- "charged" not "sharted."  Also, the other
 2009-07-06 12:58:00 -07:00
Android (Google) Code Review
2e2d63e766 Merge change 6258 into donut 
* changes:
  Fix the comment -- "charged" not "sharted."  Also, the other strings on that screen seem to have periods.  I think that's wrong, but it's better to be consistent that right.
 2009-07-06 12:56:32 -07:00
Android (Google) Code Review
9021187407 am 57f2cba2: Merge change 6255 into donut 
Merge commit '57f2cba2db4b5565b0f70bd5501e8d964dce3ad4'

* commit '57f2cba2db4b5565b0f70bd5501e8d964dce3ad4':
  Fix the comments for the string resources for the charge status.
 2009-07-06 12:43:36 -07:00
Android (Google) Code Review
c9fe89474a am 6eb987ac: Merge change 6246 into donut 
Merge commit '6eb987aca79db80f8ac4c28ed1cdc5841df8cfd2'

* commit '6eb987aca79db80f8ac4c28ed1cdc5841df8cfd2':
  Fix bugs 1317754 - "Idle screen displays "Charging (100%)" even when fully charged."
 2009-07-06 12:43:32 -07:00
Android (Google) Code Review
1db89d71cf am 0d725f7d: Merge change 6162 into donut 
Merge commit '0d725f7d5a7efd9dc63f6ddb67a619d659bb4428'

* commit '0d725f7d5a7efd9dc63f6ddb67a619d659bb4428':
  Hold a wakelock during backup/restore/clear operations
 2009-07-06 12:43:28 -07:00
Android (Google) Code Review
4951730088 Merge change 6255 into donut 
* changes:
  Fix the comments for the string resources for the charge status.
 2009-07-06 12:39:28 -07:00
Android (Google) Code Review
a28ad592ab Merge change 6246 into donut 
* changes:
  Fix bugs 1317754 - "Idle screen displays "Charging (100%)" even when fully charged." and 1885870 - "Shorten 'Clear notification' button to 'Clear' to match latest design"
 2009-07-06 12:09:34 -07:00
Android (Google) Code Review
9dc49e93f8 am 9479a516: Merge change 6154 into donut 
Merge commit '9479a516cffd990ed3dfc209c5e768f4fb447812'

* commit '9479a516cffd990ed3dfc209c5e768f4fb447812':
  Fix bug (#1947162)
 2009-07-06 12:00:23 -07:00
Android (Google) Code Review
d950313c05 am 70421cf6: Merge change 6237 into donut 
Merge commit '70421cf6b4e415fd6ce2b3bd55f945dc13b6306c'

* commit '70421cf6b4e415fd6ce2b3bd55f945dc13b6306c':
  Add a silent ringtone.
 2009-07-06 12:00:20 -07:00
Android (Google) Code Review
ae9e1a69b2 am 87e393f1: Merge change 6227 into donut 
Merge commit '87e393f1c81f190fa62d23059fc1109398a6e58b'

* commit '87e393f1c81f190fa62d23059fc1109398a6e58b':
  Adding tts result codes.
 2009-07-06 12:00:17 -07:00
Android (Google) Code Review
4a5aa7d8ca am ef1f21b3: Merge change 6231 into donut 
Merge commit 'ef1f21b34f5624adb7436d3da927660ed16c97c7'

* commit 'ef1f21b34f5624adb7436d3da927660ed16c97c7':
  Don't trim() in the mediascanner, as that would remove the special "sort first" character.
 2009-07-06 12:00:12 -07:00
Android (Google) Code Review
f0b34f121c am 8ad422ad: Merge change 6221 into donut 
Merge commit '8ad422adaf2eb5d36e0391fcc2cd30a226cf87ab'

* commit '8ad422adaf2eb5d36e0391fcc2cd30a226cf87ab':
  Remove links to wikipedia; fix typo; remove .vsd file (bug 1918247).
 2009-07-06 12:00:08 -07:00
Marco Nelissen
2acda445bc am 899725b0: Make sure ringtones are sorted correctly. 
Merge commit '899725b05dd5c8c51f9f802d4f0a7190532ce0a5'

* commit '899725b05dd5c8c51f9f802d4f0a7190532ce0a5':
  Make sure ringtones are sorted correctly.
 2009-07-06 12:00:02 -07:00
Android (Google) Code Review
5fd5ea252a Merge change 6162 into donut 
* changes:
  Hold a wakelock during backup/restore/clear operations
 2009-07-06 11:54:34 -07:00
Marco Nelissen
01a0084ac7 am 816cf52a: Fix the DEFAULT_SORT_ORDER value for media files. Changing this is OK, because existing app will have the old value compiled in as a literal, and so will continue to (not) work in the same way as before. Add code to media key generator to give a leading a 
Merge commit '816cf52abd8f45770f0ac922bbb819184ed4b90f'

* commit '816cf52abd8f45770f0ac922bbb819184ed4b90f':
  Fix the DEFAULT_SORT_ORDER value for media files. Changing this
 2009-07-06 11:54:24 -07:00
Android (Google) Code Review
d00df0ed64 Merge change 6154 into donut 
* changes:
  Fix bug (#1947162)
 2009-07-06 11:37:13 -07:00
Android (Google) Code Review
9641c0176f Merge change 6237 into donut 
* changes:
  Add a silent ringtone.
 2009-07-06 11:34:28 -07:00
The Android Open Source Project
952aa2322b Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2009-07-06 11:31:10 -07:00
Android (Google) Code Review
cbdf6a97b6 Merge change 6227 into donut 
* changes:
  Adding tts result codes.
 2009-07-06 11:26:15 -07:00
Android (Google) Code Review
8de5607307 Merge change 6232 
* changes:
  frameworks/base: Update mPdu in createFromPdu
 2009-07-06 11:22:51 -07:00
Hung-ying Tyan
5eff27ce82 am 46841db4: Add PPTP and L2TP/IPSec PSK service dispatching 
Merge commit '46841db4f2c7360d3b861a816e51f76acca0d677'

* commit '46841db4f2c7360d3b861a816e51f76acca0d677':
  Add PPTP and L2TP/IPSec PSK service dispatching
 2009-07-06 11:22:45 -07:00
Android (Google) Code Review
3882f676c1 am 1f2bb46b: Merge change 6204 into donut 
Merge commit '1f2bb46b9a2762a6f57ca8801d91e9dee002158f'

* commit '1f2bb46b9a2762a6f57ca8801d91e9dee002158f':
  Migrate to new keystore with the CertTool lib.
 2009-07-06 11:22:36 -07:00
Android (Google) Code Review
29f5a900db am 3383df38: Merge change 6198 into donut 
Merge commit '3383df385e208807b1dc5f2956f82a7f75f65fd8'

* commit '3383df385e208807b1dc5f2956f82a7f75f65fd8':
  keystore: Provide a generic getter for native components.
 2009-07-06 11:22:25 -07:00
Chung-yih Wang
e439029f8a am 699ca3f2: Add password field for WiFi configuration. 
Merge commit '699ca3f2518360ea3250ff5a0e5d39e122c64a91'

* commit '699ca3f2518360ea3250ff5a0e5d39e122c64a91':
  Add password field for WiFi configuration.
 2009-07-06 11:22:18 -07:00
Android (Google) Code Review
e68a938829 am 4492bcb8: Merge change 6081 into donut 
Merge commit '4492bcb851f4ee862a446664eb9045045ebb7b5e'

* commit '4492bcb851f4ee862a446664eb9045045ebb7b5e':
  Migrate to the CertTool library.
 2009-07-06 11:22:11 -07:00
Android (Google) Code Review
9acbfd90b7 am 6b1ab257: Merge change 6187 into donut 
Merge commit '6b1ab2572ed114beba07230f6fa9c02519cf27df'

* commit '6b1ab2572ed114beba07230f6fa9c02519cf27df':
  Fix strings.
 2009-07-06 11:22:07 -07:00
Android (Google) Code Review
2659e77bd2 am 24ad29c6: Merge change 6177 into donut 
Merge commit '24ad29c6dbbf62096bcb41ddb2fa3975720ee625'

* commit '24ad29c6dbbf62096bcb41ddb2fa3975720ee625':
  Two small checks in keymgmt.
 2009-07-06 11:21:59 -07:00
Android (Google) Code Review
a244e8cdc9 am 7b8f782e: Merge change 6183 into donut 
Merge commit '7b8f782eaaef392154fe3acd3ffb48c0a81024e9'

* commit '7b8f782eaaef392154fe3acd3ffb48c0a81024e9':
  Fix null data handling in ServiceCommand.writeCommand()
 2009-07-06 11:21:50 -07:00