Commit Graph

1335 Commits

Author SHA1 Message Date
Robert Greenwalt
da0498c598 am 6cf3d4aa: am cc691f50: Merge "Updating some notificiation UI for Throttling" into froyo
Merge commit '6cf3d4aa7612c3e6d6bc0c9622200c4fa1237f75' into kraken

* commit '6cf3d4aa7612c3e6d6bc0c9622200c4fa1237f75':
  Updating some notificiation UI for Throttling
2010-04-08 16:25:54 -07:00
Robert Greenwalt
6cf3d4aa76 am cc691f50: Merge "Updating some notificiation UI for Throttling" into froyo
Merge commit 'cc691f5061f4f5e687bf847078ee2ba387bdacb7' into froyo-plus-aosp

* commit 'cc691f5061f4f5e687bf847078ee2ba387bdacb7':
  Updating some notificiation UI for Throttling
2010-04-08 16:18:31 -07:00
Robert Greenwalt
cc691f5061 Merge "Updating some notificiation UI for Throttling" into froyo 2010-04-08 16:09:31 -07:00
Robert Greenwalt
c87dc6dc90 Updating some notificiation UI for Throttling
String update and make one an ongoing notification.

bug:2576057
Change-Id: I7980f110c7eed8e8bf305490eddaa58e2949e3be
2010-04-08 16:00:26 -07:00
Jeff Brown
a07fd3c5a6 am a30b596d: am ec7c78fb: @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
Merge commit 'a30b596d6ac46d88fd92dd3e1806b5de9b62b10b' into kraken

* commit 'a30b596d6ac46d88fd92dd3e1806b5de9b62b10b':
  @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
2010-04-08 13:51:48 -07:00
Jeff Brown
a30b596d6a am ec7c78fb: @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
Merge commit 'ec7c78fbf526816cd361fd482bdf3792ecfd9a9f' into froyo-plus-aosp

* commit 'ec7c78fbf526816cd361fd482bdf3792ecfd9a9f':
  @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
2010-04-08 13:49:55 -07:00
Jeff Brown
ec7c78fbf5 @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
Bug: b/2553489
Change-Id: I681b3f9a243777b931298cc93c9d34c8d7eae0f2
2010-04-08 13:45:06 -07:00
Robert Greenwalt
6646cf7af9 am 6f72a313: am 2b4b5738: Merge "Add service to monitor/control the flow of data." into froyo
Merge commit '6f72a313a042fdf0a5345f83eda74c5970b7db05' into kraken

* commit '6f72a313a042fdf0a5345f83eda74c5970b7db05':
  Add service to monitor/control the flow of data.
2010-04-08 12:49:38 -07:00
Robert Greenwalt
6f72a313a0 am 2b4b5738: Merge "Add service to monitor/control the flow of data." into froyo
Merge commit '2b4b5738011f5ccb118ad15721fd757c85448966' into froyo-plus-aosp

* commit '2b4b5738011f5ccb118ad15721fd757c85448966':
  Add service to monitor/control the flow of data.
2010-04-08 12:45:51 -07:00
Robert Greenwalt
2b4b573801 Merge "Add service to monitor/control the flow of data." into froyo 2010-04-08 12:42:09 -07:00
Robert Greenwalt
9e696c29f0 Add service to monitor/control the flow of data.
bug:2576057
Change-Id: Ib343c7ee1d619c6978910d9ee597db195d5aa3b6
2010-04-08 12:34:45 -07:00
Dianne Hackborn
2be9a0e791 am 2c5c9bb8: am 2670105e: Merge "Fix issue #2580316: Contacts and Phone app not supporting landscape mode..." into froyo
Merge commit '2c5c9bb89b539a1a97d093a54669bf2242697410' into kraken

* commit '2c5c9bb89b539a1a97d093a54669bf2242697410':
  Fix issue #2580316: Contacts and Phone app not supporting landscape mode...
2010-04-08 11:41:38 -07:00
Dianne Hackborn
2c5c9bb89b am 2670105e: Merge "Fix issue #2580316: Contacts and Phone app not supporting landscape mode..." into froyo
Merge commit '2670105ee6929d3036a1a7134400730f214f0f7e' into froyo-plus-aosp

