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

28304 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Ho
27023cc5fe am e03471e1: Merge "Updated popup_ 9 patches and removing text_select_handle (hdpi)" into gingerbread 
Merge commit 'e03471e12f1adcd818b5bfd9dcb894c75fe955c5' into gingerbread-plus-aosp

* commit 'e03471e12f1adcd818b5bfd9dcb894c75fe955c5':
  Updated popup_ 9 patches and removing text_select_handle (hdpi)
 2010-10-12 20:32:56 -07:00
Justin Ho
e03471e12f Merge "Updated popup_ 9 patches and removing text_select_handle (hdpi)" into gingerbread 2010-10-12 20:30:36 -07:00
Justin Ho
c42d196f96 am 33bae9b8: Updated lockscreen asset (Hiroshi), new menu background 
Merge commit '33bae9b826145677585a2171f4986d4c6433fd0d' into gingerbread-plus-aosp

* commit '33bae9b826145677585a2171f4986d4c6433fd0d':
  Updated lockscreen asset (Hiroshi), new menu background
 2010-10-12 20:24:37 -07:00
Justin Ho
33bae9b826 Updated lockscreen asset (Hiroshi), new menu background 
Change-Id: Ibe8c535bcdd35668c7aae87b6e8c1ef622f3e148
 2010-10-12 20:19:14 -07:00
Hung-ying Tyan
8a3621866d am f1b1eec9: Merge "SipService: mScreenOn is flipped to wrong value." into gingerbread 
Merge commit 'f1b1eec9de1ca27b660f6c00487de07a30eecf64' into gingerbread-plus-aosp

* commit 'f1b1eec9de1ca27b660f6c00487de07a30eecf64':
  SipService: mScreenOn is flipped to wrong value.
 2010-10-12 19:46:14 -07:00
Hung-ying Tyan
f1b1eec9de Merge "SipService: mScreenOn is flipped to wrong value." into gingerbread 2010-10-12 19:44:17 -07:00
Nick Pelly
9fae3eccce am ab39f1ef: Merge "Fix build." into gingerbread 
Merge commit 'ab39f1ef13a546e38b49bfc02dca2ec771c13831' into gingerbread-plus-aosp

* commit 'ab39f1ef13a546e38b49bfc02dca2ec771c13831':
  Fix build.
 2010-10-12 19:25:57 -07:00
Hung-ying Tyan
d6fc979edb SipService: mScreenOn is flipped to wrong value. 
http://b/issue?id=3077454

Change-Id: I23b6f70730074689b939e449c2c202ce8ffb586f
 2010-10-13 10:25:07 +08:00
Nick Pelly
ab39f1ef13 Merge "Fix build." into gingerbread 2010-10-12 19:23:13 -07:00
Nick Pelly
d197f59ec9 Fix build. 
I removed these by mistake, and incremental build failed to pick the failure.

Change-Id: I19496d62a1eb1dc738a3a0b88d22ca1d5dddba96
 2010-10-12 19:21:07 -07:00
Justin Ho
cdbd8ab789 Updated popup_ 9 patches and removing text_select_handle (hdpi) 
Change-Id: I101a4ad12e7e88621073f860e39dcb16730d7722
 2010-10-12 19:14:10 -07:00
Dianne Hackborn
4ce930da99 am 259c8499: Merge "Fix issue #3089800: adb shell am -W causes ActivityManager crash" into gingerbread 
Merge commit '259c849989ccd30b0bb4569d11f125ed2c0c1911' into gingerbread-plus-aosp

* commit '259c849989ccd30b0bb4569d11f125ed2c0c1911':
  Fix issue #3089800: adb shell am -W causes ActivityManager crash
 2010-10-12 19:08:49 -07:00
Dianne Hackborn
259c849989 Merge "Fix issue #3089800: adb shell am -W causes ActivityManager crash" into gingerbread 2010-10-12 19:06:37 -07:00
Jaikumar Ganesh
373a69614e am 64f42803: Merge "Bluez doesn\'t handle disconnect while connecting well. Defer the message." into gingerbread 
Merge commit '64f4280313c5b498a3238d174c4d14ca2187604b' into gingerbread-plus-aosp

* commit '64f4280313c5b498a3238d174c4d14ca2187604b':
  Bluez doesn't handle disconnect while connecting well.
 2010-10-12 19:06:13 -07:00
Jaikumar Ganesh
64f4280313 Merge "Bluez doesn't handle disconnect while connecting well. Defer the message." into gingerbread 2010-10-12 19:02:46 -07:00
Dianne Hackborn
ba0492d5ed Fix issue #3089800: adb shell am -W causes ActivityManager crash 
Change-Id: I5508afeb523d84e552117f94c8b70e2bae2c33fa
 2010-10-12 19:01:46 -07:00
Nick Pelly
6066da89a4 am 590b73bc: NFC API revision round 2. 
Merge commit '590b73bc5b8e5f7b59bff1d9264a52388a5162e6' into gingerbread-plus-aosp

