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

58245 Commits

Author SHA1 Message Date
ztenghui
e6411c76c4 Merge "Support dot separation as the svg path data did." into lmp-mr1-dev 2014-10-09 16:34:40 +00:00
Eino-Ville Talvala
7e7a14c541 am eeec4b9e: am ef773e35: Merge changes Id09663d8,Ie88f3750 into lmp-dev 
* commit 'eeec4b9ebc15545e59985eab29385157cbbd8e9f':
  Camera2: Docs cleanup, especially units and range
  camera2: Update docs only for legacy devices
 2014-10-09 13:04:08 +00:00
Dianne Hackborn
d83e9e4280 am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit '0761b1b5ebb453a411e3289c1c972dbfddcee880':
  Put in real "code" (aka marketing) name.
 2014-10-09 13:03:21 +00:00
Jeff Sharkey
b424849533 am b01a5ba2: am 562262cc: Merge "Bring along more ApplicationInfo fields." into lmp-dev 
* commit 'b01a5ba2b7c1bc22e30d6cc16c30f8e1215701cd':
  Bring along more ApplicationInfo fields.
 2014-10-09 13:03:07 +00:00
Eino-Ville Talvala
eeec4b9ebc am ef773e35: Merge changes Id09663d8,Ie88f3750 into lmp-dev 
* commit 'ef773e3569969592fb220b7ccc49dafcabfdd67a':
  Camera2: Docs cleanup, especially units and range
  camera2: Update docs only for legacy devices
 2014-10-09 03:02:35 +00:00
Alan Viverette
fe087d38a8 Merge "Fix invalid bounds detection in ExploreByTouchHelper" into lmp-mr1-dev 2014-10-09 00:32:56 +00:00
Dianne Hackborn
0761b1b5eb am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit '89b196958fee07475765bd3c458098464ba16f2e':
  Put in real "code" (aka marketing) name.
 2014-10-09 00:14:54 +00:00
Jeff Sharkey
b01a5ba2b7 am 562262cc: Merge "Bring along more ApplicationInfo fields." into lmp-dev 
* commit '562262cc89838529316ff2f3e511c0d876b08677':
  Bring along more ApplicationInfo fields.
 2014-10-09 00:14:25 +00:00
ztenghui
4cc3e2704a Support dot separation as the svg path data did. 
Like "0.0.0" will be separated to "0.0 .0" now, just to make sure we are more
complied with svg path data.

b/17892882

Change-Id: Id7b64e9882f5174aa794a0256e2a29d66c724876
 2014-10-08 15:51:37 -07:00
Chris Craik
86fd9278a9 Merge "Enable fast jni for simple RenderNode/Matrix/Paint operations" into lmp-mr1-dev 2014-10-08 19:58:13 +00:00
Eino-Ville Talvala
ef773e3569 Merge changes Id09663d8,Ie88f3750 into lmp-dev 
* changes:
  Camera2: Docs cleanup, especially units and range
  camera2: Update docs only for legacy devices
 2014-10-08 18:48:31 +00:00
Eino-Ville Talvala
fd3e2892f2 Camera2: Docs cleanup, especially units and range 
- Add entries for units and range into javadoc
- Fix up existing units entries and add new ones
- Fix up range entries to be consistent for enums
- Add range entries where it makes sense
- Minor fix to javadoc gen to allow for code indentation
- Lots of edits for consistency, especially to
  available* entries.

Bug: 16525650

Change-Id: Id09663d897ec98122073e6e13719731ec0de4dad
 2014-10-08 11:28:59 -07:00
Dan Sandler
621fa30c54 am 9eef8749: am 2200f86f: All (er, L) is finally revealed. 
* commit '9eef8749232c00afad5ca3c26736c0be785cb8c1':
  All (er, L) is finally revealed.
 2014-10-08 18:25:57 +00:00
Dan Sandler
9eef874923 am 2200f86f: All (er, L) is finally revealed. 
* commit '2200f86f800876d005f911e6864708fa9772d03a':
  All (er, L) is finally revealed.
 2014-10-08 18:16:01 +00:00
Dianne Hackborn
89b196958f Merge "Put in real "code" (aka marketing) name." into lmp-dev 2014-10-08 17:59:19 +00:00
Jeff Sharkey
562262cc89 Merge "Bring along more ApplicationInfo fields." into lmp-dev 2014-10-08 17:25:39 +00:00
Jeff Sharkey
7f1a57a3e7 Bring along more ApplicationInfo fields. 
When we added scan paths, we forgot to bring them along through
Parcel and copy constructor.

Bug: 17900178
Change-Id: I0ee9374f909d375768045976fd88cee7431f7d4d
 2014-10-08 10:14:53 -07:00
