Commit Graph

25176 Commits

Author SHA1 Message Date
Mike Lockwood
7b787b329f Merge "MediaScanner: Fix path mismatch in code that check for missing files in postScan()" 2010-12-02 07:38:37 -08:00
Mike Lockwood
2b432577db Merge "MTP: Add support for multiple properties in GetObjectPropList command" 2010-12-02 06:53:12 -08:00
Daniel Sandler
8c113bf332 Merge "Do not allow lights out mode for old apps." 2010-12-02 05:32:35 -08:00
Michael Jurka
326a48d0d6 Merge "Revert "Re-add performance optimization in View"" 2010-12-02 00:09:28 -08:00
Eric Fischer
55f0d7fdb3 Merge "Import revised translations." 2010-12-01 17:00:16 -08:00
Xavier Ducrohet
3f1e7e78ff Merge "LayoutLib: implement insert/move/removeChild." 2010-12-01 16:36:58 -08:00
Eric Laurent
1cff4690e2 am ed98a7c7: am 78d81851: Merge "Fix issue 2641884: Bluetooth volume is dependent on in call volume." into gingerbread
* commit 'ed98a7c776e0a7a20390b3d51f8f7ab7d292a7d0':
  Fix issue 2641884: Bluetooth volume is dependent on in call volume.
2010-12-01 16:30:42 -08:00
Brian Carlstrom
6532eb1215 Merge "Resurrect SamplingProfilerIntegration" 2010-12-01 16:23:58 -08:00
Eric Laurent
51e91ae24e am 78d81851: Merge "Fix issue 2641884: Bluetooth volume is dependent on in call volume." into gingerbread
* commit '78d81851a8ef6691541215afb19e5bc690a4c3c0':
  Fix issue 2641884: Bluetooth volume is dependent on in call volume.
2010-12-01 16:04:09 -08:00
Eric Laurent
8217671a50 Merge "Fix issue 2641884: Bluetooth volume is dependent on in call volume." into gingerbread 2010-12-01 15:59:31 -08:00
Freeman Ng
3b502bb782 Merge "change SHUTDOWN permission to signatureOrSystem so setup wizard can start ACTION_REQUEST_SHUTDOWN bug: 3201638" 2010-12-01 15:44:42 -08:00
Kenny Root
e850b231ef am 1de6ca69: am 938d0972: Merge "Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService" into gingerbread
* commit '1de6ca69cc541ccdd651071c8bd5629af4e09664':
  Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService
2010-12-01 14:23:19 -08:00
Kenny Root
5a1ed2a762 am 938d0972: Merge "Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService" into gingerbread
* commit '938d097263416ad416ee995e62dab559ea50bf0d':
  Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService
2010-12-01 14:20:49 -08:00
Kenny Root
8e41fd2aa5 Merge "Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService" into gingerbread 2010-12-01 14:18:23 -08:00
Scott Main
062c10ff4b am 5f9d8ecd: am 83df6ead: am a45d6937: docs: dashboard update
* commit '5f9d8ecd2040ab3958ba3251fa12f3505dc85c34':
  docs: dashboard update
2010-12-01 14:02:26 -08:00
Irfan Sheriff
7b645b2ddc am d50ce4d7: (-s ours) am f36bde82: DO NOT MERGE Dont let supplicant stay in DORMANT state
* commit 'd50ce4d7ac0e2ec49eda45396f0bbb5e07fa55da':
  DO NOT MERGE Dont let supplicant stay in DORMANT state
2010-12-01 14:02:19 -08:00
Scott Main
0da9cbe3f7 am 83df6ead: am a45d6937: docs: dashboard update
* commit '83df6ead8dfd2037e4681793d439fffa5afda9fc':
  docs: dashboard update
2010-12-01 13:59:08 -08:00
Irfan Sheriff
c4b9bf2454 am f36bde82: DO NOT MERGE Dont let supplicant stay in DORMANT state
* commit 'f36bde828c0e427c0dbbe543b2465114c9aff45c':
  DO NOT MERGE Dont let supplicant stay in DORMANT state
2010-12-01 13:59:04 -08:00
Jesse Wilson
f126702d7c Merge "Add a test to demonstrate parsing of trailing URI parameters." 2010-12-01 13:43:33 -08:00
Adam Powell
87d5d03992 Merge "Fix bug 3240444 - add OnMenuVisibilityListener for action bar." 2010-12-01 13:09:24 -08:00
Scott Main
1e0f732364 am a45d6937: docs: dashboard update
* commit 'a45d693757c14c2d97a81f1fd8faa3ba38b53021':
  docs: dashboard update
2010-12-01 12:59:42 -08:00
Louis Huemiller
0404814194 Remove const_cast to layer handle
Change-Id: Ica1e089cb56b5f9f46ab87abf735ffe7237fc926
2010-12-01 12:29:36 -08:00
Eric Laurent
1b8733d913 resolved conflicts for merge of 0d28be68 to master
Change-Id: Iec5f810c366d3e1c14a6f6294b0aea4ffb30ae3e
2010-12-01 12:11:10 -08:00
Eric Laurent
54a176320f am e23212bc: Merge "Fix issue 3142808." into gingerbread
* commit 'e23212bc89bfcb3afbf8fdb5504556ead890e1a8':
  Fix issue 3142808.
2010-12-01 11:28:54 -08:00
Daniel Sandler
061b61046d Merge "Slightly more legible background for notification panel." 2010-12-01 11:27:10 -08:00
Eric Laurent
4db2fd929a Merge "Fix issue 3142808." into gingerbread 2010-12-01 11:26:37 -08:00
Daniel Sandler
505cd0728e Merge "When peeking at a notification, the X will close the window." 2010-12-01 11:25:39 -08:00
John Wang
540eca1b9b am ae2a4419: am 4567847d: Add "canDial" check.
* commit 'ae2a44191188cde1dc4a1bbb0134d775f0dc4126':
  Add "canDial" check.
