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

2938 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
79006baffb am b4ee0f93: am aa25df24: AI 149729: fix search functionatilty for offline docs... the file references weren\'t using the local root. BUG=1909300 
Merge commit 'b4ee0f930928fbbc425f29d3e3e09455cdc6cf85'

* commit 'b4ee0f930928fbbc425f29d3e3e09455cdc6cf85':
  AI 149729: fix search functionatilty for offline docs...
 2009-06-11 01:02:49 -07:00
Christopher Tate
0c32f14ef1 am 9bbc21a7: Flesh out restore interface on manager; work up most of LocalTransport 
Merge commit '9bbc21a773cbdfbef2876a75c32bda5839647751'

* commit '9bbc21a773cbdfbef2876a75c32bda5839647751':
  Flesh out restore interface on manager; work up most of LocalTransport
 2009-06-11 00:56:29 -07:00
Android (Google) Code Review
a50b795161 am b6391d63: Merge change 3857 into donut 
Merge commit 'b6391d6377883586995127c9926c1b5b8035fd60'

* commit 'b6391d6377883586995127c9926c1b5b8035fd60':
  Allow arrays of values for power profile data.
 2009-06-11 00:45:27 -07:00
Jean-Michel Trivi
8b93740b29 am b3c5a878: Made the platform TTS service aware of the path for the default TTS library to load. 
Merge commit 'b3c5a8785bc643843117752d37769a1edfe9a9e2'

* commit 'b3c5a8785bc643843117752d37769a1edfe9a9e2':
  Made the platform TTS service aware of the path for the default TTS library to load.
 2009-06-11 00:45:21 -07:00
Android (Google) Code Review
74c2acee04 am 238bf47a: Merge change 3826 into donut 
Merge commit '238bf47a850532233ed51362dca95facf8680770'

* commit '238bf47a850532233ed51362dca95facf8680770':
  LocationManagerService: Fix logic error removing multiple dead receivers.
 2009-06-11 00:45:02 -07:00
Scott Main
b4ee0f9309 am aa25df24: AI 149729: fix search functionatilty for offline docs... the file references weren\'t using the local root. BUG=1909300 
Merge commit 'aa25df2452f68d2f732ad620a97fd47b3802fa2e' into donut

* commit 'aa25df2452f68d2f732ad620a97fd47b3802fa2e':
  AI 149729: fix search functionatilty for offline docs...
 2009-06-11 00:01:42 -07:00
Scott Main
aa25df2452 AI 149729: fix search functionatilty for offline docs... 
the file references weren't using the local root.
  BUG=1909300

Automated import of CL 149729
 2009-06-10 23:40:25 -07:00
Christopher Tate
9bbc21a773 Flesh out restore interface on manager; work up most of LocalTransport 2009-06-10 20:38:54 -07:00
Android (Google) Code Review
b6391d6377 Merge change 3857 into donut 
* changes:
  Allow arrays of values for power profile data.
 2009-06-10 19:50:22 -07:00
Amith Yamasani
3718aaabe6 Allow arrays of values for power profile data. 
Parse arrays for data that has different levels with non-linear
power increase.
Track radio data awake_time from kernel and mobile/total data
transfers.
Use dummy values for default power_profile.xml. Actual values will
be in a product overlay.
 2009-06-10 19:45:28 -07:00
Android (Google) Code Review
43b605d682 Merge change 3850 
* changes:
  Fix bug with bad conversion of java strings to C strings for object names.  Update test app to test object defines.
 2009-06-10 19:09:37 -07:00
Android (Google) Code Review
bcf3e6a220 Merge change 3849 
* changes:
  Fix build error due to bad path generation in makefile for generated tools. Implemented by JoeO
 2009-06-10 19:09:07 -07:00
Jason Sams
d5680f9ba9 Fix bug with bad conversion of java strings to C strings for object names. Update test app to test object defines. 2009-06-10 18:39:40 -07:00
Jean-Michel Trivi
b3c5a8785b Made the platform TTS service aware of the path for the default TTS library to load. 2009-06-10 18:38:50 -07:00
Jason Sams
196ac850af Fix build error due to bad path generation in makefile for generated tools. 
Implemented by JoeO
 2009-06-10 18:35:42 -07:00
Android (Google) Code Review
de115412d5 Merge change 3841 
* changes:
  Fix botched merge from commit b61498d1ac8e25f0024dcde46b41bcf0d8336d89
 2009-06-10 18:06:18 -07:00
