Dianne Hackborn
816e7fbd46
am d7cd29da: Add facility to run setup wizard after an update.
...
Merge commit 'd7cd29da91ccc0aba1f1097e19366f9ca36c7ce1'
* commit 'd7cd29da91ccc0aba1f1097e19366f9ca36c7ce1':
Add facility to run setup wizard after an update.
2009-07-03 08:58:10 -07:00
The Android Open Source Project
e2008a17b1
resolved conflicts for merge of cf098294 to master
2009-07-03 08:55:59 -07:00
Android (Google) Code Review
7887aa766e
am 2bbb80e1: Merge change 5994 into donut
...
Merge commit '2bbb80e183c6492689f8b10b2d0f5dfe9872a6ac'
* commit '2bbb80e183c6492689f8b10b2d0f5dfe9872a6ac':
Less logging in some places. More in others.
2009-07-03 08:18:22 -07:00
Romain Guy
b63dea9658
am a5475596: Cleanup a bunch of warnings in app widgets code.
...
Merge commit 'a54755962ca7725d1e2b6cacbbaece6f1cbf5af4'
* commit 'a54755962ca7725d1e2b6cacbbaece6f1cbf5af4':
Cleanup a bunch of warnings in app widgets code.
2009-07-03 08:18:17 -07:00
Android (Google) Code Review
798bf698d6
am 392282f1: Merge change 5962 into donut
...
Merge commit '392282f1e01518491c6536d931500c4bfac7f24f'
* commit '392282f1e01518491c6536d931500c4bfac7f24f':
SimRecords.getServiceProviderName() always returned null.
2009-07-02 15:24:15 -07:00
Android (Google) Code Review
dcc7c262fe
am 8dd02090: Merge change 5940 into donut
...
Merge commit '8dd02090cec0743bb1987c2cf21f974ab2e075da'
* commit '8dd02090cec0743bb1987c2cf21f974ab2e075da':
Add CLDR data/formats for newly-translated locales.
2009-07-02 15:24:11 -07:00
Android (Google) Code Review
71a0940c8c
am d18dc8c6: Merge change 5906 into donut
...
Merge commit 'd18dc8c641cb4c89ffb205fb510e59a40ddf43fe'
* commit 'd18dc8c641cb4c89ffb205fb510e59a40ddf43fe':
resolve complex value in application context instead of system context.
2009-07-02 15:24:01 -07:00
Android (Google) Code Review
aa972a4690
am 54af78a3: Merge change 5950 into donut
...
Merge commit '54af78a3f7064e04d7ebd64c985d4149f9f7b05c'
* commit '54af78a3f7064e04d7ebd64c985d4149f9f7b05c':
Fix memory leaks in system_server
2009-07-02 15:23:56 -07:00
Christopher Tate
60bbbd1a35
am 49401ddb: Revamp backup scheduling policy
...
Merge commit '49401ddb9ac11ad5caead4e4cefcaa81d2418ed2'
* commit '49401ddb9ac11ad5caead4e4cefcaa81d2418ed2':
Revamp backup scheduling policy
2009-07-02 15:23:49 -07:00
Christopher Tate
769ad5f7cf
am ce0bf069: Use secure settings for backup enable / transport selection
...
Merge commit 'ce0bf069fe8c5c93f91cb70b0cd9365245d144c1'
* commit 'ce0bf069fe8c5c93f91cb70b0cd9365245d144c1':
Use secure settings for backup enable / transport selection
2009-07-02 15:23:45 -07:00
Satish Sampath
e2784e4cf5
am 1b1a6e40: Fix build break by adding an @hide javadoc comment.
...
Merge commit '1b1a6e406c4233b309baee85e14f5a563ca63c48'
* commit '1b1a6e406c4233b309baee85e14f5a563ca63c48':
Fix build break by adding an @hide javadoc comment.
2009-07-02 15:23:40 -07:00
Satish Sampath
687a620ce4
am fef8d3e4: Make search UI open up quicker to the user.
...
Merge commit 'fef8d3e4d8f6f46c098d04b3a57409c947ec1c75'
* commit 'fef8d3e4d8f6f46c098d04b3a57409c947ec1c75':
Make search UI open up quicker to the user.
2009-07-02 15:23:32 -07:00
Android (Google) Code Review
a4b5675eed
Merge change 6140
...
* changes:
Add support for multitexture and fix allocation ref counting bug in RS. Add plaque to rollo and leave it disabled due to ugly appearance.
2009-07-02 15:11:04 -07:00
Android (Google) Code Review
df0a957dd7
am 74dc3e4a: Merge change 5616 into donut
...
Merge commit '74dc3e4a1e4f9c4eed3a3619ffc8beff30b3ec0f'
* commit '74dc3e4a1e4f9c4eed3a3619ffc8beff30b3ec0f':
Revise VpnService to use new vpn.* properties.
2009-07-02 14:25:41 -07:00
Android (Google) Code Review
cff72d8f3d
am 50d87fbd: Merge change 5879 into donut
...
Merge commit '50d87fbd691a59759d5bbe12284d322f9fa967dd'
* commit '50d87fbd691a59759d5bbe12284d322f9fa967dd':
Represent new searchSettingsDescription attribute on searchables in
2009-07-02 14:25:33 -07:00
Android (Google) Code Review
4ed5c8958a
Merge change 6067
...
* changes:
recognize when plugin is eligable for user events and then notify the plugin.
2009-07-02 12:10:31 -07:00
Android (Google) Code Review
7749ef9aa3
am c56096fe: Merge change 5878 into donut
...
Merge commit 'c56096fe1fe3486102079f06ca5de3e2bef12e47'
* commit 'c56096fe1fe3486102079f06ca5de3e2bef12e47':
Add new attribute 'searchSettingsDescription' for use within an app's
2009-07-01 22:44:50 -07:00
Android (Google) Code Review
c175093823
am 65363830: Merge change 5854 into donut
...
Merge commit '65363830c1e5ca8c59b6e12b4b43a3f03688ca2e'
* commit '65363830c1e5ca8c59b6e12b4b43a3f03688ca2e':
Run backups at background priority
2009-07-01 22:44:37 -07:00
Android (Google) Code Review
fa0ccc88a9
am b0b815da: Merge change 5845 into donut
...
Merge commit 'b0b815da8c487bbfac6b2eadc91c619682720a71'
* commit 'b0b815da8c487bbfac6b2eadc91c619682720a71':
Always clear the TextView drag state whenever a touch begins.
2009-07-01 22:44:33 -07:00
Android (Google) Code Review
1dcc7190c6
am daa5a215: Merge change 5810 into donut
...
Merge commit 'daa5a21562cb4b1fda21400bc638be4d6b7f5825'
* commit 'daa5a21562cb4b1fda21400bc638be4d6b7f5825':
Fix bug 1930055 of NullPointerException.
2009-07-01 22:44:22 -07:00
Android (Google) Code Review
562f50350a
am 85d650c8: Merge change 5804 into donut
...
Merge commit '85d650c89998eb108faa2c02dcc32467e23f9555'
* commit '85d650c89998eb108faa2c02dcc32467e23f9555':
Ensure that we never trigger ArrayIndexOutOfBoundsException by checking that
2009-07-01 22:44:16 -07:00
Android (Google) Code Review
aca69df509
am f3ab3c34: Merge change 5833 into donut
...
Merge commit 'f3ab3c3437f18834ce63542062c2ed7a87a05fca'
* commit 'f3ab3c3437f18834ce63542062c2ed7a87a05fca':
Fix nit on length of flag constant.
2009-07-01 22:44:08 -07:00
Android (Google) Code Review
9b8762a329
am f9eca3d4: Merge change 5807 into donut
...
Merge commit 'f9eca3d43aed870774633a176aa691d3e530a12b'
* commit 'f9eca3d43aed870774633a176aa691d3e530a12b':
Fixing synth to file to use the speech queue.
2009-07-01 22:44:02 -07:00
Android (Google) Code Review
47a1a39ce9
am 6e1647a2: Merge change 5829 into donut
...
Merge commit '6e1647a212317f4ee8bcc23948b6621a59172954'
* commit '6e1647a212317f4ee8bcc23948b6621a59172954':
Fix issue #1673793 : Theme styles don't apply.
2009-07-01 22:43:58 -07:00
Android (Google) Code Review
49a09200fc
am d8de2ba4: Merge change 5750 into donut
...
Merge commit 'd8de2ba42679a10db2adc11995d6596a0045ab3a'
* commit 'd8de2ba42679a10db2adc11995d6596a0045ab3a':
Add a new checkin server flag for Vending Machine client server ping frequency for pending downloads.
2009-07-01 22:43:48 -07:00
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
Android (Google) Code Review
9fc5f84201
Merge change 5994 into donut
...
* changes:
Less logging in some places. More in others.
2009-07-01 18:04:40 -07:00
Joe Onorato
00dae0a084
Less logging in some places. More in others.
2009-07-01 21:04:03 -04: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
bdfffcc0c2
Merge change 5962 into donut
...
* changes:
SimRecords.getServiceProviderName() always returned null.
2009-07-01 14:12:10 -07:00
Android (Google) Code Review
f9aabc1c27
Merge change 5940 into donut
...
* changes:
Add CLDR data/formats for newly-translated locales.
2009-07-01 14:04:32 -07:00
Android (Google) Code Review
eee4987d2c
Merge change 5906 into donut
...
* changes:
resolve complex value in application context instead of system context.
2009-07-01 12:53:04 -07:00
Android (Google) Code Review
5499ddc312
Merge change 5950 into donut
...
* changes:
Fix memory leaks in system_server unlink DeathRecipients in a whole bunch of places to avoid memory leaks
2009-07-01 12:52:39 -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