Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,112 Commits 3 Branches 0 Tags
085cbcfca72183bdc2be4ccbe9233bb64c8bccc1
Commit Graph

61112 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
085cbcfca7 am e5493f31: Merge "Layoutlib: Typeface support for loading fonts manually." 
* commit 'e5493f31152ebb2e9c9818699ba6f853a9a59894':
  Layoutlib: Typeface support for loading fonts manually.
 2011-10-05 06:37:08 -07:00
Xavier Ducrohet
fea27fd150 am 0bb83a28: Merge "Layoutlib now parses system_fonts.xml instead of its own." 
* commit '0bb83a28395cddd22e1fa1e806def6498dedd709':
  Layoutlib now parses system_fonts.xml instead of its own.
 2011-10-05 06:37:07 -07:00
Danielle Millett
ff65fd09c6 am af1ef9ed: Merge "Adding a flag for if biometric weak has ever been used" 
* commit 'af1ef9ed034e68db9d6c25f8b174fabf60b779d9':
  Adding a flag for if biometric weak has ever been used
 2011-10-05 06:37:06 -07:00
Dianne Hackborn
eda74be89a am 59ba9856: Merge "Fix issue #5388352: font size change back to normal" 
* commit '59ba98565d82fe7542569d1dd0847b47f30655d6':
  Fix issue #5388352: font size change back to normal
 2011-10-05 06:37:00 -07:00
Fabrice Di Meglio
645b7fa5b6 am e921572b: Merge "Revert "Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)"" 
* commit 'e921572bda621b75a217bce115c2b605caf9b26a':
  Revert "Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)"
 2011-10-05 06:36:45 -07:00
Svetoslav Ganov
97e1af548e am 63f5e09c: Merge "Make prompt for headset while typing a password if accessibilbity is on less verbose." 
* commit '63f5e09c8cce112b0945190da7d4a108b92a6c52':
  Make prompt for headset while typing a password if accessibilbity is on less verbose.
 2011-10-05 06:36:43 -07:00
Scott Main
7bdae93f42 am df5d7c88: Merge "adding Android Beam sample" 
* commit 'df5d7c882c5893fce13e0d2b6b2a97b177cb2692':
  adding Android Beam sample
 2011-10-05 06:36:40 -07:00
Xavier Ducrohet
e5493f3115 Merge "Layoutlib: Typeface support for loading fonts manually." 2011-10-04 19:10:33 -07:00
Xavier Ducrohet
0bb83a2839 Merge "Layoutlib now parses system_fonts.xml instead of its own." 2011-10-04 19:10:13 -07:00
Danielle Millett
af1ef9ed03 Merge "Adding a flag for if biometric weak has ever been used" 2011-10-04 18:44:55 -07:00
Dianne Hackborn
59ba98565d Merge "Fix issue #5388352: font size change back to normal" 2011-10-04 18:35:19 -07:00
Xavier Ducrohet
1409409732 Layoutlib: Typeface support for loading fonts manually. 
If the font being loaded is a system font, then we can find the font
file and manually load it.

Change-Id: I95473b1f1b88df64316b77c41ed05d4d09ab61ed
 2011-10-04 18:24:30 -07:00
Xavier Ducrohet
178006a0e0 Layoutlib now parses system_fonts.xml instead of its own. 
Also parse fallback_fonts.
This lets layoutlib automatically use the same fonts as the base
platforms, for instance it now uses the new ICS fonts.

Change-Id: Id6e778dc0e3f2a9112601e0eaf8499a9713ec433
 2011-10-04 18:02:10 -07:00
Danielle Millett
7a07219a1f Adding a flag for if biometric weak has ever been used 
This flag will be used to show a tutorial screen first time it is used.
The flag is set to true once facelock has been set (via the savePassword or
savePattern when in fallback mode)

Change-Id: I43e3f876810fd32d3d5a5a285201e8054c4b3098
 2011-10-04 21:01:52 -04:00
Fabrice Di Meglio
e921572bda Merge "Revert "Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)"" 2011-10-04 17:24:37 -07:00
Fabrice Di Meglio
ad0b051b13 Revert "Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)" 
This reverts commit a130e5f59d
 2011-10-04 17:21:26 -07:00
