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

1569 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Nick Pelly
038cabe024 NFC integration 
Source: Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010)

Conflicts:

	core/java/android/app/ApplicationContext.java
	core/java/android/provider/Settings.java
	core/jni/Android.mk
	core/jni/AndroidRuntime.cpp
	core/res/AndroidManifest.xml
	include/utils/Asset.h

Change-Id: I62c92f4c79f5ee65126c97602f6bc1c15794e573
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-09-28 22:36:27 -07:00
Gilles Debunne
0d0dc6a70c am d9743af9: Merge "New assets. DO NOT MERGE>" into gingerbread 
Merge commit 'd9743af92ead39b9f648043d165c415dfe8f3668' into gingerbread-plus-aosp

* commit 'd9743af92ead39b9f648043d165c415dfe8f3668':
  New assets. DO NOT MERGE>
 2010-09-28 13:00:32 -07:00
Gilles Debunne
01d0efde2d New assets. DO NOT MERGE> 
lock screen, and various status bar icons.

Change-Id: I3b76ac45ba31f2b2141bff64bfcae26f6963863f
 2010-09-28 11:58:27 -07:00
Gilles Debunne
4e9243d55c am 8d7057df: Merge "Updated assets in status bar. DO NOT MERGE." into gingerbread 
Merge commit '8d7057df401af668335c38273bc62872e4dbf538' into gingerbread-plus-aosp

* commit '8d7057df401af668335c38273bc62872e4dbf538':
  Updated assets in status bar. DO NOT MERGE.
 2010-09-27 16:17:28 -07:00
Gilles Debunne
8d7057df40 Merge "Updated assets in status bar. DO NOT MERGE." into gingerbread 2010-09-27 16:07:47 -07:00
Gilles Debunne
c49b259a62 Updated assets in status bar. DO NOT MERGE. 
Unlock has a 1 pixel offset that has to be fixed by code.

dropdown untested on device.

Most of these should be removed from SystemUI (revert 68833).

Pass 4.

Change-Id: Ibbbe4cc404151ec28768af98509082d77b303abe
 2010-09-27 15:56:26 -07:00
Eric Fischer
7063eb1046 am dc36da51: Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread 
Merge commit 'dc36da514832484f61b432291c6f5dca9f2c30bd' into gingerbread-plus-aosp

* commit 'dc36da514832484f61b432291c6f5dca9f2c30bd':
  Trim unwanted whitespace from translations.  DO NOT MERGE
 2010-09-27 15:04:35 -07:00
Eric Fischer
dc36da5148 Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread 2010-09-27 15:01:33 -07:00
Eric Fischer
eb2746a152 Trim unwanted whitespace from translations. DO NOT MERGE 
Change-Id: I39809e844c12e283f2ed65b8fc5a6fbe14311071
 2010-09-27 14:41:54 -07:00
Gilles Debunne
63555e36c9 am 0ba5b647: Merge "Revert previous status bar assets. DO NOT MERGE." into gingerbread 
Merge commit '0ba5b647842ab71f4b1a3080ca113eb646371d91' into gingerbread-plus-aosp

* commit '0ba5b647842ab71f4b1a3080ca113eb646371d91':
  Revert previous status bar assets. DO NOT MERGE.
 2010-09-27 14:32:06 -07:00
Gilles Debunne
bdf2d75694 Revert previous status bar assets. DO NOT MERGE. 
Change-Id: I5906a15124f7efe9b19bba18d91d6ddc089601f2
 2010-09-27 13:55:09 -07:00
Joe Onorato
761427f85b am 524ae7dd: Merge "We only need at most one tty icon." into gingerbread 
Merge commit '524ae7dd149c6b10814282dc3e2e55a4f755ad29' into gingerbread-plus-aosp

* commit '524ae7dd149c6b10814282dc3e2e55a4f755ad29':
  We only need at most one tty icon.
 2010-09-27 11:56:29 -07:00
Joe Onorato
a78df9f2b6 We only need at most one tty icon. 
Change-Id: Id8e2c6ba9b15ebafcf12b484f175fdaf98c1fa8a
 2010-09-27 11:36:03 -07:00
Dianne Hackborn
c388844d50 am 234e42df: DO NOT MERGE. Fix issue #3000764: API REVIEW: android.R.* 
Merge commit '234e42df5fac958ed9f15aae6005dd72e4bdf08a' into gingerbread-plus-aosp

* commit '234e42df5fac958ed9f15aae6005dd72e4bdf08a':
  DO NOT MERGE.  Fix issue #3000764: API REVIEW: android.R.*
 2010-09-24 18:05:14 -07:00
Dianne Hackborn
234e42df5f DO NOT MERGE. Fix issue #3000764: API REVIEW: android.R.* 
Not going out in GB.

Change-Id: I9d4f5938ec7d2a54c0f72b8eb5a177ee66f12146
 2010-09-24 18:00:47 -07:00
Patrick Dubroy
a9cf44942b am 88aa072a: Merge "do not merge - Asset update (pass #3)" into gingerbread 
Merge commit '88aa072aab9f4b38e44749ad7d8f2fb6c3f8920f' into gingerbread-plus-aosp

