ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,152 Commits 2 Branches 0 Tags 54 MiB
0086cbea6e
Commit Graph

2152 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android (Google) Code Review
0086cbea6e Merge change 6026 
* changes:
  Merge commit '1dac277f' into manualmerge
 2009-07-01 21:33:39 -07:00
Dianne Hackborn
36d4d5ce3e Merge commit '1dac277f' into manualmerge 
Required rewriting the okay battery broadcast stuff.

Conflicts:
	services/java/com/android/server/status/StatusBarPolicy.java
 2009-07-01 21:19:35 -07:00
Android (Google) Code Review
beecae7494 Merge change 6022 
* changes:
  Update rollo with icon images.
 2009-07-01 20:18:01 -07:00
Android (Google) Code Review
9ff0fe07b6 Merge change 5992 
* changes:
  Allocate 16MB for surfaces on Firstone, since 8MB is way to small for our bigger screen.
 2009-07-01 18:29:21 -07:00
Mathias Agopian
78f1c1949f Allocate 16MB for surfaces on Firstone, since 8MB is way to small for our bigger screen. 2009-07-01 17:47:38 -07:00
Android (Google) Code Review
cee89ad2c9 am 9848f11f: Merge change 5826 into donut 
Merge commit '9848f11fd8788b985330183aeb83cc589b8b14ae'

* commit '9848f11fd8788b985330183aeb83cc589b8b14ae':
  Fix NullPointerException in NinePatch constructor
 2009-07-01 17:27:46 -07:00
Android (Google) Code Review
e41c5150da Merge change 5984 
* changes:
  Update rollo and support functions.  Includes mockup of some new ui concepts.
 2009-07-01 16:43:34 -07:00
Android (Google) Code Review
a339e15154 Merge change 5983 
* changes:
  Begin adding mesh
 2009-07-01 16:43:14 -07:00
Android (Google) Code Review
d114d5adc9 am b1a97523: Merge change 5739 into donut 
Merge commit 'b1a975234112cb98ddd5a3ff5f991007eecaff2e'

* commit 'b1a975234112cb98ddd5a3ff5f991007eecaff2e':
  Check to make sure the Java camera object is still valid on the
 2009-07-01 16:02:03 -07:00
Android (Google) Code Review
70856a2f0b am b7d7d5f6: Merge change 5806 into donut 
Merge commit 'b7d7d5f6380e1b7c2b1754be05b0113b91ce01c9'

* commit 'b7d7d5f6380e1b7c2b1754be05b0113b91ce01c9':
  Use additional functions to collect more memory information data points.
 2009-07-01 16:01:58 -07:00
Christopher Tate
47f9e6df28 am 72d19aa5: Tighten up the metadata backup logic 
Merge commit '72d19aa51e90d45c7895629db78e548da2f6d469'

* commit '72d19aa51e90d45c7895629db78e548da2f6d469':
  Tighten up the metadata backup logic
 2009-07-01 16:01:48 -07:00
Android (Google) Code Review
978c5e9a48 am 91c91b74: Merge change 5817 into donut 
Merge commit '91c91b74df12e40c31a50ecb807ac60bed2ccb58'

* commit '91c91b74df12e40c31a50ecb807ac60bed2ccb58':
  Replace indeterminate progress animated asset with new ones
 2009-07-01 16:01:40 -07:00
Android (Google) Code Review
128d240903 am 441cb04e: Merge change 5732 into donut 
Merge commit '441cb04efc0048585b3a6e6fa3d564e3d1b26f62'

* commit '441cb04efc0048585b3a6e6fa3d564e3d1b26f62':
  Fix assertContentsInOrder (bug 1790350).
 2009-07-01 16:01:30 -07:00
Android (Google) Code Review
2e45f3f4fc Merge change 5847 
* changes:
  Adds new attributes for specifying icons to be used in the Contacts app.
 2009-07-01 15:19:40 -07:00