* commit '2670105ee6929d3036a1a7134400730f214f0f7e':
  Fix issue #2580316: Contacts and Phone app not supporting landscape mode...
2010-04-08 11:39:03 -07:00
Dianne Hackborn
2670105ee6 Merge "Fix issue #2580316: Contacts and Phone app not supporting landscape mode..." into froyo 2010-04-08 11:35:27 -07:00
The Android Open Source Project
892debc681 am 65369424: merge from open-source master
Merge commit '65369424cbfbf165b4324bdcb6f138435462a196' into kraken

* commit '65369424cbfbf165b4324bdcb6f138435462a196':
  Add keycodes PageUp and PageDown
2010-04-08 11:29:23 -07:00
The Android Open Source Project
65369424cb merge from open-source master
Change-Id: I975030d9572463bc69245bcffa25c47d7acb2b51
2010-04-08 11:27:55 -07:00
Dianne Hackborn
af4c302a0a Fix issue #2580316: Contacts and Phone app not supporting landscape mode...
...when launched from car home launcher

For Eclair we made Droid a special case of treating the accelerometer as
a hard orientation indicator for the car dock.  This should really be the
default behavior, so make it so.

Change-Id: I70efb92036f86b55a436df29230253a192239adc
2010-04-08 09:52:51 -07:00
Daniel Sandler
715896be3d am 6fec76a0: am 8d318958: Merge "Transparent alarm icons for lockscreen." into froyo
Merge commit '6fec76a081fd5976c3d7d0aa9616d5680ccb237f' into kraken

* commit '6fec76a081fd5976c3d7d0aa9616d5680ccb237f':
  Transparent alarm icons for lockscreen.
2010-04-08 06:33:26 -07:00
Daniel Sandler
8c66936a8d am 07023777: am 9f71025b: Merge "Add emergency call button to PUK\'d lockscreen." into froyo
Merge commit '070237771e89bbf027ed85302df7a91fae0fa5c2' into kraken

* commit '070237771e89bbf027ed85302df7a91fae0fa5c2':
  Add emergency call button to PUK'd lockscreen.
2010-04-08 06:33:23 -07:00
Daniel Sandler
8d318958a3 Merge "Transparent alarm icons for lockscreen." into froyo 2010-04-08 06:07:57 -07:00
Daniel Sandler
9f71025b37 Merge "Add emergency call button to PUK'd lockscreen." into froyo 2010-04-08 06:06:50 -07:00
Dianne Hackborn
d00fb429c1 am 03e352a2: am 8258fda1: Fix issue #2576268: There is no uiMode config change constant for the manifest
Merge commit '03e352a2850d74cee11d3f0734938efb22cac351' into kraken

* commit '03e352a2850d74cee11d3f0734938efb22cac351':
  Fix issue #2576268: There is no uiMode config change constant for the manifest
2010-04-07 11:58:17 -07:00
Dianne Hackborn
8258fda177 Fix issue #2576268: There is no uiMode config change constant for the manifest
Change-Id: Id0fa812048244ae408ea54c746266a88c6c214d9
2010-04-07 11:13:38 -07:00
Daniel Sandler
8397809cc2 Transparent alarm icons for lockscreen.
Bug: 2576281
Change-Id: Ifa4f77a6992a46e0b81118fd3bac97d2aea89e31
2010-04-07 09:01:49 -04:00
Daniel Sandler
789a25eb9b Add emergency call button to PUK'd lockscreen.
The user unlocks a PUK-locked SIM via the e-call dialer, so
we absolutely need the button there.

This is the layout portion; it requires change
I6872c3ad135bc34348adafa76e08a3878f1b506f from
frameworks/policies/base.

Bug: 2568732
Change-Id: I8aa0fc2223428ba15a57269ac5a624e74e91a5f3
2010-04-07 00:22:47 -04:00
Grace Kloba
cbc7fe0df6 am 8dbf5105: am 54fccf8a: Merge "Update the Webkit version." into froyo
Merge commit '8dbf5105739db2354057be445483a63ec96376f0' into kraken

