Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,022 Commits 3 Branches 0 Tags
b50ebe3a15cc19d5729964db1978d50b94de71ca
Commit Graph

7814 Commits

Author SHA1 Message Date
Dianne Hackborn
897223a104 am d669d488: am 34d723d8: Merge change I32371166 into eclair 
Merge commit 'd669d48888fdefab4907f4de5b296fc366b59eaf' into eclair-mr2-plus-aosp

* commit 'd669d48888fdefab4907f4de5b296fc366b59eaf':
  Fix issue #2239203: Setting large background causes OOME and soft-reboot spiral
 2009-11-11 23:36:22 -08:00
Jaikumar Ganesh
48956ad3fa am 3c58d279: Merge change I738ed802 into eclair 
Merge commit '3c58d279abed1da56b0ece74ded5854c509a42a4' into eclair-mr2

* commit '3c58d279abed1da56b0ece74ded5854c509a42a4':
  Fix BMW and Audi auto pairing lists.
 2009-11-11 23:31:31 -08:00
Jaikumar Ganesh
a96e6f6b2d am 3c58d279: Merge change I738ed802 into eclair 
Merge commit '3c58d279abed1da56b0ece74ded5854c509a42a4' into eclair-plus-aosp

* commit '3c58d279abed1da56b0ece74ded5854c509a42a4':
  Fix BMW and Audi auto pairing lists.
 2009-11-11 23:31:14 -08:00
Android (Google) Code Review
3c58d279ab Merge change I738ed802 into eclair 
* changes:
  Fix BMW and Audi auto pairing lists.
 2009-11-11 23:27:03 -08:00
Dianne Hackborn
d669d48888 am 34d723d8: Merge change I32371166 into eclair 
Merge commit '34d723d8fa75e8f97401311e03b3839246143018' into eclair-mr2

* commit '34d723d8fa75e8f97401311e03b3839246143018':
  Fix issue #2239203: Setting large background causes OOME and soft-reboot spiral
 2009-11-11 23:13:25 -08:00
Dianne Hackborn
f91984a1e1 am 34d723d8: Merge change I32371166 into eclair 
Merge commit '34d723d8fa75e8f97401311e03b3839246143018' into eclair-plus-aosp

* commit '34d723d8fa75e8f97401311e03b3839246143018':
  Fix issue #2239203: Setting large background causes OOME and soft-reboot spiral
 2009-11-11 23:12:18 -08:00
Jaikumar Ganesh
738ed80262 Fix BMW and Audi auto pairing lists. 
Bug no:2256558
Dr No:Eastham
 2009-11-11 23:12:04 -08:00
Android (Google) Code Review
34d723d8fa Merge change I32371166 into eclair 
* changes:
  Fix issue #2239203: Setting large background causes OOME and soft-reboot spiral
 2009-11-11 23:10:06 -08:00
Jaikumar Ganesh
f37c95e9fc am 3f9ef8d0: am 4e552b60: am 013b0e53: Merge change I143ea844 into eclair 
Merge commit '3f9ef8d04457da725bed763bbaa4499e2825d7e8'

* commit '3f9ef8d04457da725bed763bbaa4499e2825d7e8':
  Add BMW and Audi to Auto Pairing black list.
 2009-11-11 22:59:34 -08:00
Jaikumar Ganesh
3f9ef8d044 am 4e552b60: am 013b0e53: Merge change I143ea844 into eclair 
Merge commit '4e552b606cc9fc3e6cac210b3894974709531ec1' into eclair-mr2-plus-aosp

* commit '4e552b606cc9fc3e6cac210b3894974709531ec1':
  Add BMW and Audi to Auto Pairing black list.
 2009-11-11 22:54:37 -08:00
Dianne Hackborn
c9dbbe28f7 Fix issue #2239203: Setting large background causes OOME and soft-reboot spiral 
Try really really hard not to crash, for any reason.

Change-Id: I32371166229825f13fc8d12d5cf3a6531cdb345e
 2009-11-11 22:50:37 -08:00
Jaikumar Ganesh
ebafd95f34 am 013b0e53: Merge change I143ea844 into eclair 
Merge commit '013b0e531a4318b3e78c9bd0e077d3632fce2280' into eclair-plus-aosp

* commit '013b0e531a4318b3e78c9bd0e077d3632fce2280':
  Add BMW and Audi to Auto Pairing black list.
 2009-11-11 22:49:48 -08:00
Jaikumar Ganesh
4e552b606c am 013b0e53: Merge change I143ea844 into eclair 
Merge commit '013b0e531a4318b3e78c9bd0e077d3632fce2280' into eclair-mr2

* commit '013b0e531a4318b3e78c9bd0e077d3632fce2280':
  Add BMW and Audi to Auto Pairing black list.
 2009-11-11 22:49:45 -08:00
