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

31782 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
3dfe120e90 fix [3018216] UI shrinks / stretches while using apps with IME 
Change-Id: Ie4c5d8a434b4489355ed8c52af96eb931b4d7167
 2010-09-21 10:52:42 -07:00
Eric Laurent
96d5c17e78 am 8d1513e1: Merge "Made audio effect control panel intents public." into gingerbread 
Merge commit '8d1513e13c1e3d0142423570c0028e147bf0ea37' into gingerbread-plus-aosp

* commit '8d1513e13c1e3d0142423570c0028e147bf0ea37':
  Made audio effect control panel intents public.
 2010-09-21 10:52:27 -07:00
Jesse Wilson
0acddc582b am 2121ec9b: am 8217eac0: Merge "Fix double-checked locking bug in LocalSocket." into gingerbread 
Merge commit '2121ec9bca3507c7c3df6fb4fb1d553990adc05b'

* commit '2121ec9bca3507c7c3df6fb4fb1d553990adc05b':
  Fix double-checked locking bug in LocalSocket.
 2010-09-21 10:49:23 -07:00
Eric Laurent
8d1513e13c Merge "Made audio effect control panel intents public." into gingerbread 2010-09-21 10:47:17 -07:00
Eric Laurent
92cf2d6085 Made audio effect control panel intents public. 
Change-Id: If927606a24966605eb3e02788b2477937349d518
 2010-09-21 10:45:41 -07:00
James Dong
1d2f450680 am e436ef09: am e5206694: Merge "Another attempt for fixing AAC+/eAAC+ related issue" into gingerbread 
Merge commit 'e436ef09d205eee473d5a4a4d0a1721b8dfbe193'

* commit 'e436ef09d205eee473d5a4a4d0a1721b8dfbe193':
  Another attempt for fixing AAC+/eAAC+ related issue
 2010-09-21 10:45:13 -07:00
Jean-Baptiste Queru
2a55db742e am 925f94b7: am 7869f08c: Merge "MOTOYA Japanese fonts" 
Merge commit '925f94b788f5856025aa8218ee2e705c14f58281'

* commit '925f94b788f5856025aa8218ee2e705c14f58281':
  MOTOYA Japanese fonts
 2010-09-21 10:45:09 -07:00
Wu-cheng Li
d276720edb am 2ad1ebca: am d45cb72a: Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO. 
Merge commit '2ad1ebcaabb632c8fe714f0c3fd88bdfa14697bd'

* commit '2ad1ebcaabb632c8fe714f0c3fd88bdfa14697bd':
  Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.
 2010-09-21 10:44:38 -07:00
Mike Lockwood
92b328b67a am e65735af: am 92630c78: Merge "SystemUI: Use new USB notifications to detect USB disconnect." into gingerbread 
Merge commit 'e65735aff0f09a1c19b79c6d2b98ef39123da1d4'

* commit 'e65735aff0f09a1c19b79c6d2b98ef39123da1d4':
  SystemUI: Use new USB notifications to detect USB disconnect.
 2010-09-21 10:44:33 -07:00
Robert Greenwalt
19531dacfe am f532e958: am 6548f395: Merge "Inet status bug fix" into gingerbread 
Merge commit 'f532e9583ec0111b1c198e895ed1b2fd83c3d5cf'

* commit 'f532e9583ec0111b1c198e895ed1b2fd83c3d5cf':
  Inet status bug fix
 2010-09-21 10:44:26 -07:00
Dianne Hackborn
5e6ec0aeea am e665698f: am 6f33b65f: Merge "Fix issue #2999757: "Application Redirected" dialogue showing up erratically" into gingerbread 
Merge commit 'e665698ffe539bdb99122dcf83e19844ebea92b8'

* commit 'e665698ffe539bdb99122dcf83e19844ebea92b8':
  Fix issue #2999757: "Application Redirected" dialogue showing up erratically
 2010-09-21 10:44:13 -07:00
Chung-yih Wang
cef2590bda am 83af4fbb: am 4c571a62: Fix the build. 
Merge commit '83af4fbb0e5c28506a77fc508056c5022b9a71eb'

* commit '83af4fbb0e5c28506a77fc508056c5022b9a71eb':
  Fix the build.
 2010-09-21 10:43:47 -07:00
Dianne Hackborn
1bbef40e40 am 2d19a676: am 51aaab3d: Merge "Fix #2999258: ANR in Settings after every reboot" into gingerbread 
Merge commit '2d19a676860bf773c984315fe03d9568913f9314'

* commit '2d19a676860bf773c984315fe03d9568913f9314':
  Fix #2999258: ANR in Settings after every reboot
 2010-09-21 10:43:36 -07:00
Chung-yih Wang
6b15ecf278 am 232bc085: am 708e4251: Merge "Revert the ANSWERING state." into gingerbread 
Merge commit '232bc085fc901b6234d47c4ee4e3ee4fc88431e7'

* commit '232bc085fc901b6234d47c4ee4e3ee4fc88431e7':
  Revert the ANSWERING state.
 2010-09-21 10:43:24 -07:00