* commit '590b73bc5b8e5f7b59bff1d9264a52388a5162e6':
  NFC API revision round 2.
 2010-10-12 19:00:54 -07:00
Nick Pelly
590b73bc5b NFC API revision round 2. 
- Add the second half of the new NFC API: NfcAdapter, Tag, NdefTag,
  RawTagConnection, NdefTagConnection.
- Add implementations for all of the new NFC API.

Change-Id: I8da9fd1d2971ed2c8b76f2a93f207fa9e305b0f6
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-10-12 18:37:26 -07:00
Justin Ho
dfd37a4748 am 45738f67: Merge "Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi)" into gingerbread 
Merge commit '45738f6700cff689eacda7c8192b76939ba20591' into gingerbread-plus-aosp

* commit '45738f6700cff689eacda7c8192b76939ba20591':
  Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi)
 2010-10-12 17:40:47 -07:00
Justin Ho
45738f6700 Merge "Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi)" into gingerbread 2010-10-12 17:38:44 -07:00
Hung-ying Tyan
06e559779e am 907f6f1d: Merge "Fix SipSessionGroup from throwing ConcurrentModificationException" into gingerbread 
Merge commit '907f6f1d7d13531015b545861b93e1607d253cfd' into gingerbread-plus-aosp

* commit '907f6f1d7d13531015b545861b93e1607d253cfd':
  Fix SipSessionGroup from throwing ConcurrentModificationException
 2010-10-12 17:37:38 -07:00
Hung-ying Tyan
907f6f1d7d Merge "Fix SipSessionGroup from throwing ConcurrentModificationException" into gingerbread 2010-10-12 17:33:27 -07:00
Justin Ho
a78c85482e Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi) 
Change-Id: Ic7089d0277582506b745cfa73d1a7bb311c600a7
 2010-10-12 17:29:06 -07:00
Adam Powell
2b87dbc3b8 am c417612a: Merge "Fix bug 3083631 - Links no longer get tapped during scale gestures" into gingerbread 
Merge commit 'c417612a1abb6281697a9738a1a19eb8814ae8a6' into gingerbread-plus-aosp

* commit 'c417612a1abb6281697a9738a1a19eb8814ae8a6':
  Fix bug 3083631 - Links no longer get tapped during scale gestures
 2010-10-12 17:11:51 -07:00
Adam Powell
c417612a1a Merge "Fix bug 3083631 - Links no longer get tapped during scale gestures" into gingerbread 2010-10-12 17:08:43 -07:00
Jaikumar Ganesh
adbda6f094 Bluez doesn't handle disconnect while connecting well. 
Defer the message.

Bug: 3076404
Change-Id: Id62e1008346f492a85e714240a832a061def1786
 2010-10-12 16:58:06 -07:00
Jaikumar Ganesh
79a5307ac2 am 1bc3a407: Merge "Fix auto connection priority handling." into gingerbread 
Merge commit '1bc3a407ceb380e35e894f405f544b5b87e980d4' into gingerbread-plus-aosp

* commit '1bc3a407ceb380e35e894f405f544b5b87e980d4':
  Fix auto connection priority handling.
 2010-10-12 16:50:45 -07:00
Jaikumar Ganesh
1bc3a407ce Merge "Fix auto connection priority handling." into gingerbread 2010-10-12 16:46:50 -07:00
Jaikumar Ganesh
bcf5cf47ed Fix auto connection priority handling. 
Bug: 3027023
1. user is connected to a headset. Headset is turned off.
2. User connects to another device. The priority of the first
   headset must be set to ON. We only have 1 device set at AUTO_CONNECT
   priority.

1. A remote headset sends an incoming connection. Don't set
   AUTO_CONNECT till its gets connected.
2. For outgoing connections, set it to AUTO_CONNECT in Connecting state
   since the user initated this connection.

Change-Id: Iaa211bf22b1fd99850875f7eda686c47142173ba
 2010-10-12 16:42:45 -07:00
Jeff Brown
7eb67fb440 am fa3d9557: Merge "Add text selection handles to preloaded drawables." into gingerbread 
Merge commit 'fa3d9557c8178e9c4b9471a76edcf4d48a5b3551' into gingerbread-plus-aosp

* commit 'fa3d9557c8178e9c4b9471a76edcf4d48a5b3551':
  Add text selection handles to preloaded drawables.
 2010-10-12 16:12:34 -07:00
Jeff Brown
fa3d9557c8 Merge "Add text selection handles to preloaded drawables." into gingerbread 2010-10-12 16:08:59 -07:00
Adam Powell
d7bd2eb032 Fix bug 3083631 - Links no longer get tapped during scale gestures 
Change-Id: I57bf740c5063f30d763fc720a3ad77edff20f867
 2010-10-12 15:56:31 -07:00
Andy Stadler
8a703c772e am 8e2be267: Add versionCode and versionName to dumpsys packages 
Merge commit '8e2be267f53bd1d2f1531f56732ead4138ac5c58' into gingerbread-plus-aosp