* commit '88aa072aab9f4b38e44749ad7d8f2fb6c3f8920f':
  do not merge - Asset update (pass #3)
 2010-09-24 17:00:19 -07:00
Patrick Dubroy
88aa072aab Merge "do not merge - Asset update (pass #3)" into gingerbread 2010-09-24 16:57:46 -07:00
Patrick Dubroy
cc7239b008 do not merge - Asset update (pass #3) 
- Updated network status icons & unlock screen

Change-Id: I429ea4bb6090acde1949023e82897712d9fdc924
 2010-09-24 16:53:18 -07:00
Patrick Scott
888bcdbeca am 3ae249dc: Merge "Add new Alarm provider class for setting an alarm." into gingerbread 
Merge commit '3ae249dc6a23f40cfc189ce2e25f75de32e7889a' into gingerbread-plus-aosp

* commit '3ae249dc6a23f40cfc189ce2e25f75de32e7889a':
  Add new Alarm provider class for setting an alarm.
 2010-09-24 11:36:51 -07:00
Patrick Scott
3ae249dc6a Merge "Add new Alarm provider class for setting an alarm." into gingerbread 2010-09-24 11:34:10 -07:00
Eric Fischer
f2af2d924d am 4318ab05: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit '4318ab058629b701e225bb7ead9dd2b229c9354b' into gingerbread-plus-aosp

* commit '4318ab058629b701e225bb7ead9dd2b229c9354b':
  Import revised translations.  DO NOT MERGE
 2010-09-24 11:05:07 -07:00
Patrick Scott
a73c4b082c Add new Alarm provider class for setting an alarm. 
The new class provides static variables for creating an intent to broadcast to
applications implementing the alarm clock.  A new permission has been added and
applications are recommended to require this permission if accepting the set
alarm broadcast.

Change-Id: I7b1014acdc54371cbda19bcf9b5c395b647aa413
 2010-09-24 13:52:14 -04:00
Eric Fischer
0e5467f51f Import revised translations. DO NOT MERGE 
Change-Id: Iec41808d7f6514cffc67a91e1b243fa063f04089
 2010-09-24 10:21:31 -07:00
Adam Powell
37e3f49fb4 am e8189420: Merge "DO NOT MERGE Apply new styles to the status bar/notification shade" into gingerbread 
Merge commit 'e81894201979513de87269a21a1802da72d2b954' into gingerbread-plus-aosp

* commit 'e81894201979513de87269a21a1802da72d2b954':
  DO NOT MERGE Apply new styles to the status bar/notification shade
 2010-09-22 21:10:41 -07:00
Adam Powell
e241621e98 DO NOT MERGE Apply new styles to the status bar/notification shade 
Change-Id: I5e89891852ff96f113083ac87bcfd74732c43faa
 2010-09-22 21:06:37 -07:00
Adam Powell
770a681b2f am 9aed3002: Text selection anchors changed to use windows 
Merge commit '9aed300279db6953356aed5ef24a42291f5829cb' into gingerbread-plus-aosp

* commit '9aed300279db6953356aed5ef24a42291f5829cb':
  Text selection anchors changed to use windows
 2010-09-21 17:20:40 -07:00
Adam Powell
9aed300279 Text selection anchors changed to use windows 
Change-Id: I14f138039f5e3175a8c07f21985715b8447708e5
 2010-09-21 17:11:41 -07:00
Adam Powell
f38c7e7531 am 1e646b55: Merge "Add mdpi text select anchor asset" into gingerbread 
Merge commit '1e646b55a5fd8c4f88d22a53b4b922f16ab0bfc0' into gingerbread-plus-aosp

* commit '1e646b55a5fd8c4f88d22a53b4b922f16ab0bfc0':
  Add mdpi text select anchor asset
 2010-09-21 14:09:02 -07:00
Mindy Pereira
447c677e97 am 1139b326: Merge "DO NOT MERGE Tweaked EdgeGlow to better match user expectations." into gingerbread 
Merge commit '1139b326d2cf95e2917ed23d79f795d64379d188' into gingerbread-plus-aosp

* commit '1139b326d2cf95e2917ed23d79f795d64379d188':
  DO NOT MERGE Tweaked EdgeGlow to better match user expectations.
 2010-09-21 14:08:55 -07:00
Adam Powell
1e646b55a5 Merge "Add mdpi text select anchor asset" into gingerbread 2010-09-21 14:04:13 -07:00
Mindy Pereira
1139b326d2 Merge "DO NOT MERGE Tweaked EdgeGlow to better match user expectations." into gingerbread 2010-09-21 14:04:00 -07:00
Chet Haase
458c1383ea am e920477e: Merge "do not merge" into gingerbread 
Merge commit 'e920477e862b90778cdc8e2e221a20d8f3a86878' into gingerbread-plus-aosp

* commit 'e920477e862b90778cdc8e2e221a20d8f3a86878':
  do not merge
 2010-09-21 13:46:05 -07:00
Mindy Pereira
40d35794ca DO NOT MERGE Tweaked EdgeGlow to better match user expectations. 
Change-Id: I7864dd4d3e15a9dc11429d5d3268f9b078f3eaad
Constants updated to match user testing.
Recede no longer flashes out but degrades all the way to zero.
Growth of the absorb flash is now quadratic as this better
matches the "physics" of the user flicking the list.
Size of the pull and absorb graphics changed to give the user
a more dramatic indication of what has happened.
 2010-09-21 13:15:56 -07:00
Chet Haase
39d1ee558d do not merge 
updated assets: pull-my-thumb/unlock (partially complete), 3g status, expander_ic_min/max changes

Change-Id: I1cb4601ec7eb2da7689fa58cb56c294f786ea4e6
 2010-09-21 13:10:29 -07:00
Mindy Pereira
ee63215903 am d3301e9f: Add mdpi images for overscroll EdgeGlow. 
Merge commit 'd3301e9f6b1e5e3d92e3bfff62e174d8ad27c99c' into gingerbread-plus-aosp

* commit 'd3301e9f6b1e5e3d92e3bfff62e174d8ad27c99c':
  Add mdpi images for overscroll EdgeGlow.
 2010-09-20 15:49:51 -07:00