Jesse Wilson
2121ec9bca am 8217eac0: Merge "Fix double-checked locking bug in LocalSocket." into gingerbread 
Merge commit '8217eac0a0b6d394139eefa85d5f467240427e98' into gingerbread-plus-aosp

* commit '8217eac0a0b6d394139eefa85d5f467240427e98':
  Fix double-checked locking bug in LocalSocket.
 2010-09-21 10:33:53 -07:00
Jesse Wilson
8217eac0a0 Merge "Fix double-checked locking bug in LocalSocket." into gingerbread 2010-09-21 10:30:39 -07:00
Robert Greenwalt
fa213d82a9 Merge "resolved conflicts for merge of 749e6bc5 to master" 2010-09-21 10:30:13 -07:00
Stephen Hines
a86c1a622f Merge "Add support for Float64 (double) to RenderScript." 2010-09-21 10:29:48 -07:00
Robert Greenwalt
4524c62448 resolved conflicts for merge of 749e6bc5 to master 
Change-Id: Ica492307505d53e57863d4363b5f75abd798bcd8
 2010-09-21 10:27:59 -07:00
Doug Zongker
4baf641e7d recovery just takes a filename as an argument now (do not merge) 
Change-Id: I900cb3e7392c38b40f8c08ae5282cd5c05a4a009
 2010-09-21 10:27:54 -07:00
Jesse Wilson
c59a662382 Fix double-checked locking bug in LocalSocket. 
This code uses a try/finally to maintain the old behavior of setting
implCreated even if creation fails.

Change-Id: Ieac05568477db4908cd4087714cf00a9addd1d20
 2010-09-21 10:26:57 -07:00
James Dong
e436ef09d2 am e5206694: Merge "Another attempt for fixing AAC+/eAAC+ related issue" into gingerbread 
Merge commit 'e5206694174d2140e662832425665ec3890fcc73' into gingerbread-plus-aosp

* commit 'e5206694174d2140e662832425665ec3890fcc73':
  Another attempt for fixing AAC+/eAAC+ related issue
 2010-09-21 10:24:10 -07:00
Jean-Baptiste Queru
925f94b788 am 7869f08c: Merge "MOTOYA Japanese fonts" 
Merge commit '7869f08c55d774b0006c2260e87747ff5e0746f2' into gingerbread-plus-aosp

* commit '7869f08c55d774b0006c2260e87747ff5e0746f2':
  MOTOYA Japanese fonts
 2010-09-21 10:21:37 -07:00
James Dong
e520669417 Merge "Another attempt for fixing AAC+/eAAC+ related issue" into gingerbread 2010-09-21 10:19:22 -07:00
Kenny Root
30c1102fec Add image creator helper script for OBBs 
Change-Id: Id3f2b158077e8d104582e0ac720c2428c3ba4d97
 2010-09-21 10:13:19 -07:00
Jean-Baptiste Queru
7869f08c55 Merge "MOTOYA Japanese fonts" 2010-09-21 10:09:12 -07:00
Adam Cohen
35ae9ca5bf Modifying PendingIntent APIs for collection widgets 
Change-Id: Ib8e3b46542389afe93e74358a9138b1935634e90
 2010-09-21 09:39:29 -07:00
Cary Clark
e37a365bef Merge "In clearView(), see if native exists before calling it." 2010-09-21 09:36:50 -07:00
Shimeng (Simon) Wang
01ef9eab3b Merge "Use dimension value instead of fixed constant in code." 2010-09-21 09:36:35 -07:00
Shimeng (Simon) Wang
bcfd23a56d Merge "Use max of content width and initial preferred width as the viewport." 2010-09-21 09:29:32 -07:00
Wink Saville
6e80997a9a Cleanup copyright dates add missing method. 
Change-Id: I2d8fe0b705e7c90efabb8b3427a539a4a1056874
 2010-09-21 09:16:38 -07:00
Wu-cheng Li
2ad1ebcaab am d45cb72a: Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO. 
Merge commit 'd45cb72ac0d7d57829ffc9223decb89a5fc42ce2' into gingerbread-plus-aosp

* commit 'd45cb72ac0d7d57829ffc9223decb89a5fc42ce2':
  Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.
 2010-09-21 08:57:15 -07:00
Mike Lockwood
e65735aff0 am 92630c78: Merge "SystemUI: Use new USB notifications to detect USB disconnect." into gingerbread 
Merge commit '92630c787d0ae34c7ae3cb29c2d261f1acaf18b9' into gingerbread-plus-aosp

* commit '92630c787d0ae34c7ae3cb29c2d261f1acaf18b9':
  SystemUI: Use new USB notifications to detect USB disconnect.
 2010-09-21 08:48:15 -07:00
Wu-cheng Li
d45cb72ac0 Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO. 
This constant is not public yet. Continuous autofocus should
behave differently in still camera and camcorder. In camcorder,
lens movement may be more smooth. And the triggers to start a
new focus search may be different. If there is a need,
FOCUS_MODE_CONTINUOUS_PHOTO can be added in the future.