* commit '8dbf5105739db2354057be445483a63ec96376f0':
  Update the Webkit version.
2010-04-06 12:43:19 -07:00
Grace Kloba
a3562c6853 Update the Webkit version.
Fix http://b/issue?id=2571957
2010-04-06 11:23:01 -07:00
Joe Onorato
e0da887e64 am 703cb724: am fa588fc3: Merge "Redo the look of the recent apps switcher" into froyo
Merge commit '703cb72442461a3cfb3ffd0d15968d7c40eaba65' into kraken

* commit '703cb72442461a3cfb3ffd0d15968d7c40eaba65':
  Redo the look of the recent apps switcher
2010-04-06 08:41:50 -07:00
Joe Onorato
fa588fc374 Merge "Redo the look of the recent apps switcher" into froyo 2010-04-06 08:32:07 -07:00
Joe Onorato
fd6c969c8c Redo the look of the recent apps switcher
Change-Id: I913c3f68f487e7ccf20a014c26ab85119e991484
2010-04-06 10:30:38 -05:00
Jim Miller
bc49b43b57 am bf81cb91: am a6cce790: Merge "Fix 2325549: Allow up to 4 lines of summary text in Settings" into froyo
Merge commit 'bf81cb91aa584d3b52d807aa4134a1a90569de31' into kraken

* commit 'bf81cb91aa584d3b52d807aa4134a1a90569de31':
  Fix 2325549: Allow up to 4 lines of summary text in Settings
2010-04-05 17:25:17 -07:00
Jim Miller
a6cce790b2 Merge "Fix 2325549: Allow up to 4 lines of summary text in Settings" into froyo 2010-04-05 17:16:00 -07:00
Jim Miller
fdceefd8a2 Fix 2325549: Allow up to 4 lines of summary text in Settings
This fixes a number of screens in Settings (see the bug for examples).
Though it seems like a scary change, it should be safe since
the added line doesn't affect layout unless it's used, in which
case the view is slightly taller.

Change-Id: I13d04efadee19b407febabfae7825aedf66e8744
2010-04-05 16:53:10 -07:00
Wei Huang
fb8cc4d302 am 6ba03118: am 0abdf03d: Merge "bug 2542580: fix bad icon." into froyo
Merge commit '6ba03118790f57ec0c0c9d6ed3198de11a08b6a9' into kraken

* commit '6ba03118790f57ec0c0c9d6ed3198de11a08b6a9':
  bug 2542580: fix bad icon.
2010-04-05 15:46:22 -07:00
Wei Huang
54e93ee7ea bug 2542580: fix bad icon.
- borrow hdpi asset instead (for now), until I get a new icon from UX.

Change-Id: I6425698b02a3bcb53448db05f9939d48a2078c26
2010-04-05 15:09:52 -07:00
Wei Huang
6becff379d am d97eb7bd: am badaa778: Merge "bug #2542580: fix stat_notify_chat icon for mdpi resource." into froyo
Merge commit 'd97eb7bdd03fb4cb2c69afcfeb6d6f5c086f7fbb' into kraken

* commit 'd97eb7bdd03fb4cb2c69afcfeb6d6f5c086f7fbb':
  bug #2542580: fix stat_notify_chat icon for mdpi resource.
2010-04-05 14:44:07 -07:00
Wei Huang
36d13c32a6 bug #2542580: fix stat_notify_chat icon for mdpi resource.
Change-Id: Id6a14f76077334ad2925aeecb04fd0f69209c91f
2010-04-05 14:18:55 -07:00
Chih-Wei Huang
4fedd80c1d Add keycodes PageUp and PageDown
This is useful for applications like web browser.

Change-Id: Ie9262d5b75de87ecd0971407a7c3ce9aa6e4998e
2010-04-02 14:39:20 -07:00
Jim Miller
64265cc59b am 15be35f6: am bf1259b8: Fix 2538826: Allow aspect of LockPatternView to be customized.
Merge commit '15be35f6c9a88f453ba3a6be8d93fed8537ad77e' into kraken