Eric Fischer
f40e1a5fa6 Fix botched merge from commit b61498d1ac8e25f0024dcde46b41bcf0d8336d89 2009-06-10 18:02:15 -07:00
Android (Google) Code Review
238bf47a85 Merge change 3826 into donut 
* changes:
  LocationManagerService: Fix logic error removing multiple dead receivers.
 2009-06-10 17:32:21 -07:00
Simon Schoar
4686657cee LocationManagerService: Fix logic error removing multiple dead receivers. 
If multiple receivers are dead, only the first one will be added.
found in http://code.google.com/p/android/issues/detail?id=2651

Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-06-10 20:23:31 -04:00
Android (Google) Code Review
1ecb750f65 am 1d7d5db7: Merge change 3799 into donut 
Merge commit '1d7d5db74f14e871c7be719a0cddf52a5a40dcbf'

* commit '1d7d5db74f14e871c7be719a0cddf52a5a40dcbf':
  Turned on the windows media related test cases as the binary already integrated.
 2009-06-10 17:20:04 -07:00
Christopher Tate
bb8d0dfed9 am c7b31e3c: The rest of the basic flow for restore 
Merge commit 'c7b31e3c3cd71129557d4bf9e3fbcebb9235aba5'

* commit 'c7b31e3c3cd71129557d4bf9e3fbcebb9235aba5':
  The rest of the basic flow for restore
 2009-06-10 17:19:57 -07:00
Android (Google) Code Review
4f84953a4f am 2795c2d6: Merge change 3806 into donut 
Merge commit '2795c2d6b73f6e72565569f7d4f2f4b34e526bba'

* commit '2795c2d6b73f6e72565569f7d4f2f4b34e526bba':
  Fix a couple null pointer exceptions in CDMA voice call handling.
 2009-06-10 17:19:54 -07:00
Android (Google) Code Review
1d7d5db74f Merge change 3799 into donut 
* changes:
  Turned on the windows media related test cases as the binary already integrated.
 2009-06-10 17:10:05 -07:00
Christopher Tate
c7b31e3c3c The rest of the basic flow for restore 
Also moved the processOneBackup() implementation into the Thread class that runs
the backup sequence.
 2009-06-10 16:43:50 -07:00
The Android Open Source Project
ca83b1b176 Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2009-06-10 16:43:38 -07:00
Dmitri Plotnikov
0918bf0688 Adding new query: aggregation suggestions 2009-06-10 16:40:37 -07:00
Android (Google) Code Review
2795c2d6b7 Merge change 3806 into donut 
* changes:
  Fix a couple null pointer exceptions in CDMA voice call handling.
 2009-06-10 16:38:12 -07:00
Android (Google) Code Review
106be41b9b am 1f35bf18: Merge change 3795 into donut 
Merge commit '1f35bf18ade606810843c8ec10445fc884d686cb'

* commit '1f35bf18ade606810843c8ec10445fc884d686cb':
  URI/extra data for inline scheme.
 2009-06-10 16:31:52 -07:00
Mitsuru Oshima
bd6b11dd58 am e5fb3288: resolution support fix/improvement * adding compatibility menu * backup gravity * set expanable=true if the screen size is hvga * density. * added "supports any density" mode. I\'ll add sdk check later. * disallow to catch orientation c 
Merge commit 'e5fb328825995aa33b5b7ecf8b5bee2b17f81715'

* commit 'e5fb328825995aa33b5b7ecf8b5bee2b17f81715':
  resolution support fix/improvement
 2009-06-10 16:31:36 -07:00
Android (Google) Code Review
737bae060a am ca436e24: Merge change 3782 into donut 
Merge commit 'ca436e24dec0fa258a8a756c3e7d07bcb096c5b3'

* commit 'ca436e24dec0fa258a8a756c3e7d07bcb096c5b3':
  Reimport Portuguese translations.
 2009-06-10 16:31:33 -07:00
Android (Google) Code Review
041b75bbde am f50ab7f4: Merge change 3777 into donut 
Merge commit 'f50ab7f46296786f575b2d171ec05a661d129015'

* commit 'f50ab7f46296786f575b2d171ec05a661d129015':
  Process the response of RIL_REQUEST_REPORT_SMS_MEMORY_STATUS.
 2009-06-10 16:31:29 -07:00
Android (Google) Code Review
bd6b2b410f am a45711aa: Merge change 3765 into donut 
Merge commit 'a45711aaebc514290fdf0c93f07a3120dc160ddb'

* commit 'a45711aaebc514290fdf0c93f07a3120dc160ddb':
  Add a gservices flag to limit the size of protobufs we can gzip
 2009-06-10 16:31:27 -07:00
