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

1907 Commits

Author SHA1 Message Date
Gilles Debunne
a4a01b5d6b am 6f4f0106: am b621e203: Merge "Removed icon in Alert dialog header." into gingerbread 
Merge commit '6f4f01062bc78ae765c970e8796b8dbef432f8a4'

* commit '6f4f01062bc78ae765c970e8796b8dbef432f8a4':
  Removed icon in Alert dialog header.
 2010-10-05 15:17:17 -07:00
Dianne Hackborn
38014763a2 am 89230e3b: am 458fc5f5: Merge "Fix issue #3041660: Camera image flips upside down when rotating device" into gingerbread 
Merge commit '89230e3b7b9ec455373e3f60b62ff65589a9c57d'

* commit '89230e3b7b9ec455373e3f60b62ff65589a9c57d':
  Fix issue #3041660: Camera image flips upside down when rotating device
 2010-10-05 12:54:41 -07:00
Gilles Debunne
ff3c191d2a resolved conflicts for merge of 8390651c to master 
Change-Id: Ibaa6034dbf87473dfb7d8a324a5f91fc745b99aa
 2010-10-05 12:11:56 -07:00
Patrick Dubroy
3dd101133a resolved conflicts for merge of 242fa52b to master 
Change-Id: I6a6c134fe4fb05dbc15249661b441d88534acb1e
 2010-10-04 15:49:40 -07:00
Gilles Debunne
6f4f01062b am b621e203: Merge "Removed icon in Alert dialog header." into gingerbread 
Merge commit 'b621e2030d86356af6e8f37e9aed339a5f2ea52b' into gingerbread-plus-aosp

* commit 'b621e2030d86356af6e8f37e9aed339a5f2ea52b':
  Removed icon in Alert dialog header.
 2010-10-04 15:48:54 -07:00
Adam Powell
dcbf315e83 am 368733b2: Remove overscroll_edge.png from drawable/ 
Merge commit '368733b204805cfa716897b09153350a70dca3f3' into gingerbread-plus-aosp

* commit '368733b204805cfa716897b09153350a70dca3f3':
  Remove overscroll_edge.png from drawable/
 2010-10-04 15:48:50 -07:00
Gilles Debunne
b621e2030d Merge "Removed icon in Alert dialog header." into gingerbread 2010-10-04 15:34:43 -07:00
Adam Powell
368733b204 Remove overscroll_edge.png from drawable/ 
This crops up in apps targeting <= cupcake. This asset shouldn't be
there.

Change-Id: Ia8f613b1c2657111f8ff5e20d9571290add03ddb
 2010-10-04 15:28:25 -07:00
Gilles Debunne
6fee4406b0 am 9339fa7f: am be86b8a4: Updated quick contact assets. 
Merge commit '9339fa7fa13b8c8847dac4624598112d03555330'

* commit '9339fa7fa13b8c8847dac4624598112d03555330':
  Updated quick contact assets.
 2010-10-04 15:00:58 -07:00
Dianne Hackborn
89230e3b7b am 458fc5f5: Merge "Fix issue #3041660: Camera image flips upside down when rotating device" into gingerbread 
Merge commit '458fc5f52e25d7a8b4e482010711aed66f0b4999' into gingerbread-plus-aosp

* commit '458fc5f52e25d7a8b4e482010711aed66f0b4999':
  Fix issue #3041660: Camera image flips upside down when rotating device
 2010-10-04 14:55:09 -07:00
Dianne Hackborn
58520b24d4 resolved conflicts for merge of 10d5b096 to master 
Change-Id: Id5c6ba651f72b48f0d70ee2ca64a6c9adf5e74f7
 2010-10-04 14:54:59 -07:00
Dianne Hackborn
458fc5f52e Merge "Fix issue #3041660: Camera image flips upside down when rotating device" into gingerbread 2010-10-04 14:52:12 -07:00
Gilles Debunne
8390651c12 am 33a4c772: Merge "New green in assets for battery, download, upload" into gingerbread 
Merge commit '33a4c77218e4513268be8d5ce2af6f746976706b' into gingerbread-plus-aosp

* commit '33a4c77218e4513268be8d5ce2af6f746976706b':
  New green in assets for battery, download, upload
 2010-10-04 14:47:12 -07:00
Gilles Debunne
a819fc194e New green in assets for battery, download, upload 
Change-Id: Iea08cddee109273fd070a7c9dae7ccb9d22d0e05
 2010-10-04 14:41:56 -07:00
Adam Powell
a143e83e1e am 7de900f3: am d29e6861: Merge "Fix bug 3058324" into gingerbread 
Merge commit '7de900f3629e53e1a05b8d5854cf0164446346ae'

* commit '7de900f3629e53e1a05b8d5854cf0164446346ae':
  Fix bug 3058324
 2010-10-04 14:28:08 -07:00
Patrick Dubroy
242fa52bb6 am eb15ac40: Merge "Fix 2-pixel offset unlock jog tab" into gingerbread 
Merge commit 'eb15ac40ab2da2f599f2380bc7a8b00e7132a64c' into gingerbread-plus-aosp