Geoff Mendal
e95638f5ec Import translations. DO NOT MERGE 
Change-Id: I2d79cf76ea811b54f906bf6d76d9887b804dcd4e
Auto-generated-cl: translation import
 2014-10-08 08:56:53 -07:00
Geoff Mendal
639890256d Import translations. DO NOT MERGE 
Change-Id: Ifd63055fca79d18a2d44d914d0bccfbf8d81ebac
Auto-generated-cl: translation import
 2014-10-08 08:40:03 -07:00
Geoff Mendal
6c3a23ddad Import translations. DO NOT MERGE 
Change-Id: I94aa8de0fe7a191d0312dbbb9f2b583c7afbdade
Auto-generated-cl: translation import
 2014-10-08 08:31:15 -07:00
Jeff Brown
45bdf81a48 am e1449dfc: am 32b9f4a6: Merge "Reapply animation duration scale each time it is started." into lmp-dev 
* commit 'e1449dfc55113bc9eceb7fd74c8f66ff19a35dea':
  Reapply animation duration scale each time it is started.
 2014-10-08 05:24:37 +00:00
Jeff Brown
e1449dfc55 am 32b9f4a6: Merge "Reapply animation duration scale each time it is started." into lmp-dev 
* commit '32b9f4a650d1b8b52b85a27109f95fde030dff66':
  Reapply animation duration scale each time it is started.
 2014-10-08 05:12:57 +00:00
Dan Sandler
2200f86f80 All (er, L) is finally revealed. 
If you exceed 20000 points, please send in a screenshot.

Bug: 15984887
Change-Id: I1164160bfa8e7dca3b9e7d7ca5d50ef9abd38b61
 2014-10-08 04:01:01 +00:00
Dianne Hackborn
955d8d69ea Put in real "code" (aka marketing) name. 
Change-Id: Idb3976edfae37293ed75cb5b869b4b42d8042bbe
 2014-10-07 20:17:19 -07:00
Jeff Brown
32b9f4a650 Merge "Reapply animation duration scale each time it is started." into lmp-dev 2014-10-07 23:53:23 +00:00
Jeff Brown
7a08fe0e09 Reapply animation duration scale each time it is started. 
When Battery Saver mode is enabled, we set the animation duration
scale factor to 0 to effectively disable all animations.  Later
when it is disabled, we reset the animation duration scale
factor to 1.

This change ensures that we reapply the duration scale factor
whenever the animation is started instead of only applying it
once when the duration is set (usually when the animation is
created).  This ensures that the correct scale factor is applied
even when it changes after the animation has been initialized.

Previously, certain animations would continue to be suppressed
even after Battery Saver mode was disengaged.  This wasn't much
of an issue when the duration scale was initially implemented as
a developer setting but now that it is exposed via Battery Saver
the artifacts caused by this bug have become visible to users.

Bug: 17887431
Change-Id: I91ba5ca0505d02ac389a31d067e38886112fa0c8
 2014-10-07 15:55:35 -07:00
Alan Viverette
0660042a26 Merge "Mutate and apply theme if needed before caching themed drawables" into lmp-mr1-dev 2014-10-07 22:09:49 +00:00
Chris Craik
4136a0aeac Enable fast jni for simple RenderNode/Matrix/Paint operations 
bug:17895119

Change-Id: Id83bfd719ec873028f0d4e7e4e4c0702f3bb3dd9
 2014-10-07 15:09:46 -07:00
Alan Viverette
727cae197b Mutate and apply theme if needed before caching themed drawables 
This ensures that drawables are completely separated from their cached
constant states before applying a theme. After this, we can remove the
implicit (and incomplete) mutation in the clone constructors.

Also implements missing mutate() method on ClipDrawable.

BUG: 17646144
Change-Id: If0d66b0a85724d76e0a4f506758c7ba3c0aa3410
 2014-10-07 15:08:47 -07:00
Christopher Tate
152893dd66 am 93e5e859: am ae456fd8: Merge "Accept any restored wallpaper" into lmp-dev 
* commit '93e5e859e3d2c0f4d4f47c90d370b38be4440655':
  Accept any restored wallpaper
 2014-10-07 21:59:10 +00:00
Christopher Tate
93e5e859e3 am ae456fd8: Merge "Accept any restored wallpaper" into lmp-dev 
* commit 'ae456fd894c5a41f859196016a7c49113b235eda':
  Accept any restored wallpaper
 2014-10-07 21:53:54 +00:00