Android (Google) Code Review
e69ec574e6 am 732912a1: Merge change 3730 into donut 
Merge commit '732912a103e985520dba9c022a40bc21b4c4ced5'

* commit '732912a103e985520dba9c022a40bc21b4c4ced5':
  Restructuring the TTS files so that it works as a Service
 2009-06-10 16:31:23 -07:00
Romain Guy
b61498d1ac resolved conflicts for merge of f31cbb to master 2009-06-10 16:30:18 -07:00
Android (Google) Code Review
a10cb5a344 Merge change 3808 
* changes:
  Split renderscript java code from test apps.  Update makefiles.
 2009-06-10 16:24:47 -07:00
Android (Google) Code Review
1f35bf18ad Merge change 3795 into donut 
* changes:
  URI/extra data for inline scheme.
 2009-06-10 16:24:01 -07:00
Android (Google) Code Review
1565800f87 Merge change 3796 
* changes:
  Added data restriction constants to ContactsContract.
 2009-06-10 16:14:18 -07:00
Jason Sams
94d8e90ad7 Split renderscript java code from test apps. Update makefiles. 2009-06-10 16:09:05 -07:00
Jeff Sharkey
28b68e5a59 Added data restriction constants to ContactsContract. 
Each data item can now be flagged as IS_RESTRICTED by the
package that owns it.  Restricted data items will only be
visible to the owning package, unless the owner creates
RestrictionExceptions for other packages.

Currently @hide, so no current.xml needed.
 2009-06-10 15:49:52 -07:00
Yu Shan Emily Lau
afbc17ead2 Turned on the windows media related test cases as the binary already integrated. 2009-06-10 15:46:32 -07:00
Android (Google) Code Review
bf521a0f7d am 4a60b887: Merge change 3761 into donut 
Merge commit '4a60b887d4b9744126e62b094a9597ee8e924640'

* commit '4a60b887d4b9744126e62b094a9597ee8e924640':
  Added support to record page load time for each url.
 2009-06-10 15:33:08 -07:00
Android (Google) Code Review
8e18d88c3b am b11e670e: Merge change 3754 into donut 
Merge commit 'b11e670e56b30022dbaaa921390005a95dfd337b'

* commit 'b11e670e56b30022dbaaa921390005a95dfd337b':
  Fix some 12- vs 24-hour problems in the FormatDateRange strings.
 2009-06-10 15:33:04 -07:00
Android (Google) Code Review
1b04076251 am 684a2edb: Merge change 3577 into donut 
Merge commit '684a2edbe192a2a76684c5d6855773196d2e1a2e'

* commit '684a2edbe192a2a76684c5d6855773196d2e1a2e':
  Make aapt Error out when an overlay adds a string.
 2009-06-10 15:32:56 -07:00
Eric Fischer
ea6a49436a am c0c0b684: am a8c3821e: AI 149721: Import Portuguese translations. 
Merge commit 'c0c0b6844e4e4cd3b872a80e51416cfd9ca124d9'

* commit 'c0c0b6844e4e4cd3b872a80e51416cfd9ca124d9':
  AI 149721: Import Portuguese translations.
 2009-06-10 15:32:46 -07:00
Mitsuru Oshima
e5fb328825 resolution support fix/improvement 
* adding compatibility menu
    * backup gravity
    * set expanable=true if the screen size is hvga * density.
    * added "supports any density" mode. I'll add sdk check later.
    * disallow to catch orientation change event if the app is not expandable. This
      was causing layout problem under non-expandable mode. I discussed this with Mike C
      and we agreed to do this approach for now. We'll revisit if this causes problem to
      a lot of applications.
 2009-06-10 15:22:17 -07:00
Android (Google) Code Review
ca436e24de Merge change 3782 into donut 
* changes:
  Reimport Portuguese translations.
 2009-06-10 15:20:55 -07:00
Mitsuru Oshima
8eb241b877 URI/extra data for inline scheme. 2009-06-10 15:18:08 -07:00
Android (Google) Code Review
f50ab7f462 Merge change 3777 into donut 
* changes:
  Process the response of RIL_REQUEST_REPORT_SMS_MEMORY_STATUS.
 2009-06-10 15:17:15 -07:00
Android (Google) Code Review
a45711aaeb Merge change 3765 into donut 
* changes:
  Add a gservices flag to limit the size of protobufs we can gzip
 2009-06-10 15:11:52 -07:00
Android (Google) Code Review
732912a103 Merge change 3730 into donut 
* changes:
  Restructuring the TTS files so that it works as a Service
 2009-06-10 15:09:37 -07:00