Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,724 Commits 3 Branches 0 Tags
8f097c5a3857b217132cd0470d979c1ea514b282
Commit Graph

1878 Commits

Author SHA1 Message Date
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
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
Adam Powell
975c235b94 No action bars for default holo dialog theme 
Change-Id: If02cbc5312d161f38df998c2ef136b00f41d62b0
 2010-09-28 11:54:50 -07:00
Adam Powell
385fe872ab Fix some text styling for Holo.Light 
Change-Id: Ia082c12b2b0cef044170ba92e9f837bd38516c8e
 2010-09-27 22:26:03 -07:00
Adam Powell
c63806d852 Holo themes and assets in progress 
Change-Id: Ic10480dc1c771d0ccd10f1d4014c945480fd6c0d
 2010-09-27 17:10:30 -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
Joe Onorato
6d3ed72bf2 am 761427f8: am 524ae7dd: Merge "We only need at most one tty icon." into gingerbread 
Merge commit '761427f85b7b7478801dcb4e0fb2f1b824cf1268'

* commit '761427f85b7b7478801dcb4e0fb2f1b824cf1268':
  We only need at most one tty icon.
 2010-09-27 14:38:37 -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
Romain Guy
1f0d3963d6 Merge "Adding display lists to the GL renderer (checkpoint.)" 2010-09-26 18:42:04 -07:00
Romain Guy
4aa90573bb Adding display lists to the GL renderer (checkpoint.) 
Change-Id: Iaa49757600a53b39369dbb23f8c3feab282518e6
 2010-09-26 18:40:37 -07:00
Amith Yamasani
68c3099922 Merge "Make the headers pane disappear in no-headers mode, not just the ListView." 2010-09-26 13:51:59 -07:00
Amith Yamasani
05fbc31ed9 Make the headers pane disappear in no-headers mode, not just the ListView. 2010-09-26 13:29:01 -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
a0b49cfc0c am 888bcdbe: am 3ae249dc: Merge "Add new Alarm provider class for setting an alarm." into gingerbread 
Merge commit '888bcdbeca34819c07d7dc06dc03d91207aea0c0'

* commit '888bcdbeca34819c07d7dc06dc03d91207aea0c0':
  Add new Alarm provider class for setting an alarm.
 2010-09-24 15:22:49 -07:00
Eric Fischer
322ca29137 Import revised translations. 
Change-Id: I41682cf0772a535f9925e134a3e87c3a00a214d1
 2010-09-24 12:24:01 -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