Android (Google) Code Review
013b0e531a Merge change I143ea844 into eclair 
* changes:
  Add BMW and Audi to Auto Pairing black list.
 2009-11-11 22:46:49 -08:00
Jaikumar Ganesh
9b26f3fae4 Add BMW and Audi to Auto Pairing black list. 
Bug: 2256558
Dr No: Eastham
 2009-11-11 22:43:32 -08:00
Dianne Hackborn
1ee0d41b0b am d2aaeefc: am c5dc6872: am 360d710e: Merge change I580de484 into eclair 
Merge commit 'd2aaeefc31c37417e6074fefeabe3434ea2768d9'

* commit 'd2aaeefc31c37417e6074fefeabe3434ea2768d9':
  Fix issue #2256270: Package manager sends bad broadcasts when components change
 2009-11-11 20:31:05 -08:00
Dianne Hackborn
d2aaeefc31 am c5dc6872: am 360d710e: Merge change I580de484 into eclair 
Merge commit 'c5dc6872dac40f87b6b8261c3cd5260a52325aba' into eclair-mr2-plus-aosp

* commit 'c5dc6872dac40f87b6b8261c3cd5260a52325aba':
  Fix issue #2256270: Package manager sends bad broadcasts when components change
 2009-11-11 20:28:27 -08:00
Dianne Hackborn
6e6a89b0e4 am 360d710e: Merge change I580de484 into eclair 
Merge commit '360d710ebccc2a2b53bf6233e722d3287d585476' into eclair-plus-aosp

* commit '360d710ebccc2a2b53bf6233e722d3287d585476':
  Fix issue #2256270: Package manager sends bad broadcasts when components change
 2009-11-11 20:25:08 -08:00
Dianne Hackborn
c5dc6872da am 360d710e: Merge change I580de484 into eclair 
Merge commit '360d710ebccc2a2b53bf6233e722d3287d585476' into eclair-mr2

* commit '360d710ebccc2a2b53bf6233e722d3287d585476':
  Fix issue #2256270: Package manager sends bad broadcasts when components change
 2009-11-11 20:25:01 -08:00
Grace Kloba
a7a9eb20ee am 8b83a2ab: am 4888c7da: am dc30d28b: Merge change I3656f7a3 into eclair 
Merge commit '8b83a2abbb26dbc3bec33e0834b9d50ded391af8'

* commit '8b83a2abbb26dbc3bec33e0834b9d50ded391af8':
  Honor the mInitialScale set on WebView. This was
 2009-11-11 20:24:10 -08:00
Jim Miller
34ce2fb7c4 am 809b2594: am 207d00c1: am f2897fe4: Merge change Idc34a3f7 into eclair 
Merge commit '809b2594886fa64f23bd6e87f97f8b06e933fa9e'

* commit '809b2594886fa64f23bd6e87f97f8b06e933fa9e':
  Fix 2209086: add drawables for SlidingTab states in PhoneApp. Update string file for new SlidingTab sound states.
 2009-11-11 20:23:55 -08:00
Grace Kloba
8b83a2abbb am 4888c7da: am dc30d28b: Merge change I3656f7a3 into eclair 
Merge commit '4888c7da45b356bfcff5a6564150ca95a0a0afcf' into eclair-mr2-plus-aosp

* commit '4888c7da45b356bfcff5a6564150ca95a0a0afcf':
  Honor the mInitialScale set on WebView. This was
 2009-11-11 20:19:10 -08:00
Jim Miller
809b259488 am 207d00c1: am f2897fe4: Merge change Idc34a3f7 into eclair 
Merge commit '207d00c13c02d301ff4ec302b1ee8cd7c256a4a5' into eclair-mr2-plus-aosp

* commit '207d00c13c02d301ff4ec302b1ee8cd7c256a4a5':
  Fix 2209086: add drawables for SlidingTab states in PhoneApp. Update string file for new SlidingTab sound states.
 2009-11-11 20:18:58 -08:00
Android (Google) Code Review
360d710ebc Merge change I580de484 into eclair 
* changes:
  Fix issue #2256270: Package manager sends bad broadcasts when components change
 2009-11-11 20:18:44 -08:00
Grace Kloba
4888c7da45 am dc30d28b: Merge change I3656f7a3 into eclair 
Merge commit 'dc30d28bc8321171fbf4ed92a9486eb8dd382259' into eclair-mr2

* commit 'dc30d28bc8321171fbf4ed92a9486eb8dd382259':
  Honor the mInitialScale set on WebView. This was
 2009-11-11 20:15:02 -08:00
Jim Miller
207d00c13c am f2897fe4: Merge change Idc34a3f7 into eclair 
Merge commit 'f2897fe42e22966127dbee8025d6bdc1d1697d81' into eclair-mr2