2010-12-01 11:20:56 -08:00
Irfan Sheriff
f79f276ab0 am 869fa653: (-s ours) resolved conflicts for merge of 52556689 to gingerbread-plus-aosp
* commit '869fa653e0880fc1f389eb51524bef5183bf713e':
  DO NOT MERGE Fix status fetch from supplicant
2010-12-01 11:20:52 -08:00
Guang Zhu
b914985cdd Merge "enabled hardware acceleration for DRT" 2010-12-01 11:19:28 -08:00
Chet Haase
786e4177b5 Merge "Add methods to AnimatorSet that take collections" 2010-12-01 11:15:39 -08:00
John Wang
cec24879b4 am 4567847d: Add "canDial" check.
* commit '4567847d461afac08a80518637a0e48eff3c5247':
  Add "canDial" check.
2010-12-01 11:10:42 -08:00
Dianne Hackborn
c9bc85bae3 Merge "Implement issue #3201795: Improve transition when keyboard comes up" 2010-12-01 11:02:04 -08:00
James Dong
265662bbf0 Merge "Add preferred preview size support in the camera framework" 2010-12-01 11:01:00 -08:00
Xavier Ducrohet
5f348ab1fe Merge "LayoutLib: get AWT image from new image factory." 2010-12-01 10:48:56 -08:00
Irfan Sheriff
2f28b822da resolved conflicts for merge of 52556689 to gingerbread-plus-aosp
Change-Id: I61ed41f03b635ee760dc4c9d01935ac9fac9703a
2010-12-01 10:40:05 -08:00
Irfan Sheriff
a29e6d9620 Merge "DO NOT MERGE Fix status fetch from supplicant" into gingerbread 2010-12-01 10:17:56 -08:00
Irfan Sheriff
eaa353bb7b am f38b709e: (-s ours) am af2d3c7c: Merge "DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver" into gingerbread
* commit 'f38b709e470849943befbe88a0daeb7324f5114b':
  DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver
2010-12-01 09:55:41 -08:00
Irfan Sheriff
d8567ca26c am af2d3c7c: Merge "DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver" into gingerbread
* commit 'af2d3c7ccebb009f31a92c1a87b0925a2891e1c4':
  DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver
2010-12-01 09:53:17 -08:00
Irfan Sheriff
d4d5dab12f Merge "DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver" into gingerbread 2010-12-01 09:51:27 -08:00
Jean-Baptiste Queru
6c48212132 Merge "Fix crash by "adb shell pm list permissions -f|-s"" 2010-12-01 09:47:14 -08:00
Brad Fitzpatrick
d4c5200442 am 7e5cd796: (-s ours) am 981a72a1: Merge "[don\'t auto-merge] Don\'t re-read SharedPreferences unnecessarily." into gingerbread
* commit '7e5cd7968356ea111988a372095e352d76476994':
  [don't auto-merge] Don't re-read SharedPreferences unnecessarily.
2010-12-01 09:22:04 -08:00
Hung-ying Tyan
44cb5f4600 am 6034f9b2: am 06e8cdc0: Fix race between ending and answering a SIP call.
* commit '6034f9b2664799cb4f983657a78023b49efff825':
  Fix race between ending and answering a SIP call.
2010-12-01 09:21:45 -08:00
Hung-ying Tyan
7b4fe96bf4 am ed34b244: am d7116ff1: Merge "Do not suppress error feedback during a SIP call." into gingerbread
* commit 'ed34b244f1665b604d2a291db504415b10a514d7':
  Do not suppress error feedback during a SIP call.
2010-12-01 09:21:36 -08:00
David Brown
5e96c09248 am 4c11eee7: am 04639ba0: Reduce the outrageous verbosity of CallerInfo.toString().
* commit '4c11eee7ec3dafe943af7f4222e29b550163e58c':
  Reduce the outrageous verbosity of CallerInfo.toString().
2010-12-01 09:21:22 -08:00
Mathias Agopian
8adc279159 am 3248b484: am b483d5cd: fix [3237242] sensormanager sensor active count gets out of sync
* commit '3248b484a246f18853c284d6705b1cb9c2e52d77':
  fix [3237242] sensormanager sensor active count gets out of sync
2010-12-01 09:21:09 -08:00
Mathias Agopian
98caa36a4c am be0ece6f: am 186b68b7: Merge "allow rotation-vector to have 4 components" into gingerbread
* commit 'be0ece6f855ee2ab52309b6633def90ddeab38ee':
  allow rotation-vector to have 4 components
2010-12-01 09:21:04 -08:00
David Brown
5108d57ff3 am b9c19be7: am 91abcb62: Merge "Fix bug 3121292: Contact photo not shown correctly for SIP calls" into gingerbread
* commit 'b9c19be7c198dcdac7a37ea4af901af5179933d9':
  Fix bug 3121292: Contact photo not shown correctly for SIP calls
2010-12-01 09:20:58 -08:00
Brad Fitzpatrick
994caa76a1 am 981a72a1: Merge "[don\'t auto-merge] Don\'t re-read SharedPreferences unnecessarily." into gingerbread
* commit '981a72a1506f7e6e42747b9aa0be2001795c6619':
  [don't auto-merge] Don't re-read SharedPreferences unnecessarily.
2010-12-01 08:50:00 -08:00
Brad Fitzpatrick
e5f05b8739 Merge "[don't auto-merge] Don't re-read SharedPreferences unnecessarily." into gingerbread 2010-12-01 08:46:52 -08:00