Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
124,745 Commits 3 Branches 0 Tags
3bc1bafabaedffede8963703cf3bfde2054ef91a
Commit Graph

2266 Commits

Author SHA1 Message Date
Narayan Kamath
8966fd383b am 031dec4a: am bfa6ddd0: Merge "Support deprecated language codes." 
* commit '031dec4acd384ae6c5ab183139c7f91289a05f62':
  Support deprecated language codes.
 2014-06-16 09:44:03 +00:00
Narayan Kamath
e79c8ce682 Support deprecated language codes. 
Locale.toLanguageTag will transform the obsolete (and
deprecated) language codes "in", "ji" and "iw" to
"id", "yi" and "he" respectively.

All versions of android prior to "L" used the deprecated
language tags, so we will need to support them for backwards
compatibility.

bug: 13230947

(cherry-picked from commit 21fc8ba39c)

(also contains a partial cherry-pick of 857ba4af because
including it is the easiest way to avoid conflicts.)

Change-Id: Ia1d0f2d8e20f5679ff3990506f6468ebf789c94a
 2014-06-13 19:03:13 +01:00
Elliott Hughes
ef3aeecacd am 38a5a257: am 759a8978: Merge "Minor javadoc improvements for PackageManager." 
* commit '38a5a257a9aaf85606eb7117d943a877dc7d3c93':
  Minor javadoc improvements for PackageManager.
 2014-06-04 22:02:34 +00:00
Amaury Medeiros
dde24269c1 Minor javadoc improvements for PackageManager. 
- Removed duplicated use of the word "the".
- Changed @return and @param explanation of getApplicationEnabledSetting,
which should get the enabled state of an application and not just one component.

Change-Id: Ide07ec84ceb5b9b5caa28efa9ba838a40ee7b514
Signed-off-by: Amaury Medeiros <amaurymedeiros@gmail.com>
 2014-06-03 20:06:41 -03:00
Narayan Kamath
797b109c60 am 7ed98c43: Merge "Add an --abi argument to "pm install"" 
* commit '7ed98c43f8cbcfbb4862205a72455ab39359a011':
  Add an --abi argument to "pm install"
 2014-06-03 13:24:45 +00:00
Narayan Kamath
6431d11cd4 Add an --abi argument to "pm install" 
This allows callers to force an install to a particular
ABI. This is intended only for testing (and CTS) and is
not meant for usage by the installer package.

Change-Id: Icb1528c0cd35b1aa9323386cb35ff4aaba374fcb
 2014-06-03 11:11:47 +01:00
Andrew Solovay
59f61cc23d am 768a899f: am b5960898: am 9562863c: doc: Updated branding guidelines per request from @deniseamling. 
* commit '768a899f214dd2fcf4bf3857549fee81b22debc4':
  doc: Updated branding guidelines per request from @deniseamling.
  Noted that OnSharedPreferenceChangeListener does not store a strong reference to the listener.
 2014-05-22 22:50:45 +00:00
Andrew Solovay
768a899f21 am b5960898: am 9562863c: doc: Updated branding guidelines per request from @deniseamling. 
* commit 'b59608981ff464b85a26987b8822913e41e72291':
  doc: Updated branding guidelines per request from @deniseamling.
  Noted that OnSharedPreferenceChangeListener does not store a strong reference to the listener.
 2014-05-22 22:45:06 +00:00
Andrew Solovay
b59608981f am 9562863c: doc: Updated branding guidelines per request from @deniseamling. 
* commit '9562863cf184fe99be223aff9700b3ceb8559e1a':
  doc: Updated branding guidelines per request from @deniseamling.
  Noted that OnSharedPreferenceChangeListener does not store a strong reference to the listener.
 2014-05-22 22:41:55 +00:00
Ben Murdoch
ecf09321c5 am e0d6a6b0: Merge "Add PackagManager flag for WebView system feature." into klp-modular-dev 
* commit 'e0d6a6b05b0861a5aa6dd8189de61a4da8d39dae':
  Add PackagManager flag for WebView system feature.
 2014-05-20 09:39:05 +00:00
Andrew Solovay
de0c99e89b Noted that OnSharedPreferenceChangeListener does not store a strong reference 
to the listener.

Because of this, the listener is susceptible to garbage collection unless the
caller preserves a strong reference to it. We suggest that the caller store a
reference to the listener in an instance field of an object that will exist as
long as the listener is needed.

Also fixed code sample formatting in Settings.jd (some lines were overlong).

Docs are staged in:

http://asolovay.mtv:8901/guide/topics/ui/settings.html#Listening

http://asolovay.mtv:8901/reference/android/content/SharedPreferences.html#registerOnSharedPreferenceChangeListener(android.content.SharedPreferences.OnSharedPreferenceChangeListener)

Bug: 10437648
Change-Id: I48f5b87fa2ca7a240661d0cc00114d225819d54d
 2014-05-19 16:05:06 -07:00
Ben Murdoch
422c7a5834 Add PackagManager flag for WebView system feature. 
Add a flag for PackageManager.hasSystemFeature to determine
if a functional webview is available on the device.

Bug: 13438487