* commit 'eb15ac40ab2da2f599f2380bc7a8b00e7132a64c':
  Fix 2-pixel offset unlock jog tab
 2010-10-04 14:25:42 -07:00
Patrick Dubroy
eb15ac40ab Merge "Fix 2-pixel offset unlock jog tab" into gingerbread 2010-10-04 14:20:39 -07:00
Patrick Dubroy
276e7498bb Fix 2-pixel offset unlock jog tab 2010-10-04 14:16:22 -07:00
Gilles Debunne
9339fa7fa1 am be86b8a4: Updated quick contact assets. 
Merge commit 'be86b8a4c94905e547f8ecdcd220bbe7bb249d2b' into gingerbread-plus-aosp

* commit 'be86b8a4c94905e547f8ecdcd220bbe7bb249d2b':
  Updated quick contact assets.
 2010-10-04 14:15:15 -07:00
Gilles Debunne
be86b8a4c9 Updated quick contact assets. 
Change-Id: I1ab617a1deeeacbc49acd09f883fbf2aeaa904a3
 2010-10-04 14:11:11 -07:00
Dianne Hackborn
10d5b0966d am 407f625a: Add new API to find out whether external storage is removable. 
Merge commit '407f625a9b8e356e765a5ec587c443af1f3aadb5' into gingerbread-plus-aosp

* commit '407f625a9b8e356e765a5ec587c443af1f3aadb5':
  Add new API to find out whether external storage is removable.
 2010-10-04 14:03:06 -07:00
Dianne Hackborn
e5439f228f Fix issue #3041660: Camera image flips upside down when rotating device 
Apps now must explicitly opt in to having their rotation changed while
forcing landscape mode.  Also add some new orientation constants for other
things apps may want to do.

Change-Id: If64d84b5ef54793ee717ebda9b4c76408efc9bfd
 2010-10-04 14:01:39 -07:00
Dianne Hackborn
407f625a9b Add new API to find out whether external storage is removable. 
This is implemented based on whether we are using the "nosdcard"
product.  Needed to tweak aapt to allow use of the product attribute
with other resource definition tags besides strings.

Change-Id: I49922d23b52a34183a8e2f4d2515adaf1fc9149a
 2010-10-04 13:58:56 -07:00
Adam Powell
7de900f362 am d29e6861: Merge "Fix bug 3058324" into gingerbread 
Merge commit 'd29e6861717a4e762050eb5a30169729e205d651' into gingerbread-plus-aosp

* commit 'd29e6861717a4e762050eb5a30169729e205d651':
  Fix bug 3058324
 2010-10-04 12:18:44 -07:00
Gilles Debunne
076c7fbeda Removed icon in Alert dialog header. 
Bug 3042419

I wanted to nuke this one for ages

Change-Id: I079bec9b31157d6b7887c4f22612e56ae9690e7c
 2010-10-04 12:00:02 -07:00
Adam Powell
c3808b5dc7 Fix bug 3058324 
PopupWindow now responds to the style attribute popupAnimationStyle
instead of windowAnimationStyle. The latter was being overridden with
undesired values. Animation.PopupWindow style added as a special
default sentinel value, which switches animation styles based on
whether the window is showing above or below an anchor.

Change-Id: Id7cc81f089b6053f2d3a495b1046002548ecf125
 2010-10-04 11:55:38 -07:00
Adam Cohen
1b065cd140 Added looping parameter to AdapterViewAnimator / StackView 
Change-Id: Iad36f7c0e657ffbae6dd17d0c9464ddf12de8b7b
 2010-10-01 17:18:43 -07:00
Adam Powell
bbf00cfbdd am 98f31087: Merge "DO NOT MERGE Fix bug 3026771, other design/asset fixes." into gingerbread 
Merge commit '98f310879790a98c4c24cd06677e08bf49f1cea0' into gingerbread-plus-aosp

* commit '98f310879790a98c4c24cd06677e08bf49f1cea0':
  DO NOT MERGE Fix bug 3026771, other design/asset fixes.
 2010-10-01 15:55:44 -07:00
Adam Powell
a57ae3f438 DO NOT MERGE Fix bug 3026771, other design/asset fixes. 
* Button text changed to bold by default.
* Change notification divider to lighter gray (new asset).
* Change "Clear" notification button to use system small button assets.

Change-Id: Id1f1bdcf8c034186ad9acbdbdd544546bd32bbd8
 2010-10-01 14:35:22 -07:00
Leon Scroggins III
e2dc5260d9 Create dummy assets for text selection actions. 
The new assets are just copies of old assets.  However, now
the code is set up properly, and when we do get final
assets no new code needs to be written, and both TextView
and the select action mode for the browser will be updated.

Change-Id: I9a1461bf447f6bbc2782d8f948d873cbeeccbcb0
 2010-10-01 13:50:59 -04:00
Roy West
19e09bd6ef Merge "Cherrypick unmerged dev admin string edits from Gingerbread." 2010-10-01 08:30:49 -07:00
Dianne Hackborn
dc71b9e4d6 resolved conflicts for merge of 6a3eddb4 to master 
Change-Id: I1ca1d100274d4a733ef2bf58b0d5d7217b4f858e
 2010-09-30 20:34:34 -07:00