Svetoslav Ganov
63f5e09c8c Merge "Make prompt for headset while typing a password if accessibilbity is on less verbose." 2011-10-04 17:14:57 -07:00
Scott Main
df5d7c882c Merge "adding Android Beam sample" 2011-10-04 17:09:38 -07:00
Robert Ly
d8afdb49ff adding Android Beam sample 
Change-Id: I30df24bc41fe61ebaab29f23a8df54f2c9599394
 2011-10-04 17:07:06 -07:00
Svetoslav Ganov
bd39ca7014 Make prompt for headset while typing a password if accessibilbity is on less verbose. 
If accessibility is enabled and there is no headset we do not speak the pressed keys.
In such a case we provide a prompt to the blind user to use a headset. This was announced
on every keypress which is quite annoying. Now this is announced only once.

bug:5342234

Change-Id: Ibe55ad991ad2153d09cde57b030544948fa0d73b
 2011-10-04 17:05:55 -07:00
Dianne Hackborn
09e5b9daf3 Fix issue #5388352: font size change back to normal 
This is another place where we are messed up by the stupid default
Configuration having a 1.0 font scale.  Argh.

Change-Id: Iaa2550d4edab92fb8a52f98fbb9fd8ef5fab94b5
 2011-10-04 16:32:01 -07:00
Dave Santoro
2f35f577a3 am 53902603: Merge "Fix permission strings to match ICS-FactoryROM." 
* commit '53902603a47e6be0113c6e48abbbbe09b680fe13':
  Fix permission strings to match ICS-FactoryROM.
 2011-10-04 16:21:25 -07:00
Dave Santoro
53902603a4 Merge "Fix permission strings to match ICS-FactoryROM." 2011-10-04 16:19:27 -07:00
Christopher Tate
e706cef1c5 am b5de5985: Merge "Add -nosystem flag to adb backup" 
* commit 'b5de598554a97c557a3e0c20c28bbe5454164a6d':
  Add -nosystem flag to adb backup
 2011-10-04 16:18:24 -07:00
Dave Santoro
873aeb0f8a Fix permission strings to match ICS-FactoryROM. 
Bug 5394200

Change-Id: I2c6de49247c12d56d04304264dc7694987e4d28e
 2011-10-04 16:16:57 -07:00
Christopher Tate
b5de598554 Merge "Add -nosystem flag to adb backup" 2011-10-04 16:16:11 -07:00
Jason Sams
0de1a6632e am 3c1951c4: Merge "Fix crash running old HC apps." 
* commit '3c1951c442e40f7f46775acfc8a22c24f04d8cfc':
  Fix crash running old HC apps.
 2011-10-04 15:55:06 -07:00
Jason Sams
3c1951c442 Merge "Fix crash running old HC apps." 2011-10-04 15:53:37 -07:00
Dave Santoro
e8d5015223 am f0f2ff1a: (-s ours) am 7d535138: (-s ours) DO NOT MERGE New permissions for social stream. 
* commit 'f0f2ff1a5ba1f7d3ff30db3099efeaae71c01db1':
  DO NOT MERGE New permissions for social stream.
 2011-10-04 15:51:23 -07:00
Dave Santoro
f0f2ff1a5b am 7d535138: (-s ours) DO NOT MERGE New permissions for social stream. 
* commit '7d535138c15b3e9f90432fb942f9027fa334b681':
  DO NOT MERGE New permissions for social stream.
 2011-10-04 15:48:22 -07:00
Dave Santoro
ef728978b3 am 2aeecb7a: Merge "Add new permissions for read/write social stream." 
* commit '2aeecb7aa57242aae29dddff2b9ebd5d21aa3824':
  Add new permissions for read/write social stream.
 2011-10-04 15:47:39 -07:00
Jason Sams
795072ec7b Fix crash running old HC apps. 
Change-Id: If7206de334868cb40eb8e5dd04fbe8c70bc1d614
 2011-10-04 15:46:57 -07:00
Dave Santoro
2aeecb7aa5 Merge "Add new permissions for read/write social stream." 2011-10-04 15:46:10 -07:00
Dave Santoro
0b61f59d77 Add new permissions for read/write social stream. 
This is a manual merge of a change going in to ICS-FactoryROM.

These permissions are needed to separate the (potentially invasive)
access to the user's social stream from the existing read/write
contacts permission.

Per discussion with Android release team, we are also hiding the
stream item API until we figure out a better way to guard the data.