Android (Google) Code Review
854129514c am 2f8d58b7: Merge change 5420 into donut 
Merge commit '2f8d58b7ae2b9dc60eed83e5dddc8c28223e1ede'

* commit '2f8d58b7ae2b9dc60eed83e5dddc8c28223e1ede':
  Added two test cases to trace the failure in closing the hw decoder and the current playtime is greater than the duration.
 2009-07-01 14:18:45 -07:00
Android (Google) Code Review
b5b84b73c8 Merge change 5894 
* changes:
  Obex library cleanup, second pass.
 2009-07-01 14:13:25 -07:00
Android (Google) Code Review
9378daef81 Merge change 5863 
* changes:
  Obex library cleanup, first pass.
 2009-07-01 14:13:18 -07:00
Android (Google) Code Review
73f3a5e10f Merge change 5827 
* changes:
  Add javax.obex library, contributed by Motorola.
 2009-07-01 14:12:59 -07:00
Android (Google) Code Review
1353c45338 am a79ee8e2: Merge change 5792 into donut 
Merge commit 'a79ee8e2d3b4ae3e74ccefa5eeec215b425d9a8e'

* commit 'a79ee8e2d3b4ae3e74ccefa5eeec215b425d9a8e':
  Fix typo introduced during variable cleanup.
 2009-07-01 11:20:25 -07:00
Android (Google) Code Review
4172c4110f am 5fb4cab2: Merge change 5787 into donut 
Merge commit '5fb4cab2db174bff5e28a3a2c6f50c07e0f7a845'

* commit '5fb4cab2db174bff5e28a3a2c6f50c07e0f7a845':
  Fix http://code.google.com/p/android/issues/detail?id=3059
 2009-07-01 11:20:22 -07:00
Wu-cheng Li
cd998742c3 am b8a10fe4: Allow setPreviewDisplay after startPreview. 
Merge commit 'b8a10fe45657f2dcc50cae8a06805f8438a6937e'

* commit 'b8a10fe45657f2dcc50cae8a06805f8438a6937e':
  Allow setPreviewDisplay after startPreview.
 2009-07-01 11:20:08 -07:00
Android (Google) Code Review
5c670fbc50 am 33a7030f: Merge change 5780 into donut 
Merge commit '33a7030f56d83126baa656820bf884ea02772751'

* commit '33a7030f56d83126baa656820bf884ea02772751':
  In TTS synthesis to file, remove hard coded values for the writing of the WAV header.
 2009-07-01 11:20:02 -07:00
Android (Google) Code Review
19bc0de22c am 7a573862: Merge change 5720 into donut 
Merge commit '7a5738624fa78e328b5f36c687c20b9cf0eb5a60'

* commit '7a5738624fa78e328b5f36c687c20b9cf0eb5a60':
  Fix #1876303. Even rfc2616 4.2 says that "Field names are case-insensitive.", servers including Google internal uses case-sensitive checking for "Cookie". So change it.
 2009-07-01 11:19:50 -07:00
Android (Google) Code Review
820c2fe74b am 083928fe: Merge change 5718 into donut 
Merge commit '083928fefde7060eb69f7f45cd8e2180efa9bfe1'

* commit '083928fefde7060eb69f7f45cd8e2180efa9bfe1':
  Fix NullPointerException in DrawableContainer.mutate()
 2009-07-01 11:19:32 -07:00
Tammo Spalink
8190b9997c am 8561de15: eliminate byte-typed cdma sms fields 
Merge commit '8561de157c78e65e49f6989cd2c242c416631df7'

* commit '8561de157c78e65e49f6989cd2c242c416631df7':
  eliminate byte-typed cdma sms fields
 2009-07-01 11:19:28 -07:00
Android (Google) Code Review
07ac9d06a4 am 0178afe4: Merge change 5485 into donut 
Merge commit '0178afe415a598b5b3b4ab5bbeec96a079a124e1'

