Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,903 Commits 3 Branches 0 Tags
409a57504fe6bb915d85f1091267206f7e0dfdcd
Commit Graph

2395 Commits

Author SHA1 Message Date
Gilles Debunne
5e3329b5fa am e86a6b2a: Merge "Removed unused and broken screen_progress" into gingerbread 
Merge commit 'e86a6b2a4dc0c01717366c35fd0d6acd778988d4' into gingerbread-plus-aosp

* commit 'e86a6b2a4dc0c01717366c35fd0d6acd778988d4':
  Removed unused and broken screen_progress
 2010-10-07 14:01:48 -07:00
John Wang
5df4b5a78b am 08fb5851: Merge "Add flag to skip restoring network seletion." into gingerbread 
Merge commit '08fb5851bbaf11ecac0cac0de321942bfbf6a630' into gingerbread-plus-aosp

* commit '08fb5851bbaf11ecac0cac0de321942bfbf6a630':
  Add flag to skip restoring network seletion.
 2010-10-07 14:00:53 -07:00
Gilles Debunne
4a962a06db Merge "Removing 'last' of red cross asset." into gingerbread 2010-10-07 13:53:16 -07:00
Gilles Debunne
94f183b1b4 Removing 'last' of red cross asset. 
Change-Id: Ie325195220f95074d8e12e64216d1b02e9b3e2af
 2010-10-07 12:07:43 -07:00
Gilles Debunne
3c88039187 Fixed popup assets (background) 
Change-Id: I8a651915119fec6a06a5f43315408b0d06c4b7d6
 2010-10-07 10:54:54 -07:00
Gilles Debunne
e86a6b2a4d Merge "Removed unused and broken screen_progress" into gingerbread 2010-10-07 10:52:11 -07:00
John Wang
35c4c211e0 Add flag to skip restoring network seletion. 
For bug 3045366.

Change-Id: I7ad9ff89b0a77df473b638ad917b363c42de5405
 2010-10-07 09:44:19 -07:00
Adam Powell
86b500289b am fbb3b476: Fix bug 3066313 - integrate new text anchor assets. 
Merge commit 'fbb3b4768e858f004fe9a87e83b066244c829d87' into gingerbread-plus-aosp

* commit 'fbb3b4768e858f004fe9a87e83b066244c829d87':
  Fix bug 3066313 - integrate new text anchor assets.
 2010-10-07 07:18:21 -07:00
Eric Fischer
7778173a32 am 70f1a3b8: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit '70f1a3b8a0fcf332e35f87be85ae3a9e37a85e9c' into gingerbread-plus-aosp

* commit '70f1a3b8a0fcf332e35f87be85ae3a9e37a85e9c':
  Import revised translations.  DO NOT MERGE
 2010-10-07 07:16:56 -07:00
Gilles Debunne
f960718c1c am 1ae32bfe: New assets for buttons and notification 
Merge commit '1ae32bfebf5102774cbf6424885f84e4630925c4' into gingerbread-plus-aosp

* commit '1ae32bfebf5102774cbf6424885f84e4630925c4':
  New assets for buttons and notification
 2010-10-07 07:15:05 -07:00
Kristian Monsen
b5c564fed2 Merge WebKit at r68651 : Update user agent string 
Change-Id: Ib48186532c9a6033f1fb107f1fc072cd4fe89820
 2010-10-07 11:17:12 +01:00
satok
5847b20c0c Merge "Add InputMethodEnabler for enabling input methods and subtypes" 2010-10-06 22:46:32 -07:00
satok
47a44916e2 Add InputMethodEnabler for enabling input methods and subtypes 
- Copyed functionarity from LanguageSettings.java

TODO: Save enabled InputMethodSubtypes

Change-Id: I7b4fb1a79cb8b3229f88773d261430e23ba7aae2
 2010-10-07 14:43:16 +09:00
Jeff Sharkey
7172bdac31 Assign parent TextAppearances to Holo.Light theme. 
Change-Id: I60e82ec78c4e766bf1fbd86a0d6cd6c972cbbf81
 2010-10-06 22:37:04 -07:00
Adam Powell
fbb3b4768e Fix bug 3066313 - integrate new text anchor assets. 
This adds the differentiated left/right anchors for hdpi and further
tweaks the behavior of text anchors.

Highlights:
* New assets are translucent - increased visibility for whatever is
  beneath.
* Start and end anchors may not cross one another.
* Minimum selection size is now 1.
* Touch targeting tweaked.

Change-Id: I601361323916ee19149562a23dc3242d908da45c
 2010-10-06 21:46:28 -07:00
Gilles Debunne
8b1764fdc8 Removed unused and broken screen_progress 
Change-Id: I3b9557d1d4bdc55d6468c276efc77bde440755af
 2010-10-06 19:09:52 -07:00
Eric Fischer
3d1841c788 Import revised translations. DO NOT MERGE 
Change-Id: Id9a7d2da704ed4d37efa8646815835fc6a7c5473
 2010-10-06 17:11:06 -07:00
Gilles Debunne
3139ab218a am e9e94676: am 52810607: Revert "Restored ic_dialog_menu_generic asset." 
Merge commit 'e9e9467688d46b9a1b2f5599bab1fe154b2eaf02'

* commit 'e9e9467688d46b9a1b2f5599bab1fe154b2eaf02':
  Revert "Restored ic_dialog_menu_generic asset."
 2010-10-06 16:07:42 -07:00