Change-Id: I770f7e924b3e5fa6be0397904acf18c9306096e4
 2014-05-19 12:46:41 +01:00
Narayan Kamath
5d5f19a339 am 6e2e6868: am 706b1d7e: Merge "Remove "required" prefix from ABI fields." 
* commit '6e2e686889037711170ee145f9dfdb442cee85db':
  Remove "required" prefix from ABI fields.
 2014-05-15 12:45:27 +00:00
Narayan Kamath
6e2e686889 am 706b1d7e: Merge "Remove "required" prefix from ABI fields." 
* commit '706b1d7ea0214b6858730e68c95c6a6d6d9a4c30':
  Remove "required" prefix from ABI fields.
 2014-05-15 12:41:47 +00:00
Narayan Kamath
6e35a2ad05 Remove "required" prefix from ABI fields. 
As per a comment on an earlier code review.

(cherry-picked from commit a9d64733421d6765eab5c2730fa912f068e26047)

Change-Id: I064cffc13c323b721f3a16c83e0e95ee348ef9f6
 2014-05-15 10:57:05 +01:00
Tim Kilbourn
82c93357d0 am 05c581ac: Merge "DO NOT MERGE Hide more leanback stuff." into klp-modular-dev 
* commit '05c581ac4d6f44263891eae94a41a3841634d89c':
  DO NOT MERGE Hide more leanback stuff.
 2014-05-12 18:43:41 +00:00
Tim Kilbourn
0ff8f796d9 am d6fc5115: Merge "DO NOT MERGE Hide leanback packagemanager apis." into klp-modular-dev 
* commit 'd6fc5115a656f9d06dd1d455f8bedd5f5eca943b':
  DO NOT MERGE Hide leanback packagemanager apis.
 2014-05-12 18:43:37 +00:00
Tim Kilbourn
05c581ac4d Merge "DO NOT MERGE Hide more leanback stuff." into klp-modular-dev 2014-05-12 18:41:11 +00:00
Tim Kilbourn
d6fc5115a6 Merge "DO NOT MERGE Hide leanback packagemanager apis." into klp-modular-dev 2014-05-12 18:39:45 +00:00
Eino-Ville Talvala
8bfb3513ee am 1caeb10a: DO NOT MERGE: Add android.hardware.camera.external feature. 
* commit '1caeb10a7a288d937195d925c52f441f454cbc9a':
  DO NOT MERGE: Add android.hardware.camera.external feature.
 2014-05-09 15:47:58 +00:00
Eino-Ville Talvala
1caeb10a7a DO NOT MERGE: Add android.hardware.camera.external feature. 
This feature will be listed by Android devices that allow for an
external camera to be connected to it. Such camera devices may
not always be available or connected.

Also clarify that android.hardware.camera.any also encompasses
devices that list android.hardware.camera.external.

Change-Id: I57497758877e4286c1f0116961731d483b56808f
 2014-05-08 21:47:36 +00:00
Vinod Krishnan
03498d349a am b9d71fa1: Merge "Adding a HeartRate Feature" into klp-modular-dev 
* commit 'b9d71fa1081dc318a811b60660009d0769c02971':
  Adding a HeartRate Feature
 2014-05-07 21:46:45 +00:00
Vinod Krishnan
b9d71fa108 Merge "Adding a HeartRate Feature" into klp-modular-dev 2014-05-07 20:33:12 +00:00
Brian Carlstrom
3bbef521d4 resolved conflicts for merge of f2db00fd to klp-modular-dev-plus-aosp 
Change-Id: I745164033962f6222832f8f19fa316a2e2634fd0
 2014-05-07 13:20:23 -07:00
Brian Carlstrom
f2db00fdcd am edb88bcd: Merge "Use package usage information to decide what dex files to optimize in PackageManagerService" 
* commit 'edb88bcd232176e575f2dbee2cfdb1bfbe33faef':
  Use package usage information to decide what dex files to optimize in PackageManagerService
 2014-05-07 03:33:37 +00:00
Tim Kilbourn
7c433b3d9c DO NOT MERGE Hide more leanback stuff. 
- leanback intent category
- FLAG_IS_GAME

Bug: 14116162
Change-Id: I5665dda4c47e24a06707df4989ee117b4e91c246
 2014-05-06 16:54:34 -07:00
Brian Carlstrom
ff1ec4d9e7 Use package usage information to decide what dex files to optimize in PackageManagerService 
Change-Id: Iac137311e2e9d5139b5aa8651c6f3d296802612a
 2014-05-06 15:06:25 -07:00
Tim Kilbourn
eeeacab5d5 DO NOT MERGE Hide leanback packagemanager apis. 
Bug: 14116162
Change-Id: I410d720013ba4e2bc1b0f8a6973daba5ca9008c6
 2014-05-06 14:33:02 -07:00
Justin Koh
fcd2aff48d am 1e822a8f: Merge "Hide HDMI CEC from KKWT DO NOT MERGE" into klp-modular-dev 
* commit '1e822a8fe1f3063aa0d3eb47a7afdda9702c1734':
  Hide HDMI CEC from KKWT DO NOT MERGE
 2014-05-05 22:42:22 +00:00