Dianne Hackborn
6a3eddb469 am 0a69f597: Merge "Rub in a little \'ol log-b-gone." into gingerbread 
Merge commit '0a69f597604254bc37721b135ab612eaacdd0cbd' into gingerbread-plus-aosp

* commit '0a69f597604254bc37721b135ab612eaacdd0cbd':
  Rub in a little 'ol log-b-gone.
 2010-09-30 19:12:11 -07:00
Dianne Hackborn
0a69f59760 Merge "Rub in a little 'ol log-b-gone." into gingerbread 2010-09-30 19:03:38 -07:00
Dianne Hackborn
cef65eeb03 Rub in a little 'ol log-b-gone. 
Mmmmmm...  great fresh scent!

Change-Id: I050e70b31b5d4a9c6731f15a4b51a3620a33a78d
 2010-09-30 18:27:22 -07:00
Eric Fischer
cfba8c0337 am 194f5244: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit '194f524456ebecbe13180146160a9b177cfb6be1' into gingerbread-plus-aosp

* commit '194f524456ebecbe13180146160a9b177cfb6be1':
  Import revised translations.  DO NOT MERGE
 2010-09-30 15:54:26 -07:00
Eric Fischer
194f524456 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-09-30 15:44:54 -07:00
Roy West
4d86c9aa5f Cherrypick unmerged dev admin string edits from Gingerbread. 
Change-Id: Ib20e561ae0e9c2ab164d53afa28591e262afcfc8
 2010-09-30 15:14:06 -07:00
Eric Fischer
8b75965525 am 97708b19: am 5f0c8fe6: Merge "Split strings with SD card references into variations." into gingerbread 
Merge commit '97708b19c564294182558d757a871abc892d6975'

* commit '97708b19c564294182558d757a871abc892d6975':
  Split strings with SD card references into variations.
 2010-09-30 11:00:01 -07:00
Gilles Debunne
8064dd2265 am 71e24862: Merge "New assets for status bar data_edge and overscroll" into gingerbread 
Merge commit '71e2486209856d33d027389be2bd4924a03c4f86' into gingerbread-plus-aosp

* commit '71e2486209856d33d027389be2bd4924a03c4f86':
  New assets for status bar data_edge and overscroll
 2010-09-30 10:08:38 -07:00
Gilles Debunne
03b58063de New assets for status bar data_edge and overscroll 
Change-Id: I32b8e036fc54a912719df660db3063045d8d7c93
 2010-09-29 17:02:50 -07:00
Eric Fischer
2c3eba4c08 Import revised translations. DO NOT MERGE 
Change-Id: Iaa642982ed369b45f0923f919167ccb2e27b72c4
 2010-09-29 14:29:00 -07:00
Nick Pelly
4715bd91f5 resolved conflicts for merge of f4c3b7e9 to master 
Change-Id: Idcdc521144f3072058b2bb6cb383e42c852e64f4
 2010-09-29 12:20:51 -07:00
Eric Fischer
97708b19c5 am 5f0c8fe6: Merge "Split strings with SD card references into variations." into gingerbread 
Merge commit '5f0c8fe6516ab2327f93f1c038d8854dbcbe7ce0' into gingerbread-plus-aosp

* commit '5f0c8fe6516ab2327f93f1c038d8854dbcbe7ce0':
  Split strings with SD card references into variations.
 2010-09-29 12:17:28 -07:00
Eric Fischer
d77782ed63 Split strings with SD card references into variations. 
Change-Id: I39ead98a753f26c00c1e2ba6344338696263c49b
 2010-09-29 12:09:04 -07:00
Steve Block
9d59429eaa Merge "Update WebView useragent string for merge to WebKit r67908" 2010-09-29 10:42:30 -07:00
Roy West
b4a28f2426 am d146c233: Merge "Partial fix to bug 2992589: Edit dev admin strings." into gingerbread 
Merge commit 'd146c233c570af3ee31d2e6ac44082571026d619' into gingerbread-plus-aosp

* commit 'd146c233c570af3ee31d2e6ac44082571026d619':
  Partial fix to bug 2992589: Edit dev admin strings.
 2010-09-29 10:40:06 -07:00
Roy West
7d3d88eec0 Partial fix to bug 2992589: Edit dev admin strings. 
Change-Id: Ifa73e2961fa03b5ac707a73d6932e724931ddb2c
 2010-09-29 10:28:56 -07:00
Steve Block
f5c4e62af8 Update WebView useragent string for merge to WebKit r67908 
Change-Id: If09628fcc8c8e408d3e280f57c534cf87bcc997f
 2010-09-29 17:55:32 +01:00
Nick Pelly
f4c3b7e916 am 038cabe0: NFC integration 
Merge commit '038cabe0247ee46df62f9363f1a303bc5b9c1028' into gingerbread-plus-aosp

* commit '038cabe0247ee46df62f9363f1a303bc5b9c1028':
  NFC integration
 2010-09-28 22:40:18 -07:00