Change-Id: I05df9e491aca37829be3df92a73b952f26c86a4a
 2010-09-21 08:46:32 -07:00
Mike Lockwood
92630c787d Merge "SystemUI: Use new USB notifications to detect USB disconnect." into gingerbread 2010-09-21 08:45:34 -07:00
Robert Greenwalt
f532e9583e am 6548f395: Merge "Inet status bug fix" into gingerbread 
Merge commit '6548f395a974d2a8dcefe29b3a498d1ca87d8aef' into gingerbread-plus-aosp

* commit '6548f395a974d2a8dcefe29b3a498d1ca87d8aef':
  Inet status bug fix
 2010-09-21 08:22:59 -07:00
Mike Lockwood
77bc30d232 SystemUI: Use new USB notifications to detect USB disconnect. 
This fixes a bug that prevented the USB mass storage activity from closing
when USB is disconnected.
The bug was actually due to using == for a string compare instead of equals(),
but using the new notifications is a better solution than using battery events
since it will work for devices that do not charge over USB.

BUG: 3018954

Change-Id: Ia447974726a52cd865e59df5af79e828b5134b6c
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-21 11:17:27 -04:00
Robert Greenwalt
6548f395a9 Merge "Inet status bug fix" into gingerbread 2010-09-21 08:06:15 -07:00
Cary Clark
a3bec150bf In clearView(), see if native exists before calling it. 
Change-Id: I069678ef8f4dbdb6b62109c53b352127f5eec7cf
http://b/2999966
 2010-09-21 10:10:29 -04:00
Robert Greenwalt
029be81302 Inet status bug fix 
Don't wipe out the connected status every time we get a cellular status change.
Don't filter out disconnect event for wifi - we need them.

bug:3009923
Change-Id: I68cadac5f44d6eb4e0fe711fda7c5d218abb45bd
 2010-09-21 05:38:36 -07:00
Dianne Hackborn
e665698ffe am 6f33b65f: Merge "Fix issue #2999757: "Application Redirected" dialogue showing up erratically" into gingerbread 
Merge commit '6f33b65f8033cf8644eb4ba727421b90bd4c0ae9' into gingerbread-plus-aosp

* commit '6f33b65f8033cf8644eb4ba727421b90bd4c0ae9':
  Fix issue #2999757: "Application Redirected" dialogue showing up erratically
 2010-09-21 00:27:06 -07:00
Dianne Hackborn
6f33b65f80 Merge "Fix issue #2999757: "Application Redirected" dialogue showing up erratically" into gingerbread 2010-09-21 00:24:23 -07:00
Chung-yih Wang
83af4fbb0e am 4c571a62: Fix the build. 
Merge commit '4c571a62b1a4fb71585179bce84246b55097b47e' into gingerbread-plus-aosp

* commit '4c571a62b1a4fb71585179bce84246b55097b47e':
  Fix the build.
 2010-09-20 22:48:09 -07:00
Chung-yih Wang
4c571a62b1 Fix the build. 
Change-Id: I6e3f683be22ab834ca1b83a1dbb0b3acd62645d2
 2010-09-21 13:38:17 +08:00
Dianne Hackborn
034093a4ae Fix issue #2999757: "Application Redirected" dialogue showing up erratically 
Give up on this for now.

Change-Id: Ic66a36d468f8bcb313d9bde2809124cdfd74adb3
 2010-09-20 22:24:38 -07:00
Dianne Hackborn
2d19a67686 am 51aaab3d: Merge "Fix #2999258: ANR in Settings after every reboot" into gingerbread 
Merge commit '51aaab3d6ba01263c3e1d81ca0567e0ad5cddb2d' into gingerbread-plus-aosp

* commit '51aaab3d6ba01263c3e1d81ca0567e0ad5cddb2d':
  Fix #2999258: ANR in Settings after every reboot
 2010-09-20 22:22:54 -07:00
Dianne Hackborn
51aaab3d6b Merge "Fix #2999258: ANR in Settings after every reboot" into gingerbread 2010-09-20 22:19:47 -07:00
Chung-yih Wang
232bc085fc am 708e4251: Merge "Revert the ANSWERING state." into gingerbread 
Merge commit '708e42512a8b14202cd872d96d1f071ccb4cf915' into gingerbread-plus-aosp

* commit '708e42512a8b14202cd872d96d1f071ccb4cf915':
  Revert the ANSWERING state.
 2010-09-20 22:06:49 -07:00
Chung-yih Wang
708e42512a Merge "Revert the ANSWERING state." into gingerbread 2010-09-20 22:04:57 -07:00
Robert Greenwalt
749e6bc5cc am 313af5a3: Merge "Add Inet Condition log to bugreports" into gingerbread 
Merge commit '313af5a3b5ba51eb75dea35eb568c841aa4beb6a' into gingerbread-plus-aosp

* commit '313af5a3b5ba51eb75dea35eb568c841aa4beb6a':
  Add Inet Condition log to bugreports
 2010-09-20 21:31:29 -07:00