Gilles Debunne
efaa4f075d resolved conflicts for merge of 1153629c to master 
Change-Id: I2838fc7e5a428fd52c811087b6c5481cf95eef0e
 2010-10-06 14:38:27 -07:00
Gilles Debunne
1ae32bfebf New assets for buttons and notification 
Change-Id: I95ffa7600476f97e3be3c577ef55855abeaeac5e
 2010-10-06 14:32:29 -07:00
Gilles Debunne
0f935ebfff am b3e95d9f: am c37eac24: Restored ic_dialog_menu_generic asset. 
Merge commit 'b3e95d9fc4365d20a39aa3ef61da537dabf5b800'

* commit 'b3e95d9fc4365d20a39aa3ef61da537dabf5b800':
  Restored ic_dialog_menu_generic asset.
 2010-10-05 17:02:27 -07:00
Adam Powell
ee7e0efcc1 am 59c4cb9e: Merge "DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll" into gingerbread 
Merge commit '59c4cb9e8fee03f770aa0fa1a2f0ec84ffb945b8' into gingerbread-plus-aosp

* commit '59c4cb9e8fee03f770aa0fa1a2f0ec84ffb945b8':
  DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll
 2010-10-05 16:46:05 -07:00
Adam Powell
59c4cb9e8f Merge "DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll" into gingerbread 2010-10-05 16:39:24 -07:00
Adam Powell
65e8b47624 am 5a5fff71: Fix bug 3064143 - remove default bold on buttons 
Merge commit '5a5fff7101b45bc28f59e72ea4c3e57632ff9ceb' into gingerbread-plus-aosp

* commit '5a5fff7101b45bc28f59e72ea4c3e57632ff9ceb':
  Fix bug 3064143 - remove default bold on buttons
 2010-10-05 15:49:23 -07:00
Adam Powell
5a5fff7101 Fix bug 3064143 - remove default bold on buttons 
Change-Id: Id4d09d50270c575f5179328ab6fb788b45131638
 2010-10-05 15:32:48 -07:00
Adam Powell
737e8fe2c7 DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll 
Change-Id: If34c8ea4e15697420adad0bc404f3c278efd7c1b
 2010-10-05 15:22:07 -07:00
Chet Haase
2e292e9da4 Merge "Adding next/prev to fragment animations and to PreferenceActivity" 2010-10-05 15:21:34 -07:00
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
Chet Haase
9ff82bf2b3 Adding next/prev to fragment animations and to PreferenceActivity 
Adding a new concept of "next" and "previous" to fragment.s Previously, fragments would
either be placed onto or taken off of the stack, or would just replace the current
fragment. The new next/prev capability gives the ability to run a transition that is
specific to next/previous operations, such as navigating forward and backward in a list.
New next/prev animations may be associated with a fragment replace operation to get the
next/prev animations built into the system (next animates things up, prev animates them
down).

Change-Id: Ia9f3663bac009376420d845b396ac51b8e4d1647
 2010-10-05 15:13:24 -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
Adam Powell
815b1eb870 am 1c2911a6: Merge "Fix bug 3061769" into gingerbread 
Merge commit '1c2911a648bdf5b2d8978ce96756ae82b7d452bd' into gingerbread-plus-aosp

* commit '1c2911a648bdf5b2d8978ce96756ae82b7d452bd':
  Fix bug 3061769
 2010-10-04 19:59:35 -07:00
Adam Powell
1c2911a648 Merge "Fix bug 3061769" into gingerbread 2010-10-04 19:56:49 -07:00
Gilles Debunne
e9e9467688 am 52810607: Revert "Restored ic_dialog_menu_generic asset." 
Merge commit '528106070b6622e82fd22783007f6dbc29b96701' into gingerbread-plus-aosp

* commit '528106070b6622e82fd22783007f6dbc29b96701':
  Revert "Restored ic_dialog_menu_generic asset."
 2010-10-04 18:13:34 -07:00
Gilles Debunne
1153629cd6 am e91398d1: Revert for 68833 and 68483 which introduced new assets instead of just updating. 
Merge commit 'e91398d134256cf9c39677f9b1cd0279b17a6d88' into gingerbread-plus-aosp

* commit 'e91398d134256cf9c39677f9b1cd0279b17a6d88':
  Revert for 68833 and 68483 which introduced new assets instead of just updating.
 2010-10-04 17:53:55 -07:00
Gilles Debunne
528106070b Revert "Restored ic_dialog_menu_generic asset." 
This reverts commit c37eac2497.
 2010-10-04 17:53:01 -07:00
Adam Powell
82cf90173f Fix bug 3061769 
Change-Id: I58a7fd4f8b488fc025c911e11072dd53db5ad4d5
 2010-10-04 17:48:49 -07:00
Gilles Debunne
e91398d134 Revert for 68833 and 68483 which introduced new assets instead of just updating. 
Change-Id: Ib37c0a61c5a2b061e4e70268db6d02a9adde10c2
 2010-10-04 17:25:29 -07:00
Gilles Debunne
b3e95d9fc4 am c37eac24: Restored ic_dialog_menu_generic asset. 
Merge commit 'c37eac249719a8f930cb2b9d3c5bdee591018cc5' into gingerbread-plus-aosp

* commit 'c37eac249719a8f930cb2b9d3c5bdee591018cc5':
  Restored ic_dialog_menu_generic asset.
 2010-10-04 17:03:25 -07:00
Gilles Debunne
c37eac2497 Restored ic_dialog_menu_generic asset. 
Change-Id: I17904a5376b841de72b95b59d0c277c53549f6c7
 2010-10-04 16:59:24 -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