* commit 'f2897fe42e22966127dbee8025d6bdc1d1697d81':
  Fix 2209086: add drawables for SlidingTab states in PhoneApp. Update string file for new SlidingTab sound states.
 2009-11-11 20:14:46 -08:00
Grace Kloba
1ab302f955 am dc30d28b: Merge change I3656f7a3 into eclair 
Merge commit 'dc30d28bc8321171fbf4ed92a9486eb8dd382259' into eclair-plus-aosp

* commit 'dc30d28bc8321171fbf4ed92a9486eb8dd382259':
  Honor the mInitialScale set on WebView. This was
 2009-11-11 20:14:01 -08:00
Dianne Hackborn
86a72dacbe Fix issue #2256270: Package manager sends bad broadcasts when components change 
Also reworks this intent protocol a little bit to be much more efficient, only
requiring one broadcast per package.

Change-Id: I580de4843ebd3c7f2e6df7295a2f80d2937cef7c
 2009-11-11 20:13:53 -08:00
Jim Miller
5667adeb57 am f2897fe4: Merge change Idc34a3f7 into eclair 
Merge commit 'f2897fe42e22966127dbee8025d6bdc1d1697d81' into eclair-plus-aosp

* commit 'f2897fe42e22966127dbee8025d6bdc1d1697d81':
  Fix 2209086: add drawables for SlidingTab states in PhoneApp. Update string file for new SlidingTab sound states.
 2009-11-11 20:13:49 -08:00
Android (Google) Code Review
dc30d28bc8 Merge change I3656f7a3 into eclair 
* changes:
  Honor the mInitialScale set on WebView. This was lost when we fixed restoring the scale for a new page.
 2009-11-11 20:11:25 -08:00
Grace Kloba
16efce7242 Honor the mInitialScale set on WebView. This was 
lost when we fixed restoring the scale for a new
page.

Fix http://b/issue?id=2251716
 2009-11-11 20:13:32 -08:00
Android (Google) Code Review
f2897fe42e Merge change Idc34a3f7 into eclair 
* changes:
  Fix 2209086: add drawables for SlidingTab states in PhoneApp. Update string file for new SlidingTab sound states. Tweak "animation" to be 250ms based on conversation with ui guys. Some minor performance tweaks to SlidingTab.
 2009-11-11 20:11:13 -08:00
Dianne Hackborn
5a1a55e54a am 7bd2179f: am 823edb76: am 532d5603: Merge change I80022375 into eclair 
Merge commit '7bd2179f22c63cba9b444b4089242af327501f85'

* commit '7bd2179f22c63cba9b444b4089242af327501f85':
  Fix issue #2256032: Change CONFIGURATION_CHANGED and add a locale changed broadcast
 2009-11-11 19:24:12 -08:00
Romain Guy
540f4c4459 am bfbd2bcd: am fb745d27: am 001e5242: Merge change Icccbd889 into eclair 
Merge commit 'bfbd2bcd0f15f9b709275a85b444c8fd7ea6192d'

* commit 'bfbd2bcd0f15f9b709275a85b444c8fd7ea6192d':
  Fix broken handling of the BACK key in PopupWindow. Needed by Launcher2.
 2009-11-11 19:23:58 -08:00
Dmitri Plotnikov
4ae22c74af am f949c585: am b1c62ebf: am ca203475: Merge change Ifcf20541 into eclair 
Merge commit 'f949c5856b9b26f69809a29e81d060f29c02ab4e'

* commit 'f949c5856b9b26f69809a29e81d060f29c02ab4e':
  New Javadoc for ContactsContract.
 2009-11-11 19:23:46 -08:00
Dianne Hackborn
78bceeb925 am 8c3fc080: am 5bb200fd: am 2ade6421: Merge change I775e1ec0 into eclair 
Merge commit '8c3fc0801bb32a99dd5ab97c93bb615999b2c977'

* commit '8c3fc0801bb32a99dd5ab97c93bb615999b2c977':
  Debugging for issue #2250075: Desk dock clock app sometimes doesn't
 2009-11-11 19:23:32 -08:00
Dianne Hackborn
7bd2179f22 am 823edb76: am 532d5603: Merge change I80022375 into eclair 
Merge commit '823edb76661d57c1af7dbf4eb56eb0e3cb78e229' into eclair-mr2-plus-aosp

* commit '823edb76661d57c1af7dbf4eb56eb0e3cb78e229':
  Fix issue #2256032: Change CONFIGURATION_CHANGED and add a locale changed broadcast
 2009-11-11 19:18:48 -08:00
Romain Guy
bfbd2bcd0f am fb745d27: am 001e5242: Merge change Icccbd889 into eclair 
Merge commit 'fb745d27901a77d3215f32adf426e5f864a1aa01' into eclair-mr2-plus-aosp