* commit '8e2be267f53bd1d2f1531f56732ead4138ac5c58':
  Add versionCode and versionName to dumpsys packages
 2010-10-12 15:25:34 -07:00
Jeff Brown
b0061549a2 Add text selection handles to preloaded drawables. 
Change-Id: Iad48388ada7a555681290998f4cb6f8390aa05d4
 2010-10-12 15:22:13 -07:00
Andy Stadler
8e2be267f5 Add versionCode and versionName to dumpsys packages 
bug: 3090491
Change-Id: If116baaeb83bd282c5c5534fde6248f19830a71c
 2010-10-12 15:05:06 -07:00
Adam Powell
4af1de39ab am fb6431c0: Merge "Fix bug 3064135 - do not allow text handles on TextViews in sub windows." into gingerbread 
Merge commit 'fb6431c0298747d240fcdc025575e5f46db95132' into gingerbread-plus-aosp

* commit 'fb6431c0298747d240fcdc025575e5f46db95132':
  Fix bug 3064135 - do not allow text handles on TextViews in sub windows.
 2010-10-12 15:03:29 -07:00
Adam Powell
fb6431c029 Merge "Fix bug 3064135 - do not allow text handles on TextViews in sub windows." into gingerbread 2010-10-12 15:00:30 -07:00
Irfan Sheriff
a9c2ef8464 am e22eb863: Merge "fix start driver for corner cases DO NOT MERGE" into gingerbread 
Merge commit 'e22eb863dc4419dcaf329e9e28e3dc1f71f82902' into gingerbread-plus-aosp

* commit 'e22eb863dc4419dcaf329e9e28e3dc1f71f82902':
  fix start driver for corner cases DO NOT MERGE
 2010-10-12 14:59:20 -07:00
Irfan Sheriff
e22eb863dc Merge "fix start driver for corner cases DO NOT MERGE" into gingerbread 2010-10-12 14:55:52 -07:00
Joe Onorato
9a12a3c8d4 am ba799098: Merge changes I76513387,I335fb671 into gingerbread 
Merge commit 'ba799098608c7be8ff1e18adfa7dc1f452205a7e' into gingerbread-plus-aosp

* commit 'ba799098608c7be8ff1e18adfa7dc1f452205a7e':
  Remove dead code, and make the animation a setting.
  turn off the electron beam
 2010-10-12 14:46:23 -07:00
Adam Powell
8c8293bc4d Fix bug 3064135 - do not allow text handles on TextViews in sub windows. 
Change-Id: I35db64d0a5c92c8ad184b36d243e45c91d4ac46e
 2010-10-12 14:45:55 -07:00
Joe Onorato
ba79909860 Merge changes I76513387,I335fb671 into gingerbread 
* changes:
  Remove dead code, and make the animation a setting.
  turn off the electron beam
 2010-10-12 14:43:24 -07:00
Wink Saville
090ac9f7dd am a3100314: Merge "Remove some PII." into gingerbread 
Merge commit 'a310031438877a7b70a6ac30eb2f2b33e06907e6' into gingerbread-plus-aosp

* commit 'a310031438877a7b70a6ac30eb2f2b33e06907e6':
  Remove some PII.
 2010-10-12 14:21:10 -07:00
Dirk Dougherty
d555e2643f am 354954a0: Merge "Doc change: cherrypick testing changes from master. Squashed commit of the following:" into gingerbread 
Merge commit '354954a01c533c6789536c141cf330ddf3976e8b' into gingerbread-plus-aosp

* commit '354954a01c533c6789536c141cf330ddf3976e8b':
  Doc change: cherrypick testing changes from master. Squashed commit of the following:
 2010-10-12 14:18:33 -07:00
Wink Saville
a310031438 Merge "Remove some PII." into gingerbread 2010-10-12 14:17:00 -07:00
Joe Onorato
b08a1af667 Remove dead code, and make the animation a setting. 
When we don't do the brightness fade, turn off the electron beam instead.

Change-Id: I76513387c4fb420a67e59e005f6e8c3bc72f7f08
 2010-10-12 14:16:11 -07:00
Mathias Agopian
aab758e879 turn off the electron beam 
Change-Id: I335fb6719f1d5a3f1c6f37a046fd1c2c4ed2bbc6
 2010-10-12 14:16:11 -07:00
Dirk Dougherty
354954a01c Merge "Doc change: cherrypick testing changes from master. Squashed commit of the following:" into gingerbread 2010-10-12 14:16:05 -07:00
Wink Saville
a42880749b Remove some PII. 
Change-Id: I4df27119b6bbd28bf950516fd6f44676a8e04f06
 2010-10-12 12:36:38 -07:00
John Wang
7a26ebdf0d am 844a6b3c: Turn off additional debug. 
Merge commit '844a6b3ccaff1ad1443ad985e4527b733ce97c0e' into gingerbread-plus-aosp

* commit '844a6b3ccaff1ad1443ad985e4527b733ce97c0e':
  Turn off additional debug.
 2010-10-12 11:55:31 -07:00