* commit '0178afe415a598b5b3b4ab5bbeec96a079a124e1':
  cdma sms is91 support
 2009-07-01 11:19:24 -07:00
Android (Google) Code Review
c94481c7e3 am 8aadf7ae: Merge change 5359 into donut 
Merge commit '8aadf7ae278961926de5452a46863503303735cf'

* commit '8aadf7ae278961926de5452a46863503303735cf':
  fix potential string index problems in PhoneNumberUtils.numberToCalledPartyBCDHelper
 2009-07-01 11:19:19 -07:00
Christopher Tate
30612f41a6 am 6f317426: Don\'t issue a deletion for the global metadata backup 
Merge commit '6f317426e49e73ef3e50d8839877504039cd2fca'

* commit '6f317426e49e73ef3e50d8839877504039cd2fca':
  Don't issue a deletion for the global metadata backup
 2009-07-01 11:19:15 -07:00
Jean-Michel Trivi
20914f4c74 am bbd63cb2: Fix bug where the default TTS Service country is initialized to the default language. 
Merge commit 'bbd63cb28595bd6b1fa62d331d9373b5c798c267'

* commit 'bbd63cb28595bd6b1fa62d331d9373b5c798c267':
  Fix bug where the default TTS Service country is initialized to the default language.
 2009-07-01 11:18:55 -07:00
Android (Google) Code Review
cc6fdc1b9f am aa4f1f9e: Merge change 5711 into donut 
Merge commit 'aa4f1f9edc94851a5892ba94af94002018821ddc'

* commit 'aa4f1f9edc94851a5892ba94af94002018821ddc':
  Adding in TTS service support for language query and level of support.
 2009-07-01 11:18:50 -07:00
Android (Google) Code Review
b7eda616b6 am 22e8cbc3: Merge change 5656 into donut 
Merge commit '22e8cbc32bd642bcb3e9b6f161ec662bcf45ff70'

* commit '22e8cbc32bd642bcb3e9b6f161ec662bcf45ff70':
  Generate key events for actions sent to generic input connections.
 2009-07-01 11:18:41 -07:00
Android (Google) Code Review
85b4275d85 am 27a8e07e: Merge change 5699 into donut 
Merge commit '27a8e07e4a10d3754c696cf5b0d947b7bdaea187'

* commit '27a8e07e4a10d3754c696cf5b0d947b7bdaea187':
  Adding status return codes for TTS calls.
 2009-07-01 11:18:33 -07:00
Android (Google) Code Review
586c5a1c9a am bda04135: Merge change 5669 into donut 
Merge commit 'bda04135ee9375d5a6b2bf00e464c3ae69ae9ab4'

* commit 'bda04135ee9375d5a6b2bf00e464c3ae69ae9ab4':
  Fix setting of the APN type.
 2009-07-01 11:18:28 -07:00
Android (Google) Code Review
81bba4d413 am 526355de: Merge change 5701 into donut 
Merge commit '526355dea1fdb24e8ef49f4e5b62974f1dc637d5'

* commit '526355dea1fdb24e8ef49f4e5b62974f1dc637d5':
  Expose in SynthProxy the query for the TTS supported and current language.
 2009-07-01 11:18:23 -07:00
Guang Zhu
0d2e8bdef5 resolved conflicts for merge of 53e083c9 to master 2009-07-01 11:03:25 -07:00
Android (Google) Code Review
28a206c01b Merge change 5923 
* changes:
  Fixes for moving a focused textfield on screen when entering a character.
 2009-07-01 08:22:00 -07:00
Android (Google) Code Review
3b041f744e am ab4748c6: Merge change 5694 into donut 
Merge commit 'ab4748c62d106d9cbc27c88ccd3d2bbda8e451bd'

* commit 'ab4748c62d106d9cbc27c88ccd3d2bbda8e451bd':
  Implement persistent enable/disable of the backup manager
 2009-07-01 00:07:35 -07:00