Christopher Tate
ae456fd894 Merge "Accept any restored wallpaper" into lmp-dev 2014-10-07 21:50:08 +00:00
Adam Lesinski
18ab83e571 am f189c445: am 1a98dd5c: Merge "Load shared library dependencies for AppWidgets" into lmp-dev 
* commit 'f189c445b84365a3f1bd2b678fdca37f9df8d5d1':
  Load shared library dependencies for AppWidgets
 2014-10-07 20:03:24 +00:00
Andres Morales
5d62388192 am 4e558355: am 258d2221: Fix build, previous commit failed to remove an import 
* commit '4e5583554151ea95d8d573e3d64947afbc51f34f':
  Fix build, previous commit failed to remove an import
 2014-10-07 20:03:14 +00:00
Andres Morales
6ef845d34a am b4589115: am d6a2ab93: Merge "Remove dead NFC unlock code from fw/base" into lmp-dev 
* commit 'b4589115ad5ca8a98aa8f9b75296502658ae6416':
  Remove dead NFC unlock code from fw/base
 2014-10-07 20:03:09 +00:00
Adam Lesinski
f189c445b8 am 1a98dd5c: Merge "Load shared library dependencies for AppWidgets" into lmp-dev 
* commit '1a98dd5cc7ea89793208b51983198bfbeade5ccc':
  Load shared library dependencies for AppWidgets
 2014-10-07 19:58:59 +00:00
Andres Morales
4e55835541 am 258d2221: Fix build, previous commit failed to remove an import 
* commit '258d222152a410341ddad045ce92e57dd7ab454e':
  Fix build, previous commit failed to remove an import
 2014-10-07 19:58:41 +00:00
Andres Morales
b4589115ad am d6a2ab93: Merge "Remove dead NFC unlock code from fw/base" into lmp-dev 
* commit 'd6a2ab930972d5578957ca919abd38fca074deec':
  Remove dead NFC unlock code from fw/base
 2014-10-07 19:58:36 +00:00
Adam Lesinski
1a98dd5cc7 Merge "Load shared library dependencies for AppWidgets" into lmp-dev 2014-10-07 19:51:17 +00:00
Adam Lesinski
d00bb5edcf Load shared library dependencies for AppWidgets 
PackageManager and AppWidgetHostServiceImpl should
be loading the resources of any shared libraries being
used by the app, as they have references in their Widgets
or application icons/labels, etc.

Bug:17668152
Change-Id: I359662334edb125d7570089916727df4eeba02bb
 2014-10-07 12:14:45 -07:00
Andres Morales
258d222152 Fix build, previous commit failed to remove an import 
Bug:17883273
Change-Id: I6ef422eae83fb8b44279f1bf5a811858b791afa7
 2014-10-07 11:15:58 -07:00
Andres Morales
d6a2ab9309 Merge "Remove dead NFC unlock code from fw/base" into lmp-dev 2014-10-07 18:11:21 +00:00
Amith Yamasani
4797554ab8 am b86671f4: am 41bb3455: Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev 
* commit 'b86671f4b8263affaa561796862bd4149235b1d3':
  Set the default user restrictions to disallow calling and sms
 2014-10-07 17:43:08 +00:00
Amith Yamasani
b86671f4b8 am 41bb3455: Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev 
* commit '41bb3455e44dc8fde4569bbfd56fa20c6da8a27d':
  Set the default user restrictions to disallow calling and sms
 2014-10-07 17:33:25 +00:00
Amith Yamasani
41bb3455e4 Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev 2014-10-07 17:11:34 +00:00
Amit Mahajan
dbbf493220 am d9a3f89a: Merge commit \'69555fc2\' into fix-merge-conflict3 
* commit 'd9a3f89a0727590a069c563a8b97fe99b866d67c':
  Sms7BitEncodingTranslator
 2014-10-07 05:12:44 +00:00
Amit Mahajan
d9a3f89a07 Merge commit '69555fc2' into fix-merge-conflict3 
Conflicts:
	core/res/res/values/symbols.xml

Change-Id: I4266f1fcc51abc79235e1738bfbc3ff48e209e0c
 2014-10-06 21:57:42 -07:00
Amith Yamasani
aa6634eaca Set the default user restrictions to disallow calling and sms 
When creating a user via the UI, disallow phone calls and SMS by
default. Primary user must explicitly enable it via Settings.

Bug: 17832802
Change-Id: I18cad4be8493ddc8890b5d90da2df256cb3f1ec9
 2014-10-06 18:24:32 -07:00
Amit Mahajan
69555fc2c8 Merge "Sms7BitEncodingTranslator" into lmp-dev 2014-10-07 01:20:27 +00:00
Xia Ying
43eb8a97e7 Sms7BitEncodingTranslator 
Bug: 16197894
Change-Id: I2bd5ae0a3c2d5d8f869f5e2de7009fd450070521
 2014-10-07 01:02:04 +00:00