Bug 5406886

Change-Id: I8339d743c3ebe8923c7ee47f2900444efcf82a52
 2011-10-04 15:35:48 -07:00
Christopher Tate
240c7d2d1f Add -nosystem flag to adb backup 
This makes it easy to back up everything that belongs to 3rd party apps, but
nothing that comes with the system per se.  If any system packages are
explicitly named on the command line they will be included in the backup
even if -nosystem was passed.  So, for example, this will back up all 3rd
party apps as well as system settings, but nothing else belonging to
system-deployed apps:

   adb backup -all -nosystem com.android.provider.settings

Bug 5361503

Change-Id: Iebe04b7d7027ca58b9f55e8eb7f219d6cca69269
 2011-10-04 15:35:00 -07:00
Dave Santoro
7d535138c1 DO NOT MERGE New permissions for social stream. 
These permissions are needed to separate the (potentially invasive)
access to the user's social stream from the existing read/write
contacts permission.

Per discussion with Android release team, we are also hiding the
stream item API until we figure out a better way to guard the data.

Bug 5406886

Change-Id: I8339d743c3ebe8923c7ee47f2900444efcf82a52
 2011-10-04 15:09:54 -07:00
Ben Komalo
f98a21ee7f am a1aebdf7: Merge "New PIN unlock screen layout." 
* commit 'a1aebdf787443413ba870fc9203639405a5ff7bf':
  New PIN unlock screen layout.
 2011-10-04 14:29:51 -07:00
Ben Komalo
a1aebdf787 Merge "New PIN unlock screen layout." 2011-10-04 14:27:24 -07:00
Joe Fernandez
90b66cb321 am cac15eb2: Merge "docs: add developer guide cross-references, Project ACRE" 
* commit 'cac15eb21cab68e5b76fe06f9aff273978c92054':
  docs: add developer guide cross-references, Project ACRE
 2011-10-04 14:04:53 -07:00
Joe Fernandez
cac15eb21c Merge "docs: add developer guide cross-references, Project ACRE" 2011-10-04 14:03:12 -07:00
Michael Jurka
fd056b1086 am 30433b83: Merge "Reduce height of recent app thumbnails" 
* commit '30433b83cc1473721800a22effc84ce0cb1118f2':
  Reduce height of recent app thumbnails
 2011-10-04 14:02:55 -07:00
Michael Jurka
30433b83cc Merge "Reduce height of recent app thumbnails" 2011-10-04 14:01:08 -07:00
The Android Open Source Project
d73f75db0b am 01c40563: Reconcile with ics-factoryrom-release 
* commit '01c405636477b4c7fef9377fa5ae652afa1815c3':
 2011-10-04 13:59:23 -07:00
Joe Fernandez
b54e7a3d9f docs: add developer guide cross-references, Project ACRE 
Change-Id: I5df1c4e13af67ff4c4a5b22f3cb1247bf0103b09
 2011-10-04 13:57:00 -07:00
The Android Open Source Project
01c4056364 Reconcile with ics-factoryrom-release 
Change-Id: I35a78040547d4f13dcf96639a229b0b64a18bbf8
 2011-10-04 13:56:58 -07:00
Jeff Sharkey
3b3f26abb6 am 50a2f8ea: Merge "Read iface stats from single proc file." 
* commit '50a2f8ea9d855c58f589cfaa12235a742185021d':
  Read iface stats from single proc file.
 2011-10-04 13:53:41 -07:00
Jeff Sharkey
50a2f8ea9d Merge "Read iface stats from single proc file." 2011-10-04 13:52:24 -07:00
Michael Jurka
9316e7e31b Reduce height of recent app thumbnails 
Change-Id: I225147d49a6d7b71a08ca0464e702c0aeadb419d
 2011-10-04 13:52:05 -07:00
Danielle Millett
ec41b1a15b am b177b190: Merge "Fix 5405210: DevicePolicyManager doesn\'t allow Face Unlock" 
* commit 'b177b190a0c24754fc9af042681be7cd0284040e':
  Fix 5405210: DevicePolicyManager doesn't allow Face Unlock
 2011-10-04 13:26:28 -07:00
Danielle Millett
b177b190a0 Merge "Fix 5405210: DevicePolicyManager doesn't allow Face Unlock" 2011-10-04 13:23:55 -07:00