Android (Google) Code Review
b8e57e728d am 48d4f673: Merge change 5692 into donut 
Merge commit '48d4f673001160df8feae3185a603f320c000e1b'

* commit '48d4f673001160df8feae3185a603f320c000e1b':
  Adjust the character picker layout a little so it will fit on the screen.
 2009-07-01 00:07:31 -07:00
Android (Google) Code Review
20b2be1477 am 3a608f82: Merge change 5684 into donut 
Merge commit '3a608f829b54a7653c9cc2b3bdbda0641cca37bb'

* commit '3a608f829b54a7653c9cc2b3bdbda0641cca37bb':
  Fixes #1940605. MeasureSpec's mode and height were inverted in RelativeLayout.
 2009-07-01 00:07:21 -07:00
Android (Google) Code Review
a61812a1f1 am 52bce9c4: Merge change 5680 into donut 
Merge commit '52bce9c4e7b66ee0a8e1bc5ea7798cf5892b4f23'

* commit '52bce9c4e7b66ee0a8e1bc5ea7798cf5892b4f23':
  Fixes #1949502. Prevents an NPE in View.buildDrawingCache().
 2009-07-01 00:07:17 -07:00
Android (Google) Code Review
923c398dcd am 9032ab8e: Merge change 5673 into donut 
Merge commit '9032ab8e2d42882ea79eabac33c5c2a09565b982'

* commit '9032ab8e2d42882ea79eabac33c5c2a09565b982':
  Adding support for params.
 2009-07-01 00:07:07 -07:00
Android (Google) Code Review
99da6dd7f2 am 58ebdcc0: Merge change 5625 into donut 
Merge commit '58ebdcc06eca06741460a7db2be4b79e3865eb88'

* commit '58ebdcc06eca06741460a7db2be4b79e3865eb88':
  fix [1947273] the DimLayer causes the whole screen to update during transactions
 2009-07-01 00:06:47 -07:00
Android (Google) Code Review
23c6a451be Merge change 5735 
* changes:
  Added a Formatter parameter to DateUtils.formatDateRange
 2009-06-30 17:45:33 -07:00
Dianne Hackborn
57cb23a7c6 resolved conflicts for merge of 66c2942a to master 2009-06-30 16:52:32 -07:00
Android (Google) Code Review
8a7b2ca01e am dbcd9c34: Merge change 5654 into donut 
Merge commit 'dbcd9c34f378a93c1e7e8c91e035782daf66e5f4'

* commit 'dbcd9c34f378a93c1e7e8c91e035782daf66e5f4':
  The BACKUP permission should have the signatureOrSystem protectionLevel,
 2009-06-30 14:49:14 -07:00
Android (Google) Code Review
4040dcf8c2 am bd9aa793: Merge change 5593 into donut 
Merge commit 'bd9aa793b19f7aa529ca4123492f8940b96486b8'

* commit 'bd9aa793b19f7aa529ca4123492f8940b96486b8':
  Add in TTS engine interface the methods to query the availability for a language,
 2009-06-30 14:48:58 -07:00
Tammo Spalink
1de61ec250 am c25dbf88: add comment about endianness 
Merge commit 'c25dbf88fc21c707b72502c43695c2c31ff22a23'

* commit 'c25dbf88fc21c707b72502c43695c2c31ff22a23':
  add comment about endianness
 2009-06-30 14:48:32 -07:00
Android (Google) Code Review
1f6696b81d Merge change 5826 into donut 
* changes:
  Fix NullPointerException in NinePatch constructor
 2009-06-30 13:34:45 -07:00
Android (Google) Code Review
a44d62ff83 Merge change 5739 into donut 
* changes:
  Check to make sure the Java camera object is still valid on the callback from native. Omitted from previous fix. Bug 1936850.
 2009-06-30 13:22:15 -07:00
Android (Google) Code Review
f3b266bda3 Merge change 5806 into donut 
* changes:
  Use additional functions to collect more memory information data points.
 2009-06-30 13:20:44 -07:00