* commit '15be35f6c9a88f453ba3a6be8d93fed8537ad77e':
  Fix 2538826: Allow aspect of LockPatternView to be customized.
2010-04-01 19:41:00 -07:00
Jim Miller
bf1259b8a6 Fix 2538826: Allow aspect of LockPatternView to be customized.
This fixes a problem where the pattern unlock area shrank on
mdpi devices.

This change is required since some devices (mdpi) don't have
enough vertical room to show a square LockPatternView and shrink
the area to match the minimum of width and height. To fix the
problem and minimize changes to existing platforms, the parameter
is configurable and has a default in values/donottranslate that
emulates the old behavior.  New behavior for mdpi devices is
specified in values-port-mdpi/donottranslate, which is the
only place we currently see the problem.

Tested:
mdpi device in both orientations
hdpi device in both orientations
hdpi device in both orientations with keyboard open/closed

Change-Id: I3b9a5ef1d9b5e70f7b1823c9f48a3938f52cc7a4
2010-04-01 19:33:03 -07:00
Dirk Dougherty
7fb51bf546 am 865bd884: am 2d8234b7: Merge "doc change: cherry pick 75c66da209. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)" into froyo
Merge commit '865bd884e878bbc6d9f5832fda6971c21754b588' into kraken

* commit '865bd884e878bbc6d9f5832fda6971c21754b588':
  doc change: cherry pick 75c66da209. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)
2010-04-01 10:47:00 -07:00
Dirk Dougherty
3d5f648f8f doc change: cherry pick 75c66da209. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)
Change-Id: I1d2b80b8dc3f8b2e3c1befcbb7c4c522d78a2db8
2010-04-01 09:16:08 -07:00
Dianne Hackborn
d0b5b3cb61 am 2d8d4d7b: am 513ae361: Merge "Fix issue #2560791: Expose API to go in to car mode." into froyo
Merge commit '2d8d4d7b16b474ef58c86ae9ccd3dc70d7132c23' into kraken

* commit '2d8d4d7b16b474ef58c86ae9ccd3dc70d7132c23':
  Fix issue #2560791: Expose API to go in to car mode.
2010-03-31 23:23:16 -07:00
Dianne Hackborn
9c9c532d36 Fix issue #2560791: Expose API to go in to car mode.
Also fix bug where night mode was being used in desk dock.

Change-Id: I56c1cf3d6fe800a4f986d40cc4cb2e70b76ac261
2010-03-31 16:25:53 -07:00
Jeff Brown
767225d820 resolved conflicts for merge of d9ee01a9 to kraken
Change-Id: I645177513e6dfa4b3b02c0061b8026bde4acde8d
2010-03-30 23:49:17 -07:00
Jeff Brown
0733079111 Show SD unavailable icon for apps on SD when ejected.
This change include a minor refactoring of PackageItemInfo and related
classes to eliminate code duplication and to avoid redundant work
searching for an ApplicationInfo instance we already have.

Bug: b/2537578
Change-Id: Id0794c3f055ea58b943028f7a84abc7dec9d0aac
2010-03-30 22:20:42 -07:00
Kenny Root
5d8dfc172b am 664c7adb: am 7a17f0c0: Merge "Import revised translations" into froyo
Merge commit '664c7adb1847dd304f36239dc63b4986bf828dc1' into kraken

* commit '664c7adb1847dd304f36239dc63b4986bf828dc1':
  Import revised translations
2010-03-30 09:38:14 -07:00
Kenny Root
7a17f0c04e Merge "Import revised translations" into froyo 2010-03-30 09:23:16 -07:00
Kenny Root
42205f871b Import revised translations
Change-Id: I1580bddbcf945ed733725b486b2699582096d3a5
2010-03-30 09:15:10 -07:00
Adam Powell
ecf4406ce5 am 370fe2a9: am 9d32d24d: Remove overscrolling
Merge commit '370fe2a91e9e824c6339fc836377c4aa6d80fc06' into kraken

* commit '370fe2a91e9e824c6339fc836377c4aa6d80fc06':
  Remove overscrolling
2010-03-29 21:09:28 -07:00