* commit 'fb745d27901a77d3215f32adf426e5f864a1aa01':
  Fix broken handling of the BACK key in PopupWindow. Needed by Launcher2.
 2009-11-11 19:18:37 -08:00
Dmitri Plotnikov
f949c5856b am b1c62ebf: am ca203475: Merge change Ifcf20541 into eclair 
Merge commit 'b1c62ebf92fe20d006023bfa6fbf2cc731c69e4e' into eclair-mr2-plus-aosp

* commit 'b1c62ebf92fe20d006023bfa6fbf2cc731c69e4e':
  New Javadoc for ContactsContract.
 2009-11-11 19:18:24 -08:00
Dianne Hackborn
8c3fc0801b am 5bb200fd: am 2ade6421: Merge change I775e1ec0 into eclair 
Merge commit '5bb200fde2306d9da1972a81c0238c26ca6f475b' into eclair-mr2-plus-aosp

* commit '5bb200fde2306d9da1972a81c0238c26ca6f475b':
  Debugging for issue #2250075: Desk dock clock app sometimes doesn't
 2009-11-11 19:18:11 -08:00
Dianne Hackborn
823edb7666 am 532d5603: Merge change I80022375 into eclair 
Merge commit '532d56034532809da7691059742371c1b4d0656c' into eclair-mr2

* commit '532d56034532809da7691059742371c1b4d0656c':
  Fix issue #2256032: Change CONFIGURATION_CHANGED and add a locale changed broadcast
 2009-11-11 19:13:29 -08:00
Dianne Hackborn
7a2d9782f9 am 532d5603: Merge change I80022375 into eclair 
Merge commit '532d56034532809da7691059742371c1b4d0656c' into eclair-plus-aosp

* commit '532d56034532809da7691059742371c1b4d0656c':
  Fix issue #2256032: Change CONFIGURATION_CHANGED and add a locale changed broadcast
 2009-11-11 19:13:15 -08:00
Android (Google) Code Review
532d560345 Merge change I80022375 into eclair 
* changes:
  Fix issue #2256032: Change CONFIGURATION_CHANGED and add a locale changed broadcast
 2009-11-11 19:09:56 -08:00
Romain Guy
fb745d2790 am 001e5242: Merge change Icccbd889 into eclair 
Merge commit '001e5242c8a801664ea454a2ed6d4fddb600157a' into eclair-mr2

* commit '001e5242c8a801664ea454a2ed6d4fddb600157a':
  Fix broken handling of the BACK key in PopupWindow. Needed by Launcher2.
 2009-11-11 18:55:52 -08:00
Romain Guy
242cdcc6cc am 001e5242: Merge change Icccbd889 into eclair 
Merge commit '001e5242c8a801664ea454a2ed6d4fddb600157a' into eclair-plus-aosp

* commit '001e5242c8a801664ea454a2ed6d4fddb600157a':
  Fix broken handling of the BACK key in PopupWindow. Needed by Launcher2.
 2009-11-11 18:55:45 -08:00
Dmitri Plotnikov
b1c62ebf92 am ca203475: Merge change Ifcf20541 into eclair 
Merge commit 'ca20347543797a67b48a369f9b901cecabd231e3' into eclair-mr2

* commit 'ca20347543797a67b48a369f9b901cecabd231e3':
  New Javadoc for ContactsContract.
 2009-11-11 18:53:42 -08:00
Dmitri Plotnikov
d9d9cd509e am ca203475: Merge change Ifcf20541 into eclair 
Merge commit 'ca20347543797a67b48a369f9b901cecabd231e3' into eclair-plus-aosp

* commit 'ca20347543797a67b48a369f9b901cecabd231e3':
  New Javadoc for ContactsContract.
 2009-11-11 18:53:41 -08:00
Dianne Hackborn
5bb200fde2 am 2ade6421: Merge change I775e1ec0 into eclair 
Merge commit '2ade6421f2d6dd615b559c951deace7143958b90' into eclair-mr2

* commit '2ade6421f2d6dd615b559c951deace7143958b90':
  Debugging for issue #2250075: Desk dock clock app sometimes doesn't
 2009-11-11 18:53:29 -08:00
Dianne Hackborn
af194fe6af am 2ade6421: Merge change I775e1ec0 into eclair 
Merge commit '2ade6421f2d6dd615b559c951deace7143958b90' into eclair-plus-aosp

* commit '2ade6421f2d6dd615b559c951deace7143958b90':
  Debugging for issue #2250075: Desk dock clock app sometimes doesn't
 2009-11-11 18:53:29 -08:00
Android (Google) Code Review
001e5242c8 Merge change Icccbd889 into eclair 
* changes:
  Fix broken handling of the BACK key in PopupWindow. Needed by Launcher2.
 2009-11-11 18:52:07 -08:00