Justin Koh
e5238f53f0 Hide HDMI CEC from KKWT DO NOT MERGE 
Hide HDMI CEC from KKWT.
Bug: 14116162

Change-Id: I086a5e51bd848a5097ccb0c47900fde30db2e7aa
 2014-05-05 22:19:19 +00:00
Vinod Krishnan
8afb23cbf6 Adding a HeartRate Feature 
Bug: 14140142

Change-Id: I080bf12995355eac7621ef46e1a4a64d1f865500
 2014-05-05 11:53:28 -07:00
Bill Yi
293513a59d Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD 2014-04-29 16:07:29 -07:00
Craig Mautner
f8a5820817 am 03981a4c: Merge "Add activity attribute allowEmbedded" into klp-modular-dev 
* commit '03981a4c2e9689197e4d2c916c07ae16207b5276':
  Add activity attribute allowEmbedded
 2014-04-24 16:33:02 +00:00
Craig Mautner
ffd14a13ce Add activity attribute allowEmbedded 
Activitys without allowEmbedded=true may not be launched in an ActivityView.

Fixes bug 13693121.

Change-Id: I431d554300fc3504ab1bc7d73a58d5dad24f8639
 2014-04-24 08:41:29 -07:00
Kenny Root
89a086c16f am cf677a37: am e00c9185: am 41ec218e: am 6888bee5: am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev 
* commit 'cf677a37fb4560058fe29ebcac97f2c02bd55064':
  Use hidden API to validate APK chains
 2014-04-18 23:05:30 +00:00
Kenny Root
cf677a37fb am e00c9185: am 41ec218e: am 6888bee5: am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev 
* commit 'e00c9185262c675f1680920c258413299995042a':
  Use hidden API to validate APK chains
 2014-04-18 23:00:37 +00:00
Kenny Root
e00c918526 am 41ec218e: am 6888bee5: am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev 
* commit '41ec218e5f92904fe99c74bc35b9f5e4003c777a':
  Use hidden API to validate APK chains
 2014-04-18 22:56:26 +00:00
Kenny Root
41ec218e5f am 6888bee5: am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev 
* commit '6888bee598b8c88f7a93ef2da06dd5659cc92dc6':
  Use hidden API to validate APK chains
 2014-04-18 22:50:12 +00:00
Kenny Root
6888bee598 am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev 
* commit '5a0cc78929bf56c153696ffa16b602acfcc40089':
  Use hidden API to validate APK chains
 2014-04-18 22:43:08 +00:00
Kenny Root
5a0cc78929 am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev 
* commit '2ed5f771c47c16e9c2be1f2025ef0a826f0290c3':
  Use hidden API to validate APK chains
 2014-04-18 22:37:38 +00:00
Kenny Root
2ed5f771c4 am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev 
* commit '47231936c0593b87c3c9898767327f1516a7ec22':
  Use hidden API to validate APK chains
 2014-04-18 22:31:08 +00:00
Kenny Root
4a62a6dce9 am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev 
* commit '451ed5f077b9f95deae809ae620bc210c253b922':
  Use hidden API to validate APK chains
 2014-04-18 22:14:14 +00:00
Kenny Root
451ed5f077 am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev 
* commit '3ecaa88d83d04a0fd55b494829badbb41016f5a1':
  Use hidden API to validate APK chains
 2014-04-18 21:33:04 +00:00
Kenny Root
3ecaa88d83 am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev 
* commit 'ecb013dbff5e33b95c49015fa375579e055911ae':
  Use hidden API to validate APK chains
 2014-04-18 18:14:32 +00:00
Kenny Root
16c6b177ee Use hidden API to validate APK chains 
Bug: 13678484
Change-Id: I28dedab74b0e24d47ab9f2190298156c909e9d54
 2014-04-17 14:03:33 -07:00
Deepanshu Gupta
cf72f25981 Fix incorrect merge conflict to klp-modular-dev-plus-aosp 
resolved conflicts for merge of ec6676dd to klp-modular-dev-plus-aosp
properly, originally fixed in 35d46778f4

Change-Id: I5d1abf641564ea19d283f60385d39f7670a2f22e
 2014-04-16 14:46:24 -07:00
Deepanshu Gupta
35d46778f4 resolved conflicts for merge of ec6676dd to klp-modular-dev-plus-aosp 
Change-Id: I2fec735ba65f56da7d17022074f8924a259b4bbf
 2014-04-16 12:14:34 -07:00
Deepanshu Gupta
ec6676ddf6 am 86384880: am f1e71876: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit '863848808d005fe1d2fd84a2982adfc02a3fbb9f':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-04-16 18:40:55 +00:00
Deepanshu Gupta
863848808d am f1e71876: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit 'f1e7187645f0b0388f7b97d742395efd228b347a':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-04-16 18:37:10 +00:00
Deepanshu Gupta
f1e7187645 Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
Change-Id: Icfb91e566666408802dadc0e2070991151b16b9d
(cherry picked from commit bfec73c2db)

Conflicts:
	core/java/android/content/res/Resources.java
	tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java
 2014-04-15 20:03:19 -07:00