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

125528 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Lawrence
b4aa6c5e74 am a9f387bd: Merge "Support default, pattern, pin and password encryption types" 
* commit 'a9f387bdf0a836de8bcb12a46a5cdfcb544fbb1a':
  Support default, pattern, pin and password encryption types
 2014-02-14 07:30:52 -08:00
Paul Lawrence
a9f387bdf0 Merge "Support default, pattern, pin and password encryption types" 2014-02-14 15:25:01 +00:00
Narayan Kamath
788fa41482 Extended locales in AAPT / AssetManager. 
Support 3 letter language codes, script codes &
variants. The bulk of the changes are related to
the implementation of command line filtering of
locales etc. The previous code assumed that the
value of each "axis" (locale, density, size etc.)
could be represented by a 4 byte type. This is
no longer the case.

This change introduces a new class, AaptLocaleValue
which holds a (normalized) locale parsed from a
directory name or a filter string. This class takes
responsibility for parsing locales as well as
writing them to ResTable_config structures, which is
their representation in the resource table.

This includes minor changes at the java / JNI level
for AssetManager. We now call locale.toLanguageTag()
to give the native layer a well formed BCP-47 tag.
I've removed some duplicated parsing code in
AssetManager.cpp and replaced them with functions on
ResTable_config. The native getLocales function has
been changed to return well formed BCP-47 locales as
well, so that the corresponding java function can use
Locale.forLanguageTag to construct a Locale object
out of it.

Finally, this change introduces default and copy
constructors for ResTable_config to prevent having
to memset() the associated memory to 0 on every
stack allocation.

(cherry-picked from commit 91447d88f2bdf9c2bf8d1a53570efef6172fba74)

Change-Id: I1b43086860661012f949fb8e5deb7df44519b854
 2014-02-14 14:08:57 +00:00
Narayan Kamath
48620f1d1b AssetManager support for 3 letter lang/country codes. 
- 3 letter codes are packed into the existing 32 bit locale
  field in ResTable_config
- We introduce new fields for script / variant information.

Note that we define a "match" between two ResTable_config
structures to be purely on the basis of their language &
country (disregarding the script and the variant). However,
configs with scripts and variants are considered to be more
specific than those without.

(cherry picked from commit 378c6775a62d9c461cde51f06c1b14bb014c78fd)

Change-Id: I7dce82a3fe2412834252723f458826ae41535a78
 2014-02-14 14:08:23 +00:00
Narayan Kamath
4750329ee1 am ee904d4d: am 6795e9c7: am 7a66d8ea: am 3bec0fbb: am fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSession class" 
* commit 'ee904d4d3ee710f292b607224a6017e843827360':
  AArch64: Use long for pointers in SurfaceSession class
 2014-02-14 05:42:19 -08:00
Narayan Kamath
ee904d4d3e am 6795e9c7: am 7a66d8ea: am 3bec0fbb: am fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSession class" 
* commit '6795e9c783242b31188d76c5186dfe0751f1731a':
  AArch64: Use long for pointers in SurfaceSession class
 2014-02-14 13:23:46 +00:00
Narayan Kamath
6795e9c783 am 7a66d8ea: am 3bec0fbb: am fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSession class" 
* commit '7a66d8ea7caba75b03e5a75d234a8598e2d887c6':
  AArch64: Use long for pointers in SurfaceSession class
 2014-02-14 13:20:47 +00:00
Narayan Kamath
7a66d8ea7c am 3bec0fbb: am fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSession class" 
* commit '3bec0fbb349a969934828ee726956877a3a21dee':
  AArch64: Use long for pointers in SurfaceSession class
 2014-02-14 13:17:13 +00:00
Narayan Kamath
3bec0fbb34 am fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSession class" 
* commit 'fa8f95e9b96e3a12e98269c8a31ed34df6a323ca':
  AArch64: Use long for pointers in SurfaceSession class
 2014-02-14 05:14:07 -08:00
Narayan Kamath
fa8f95e9b9 Merge "AArch64: Use long for pointers in SurfaceSession class" 2014-02-14 13:10:44 +00:00
Jeff Brown
ebbbec9e91 am 28114904: am f75aaf02: am ae254a8d: am 3048191b: Remove onCreate() method that should not be there. 
* commit '28114904554c520b26a66eb40439c4c9490286d8':
  Remove onCreate() method that should not be there.
 2014-02-14 01:54:36 -08:00
Jeff Brown
0c3cda3408 am 88aaef71: am ce0552f3: am 8a4c2bb1: am 567f7ca4: Refactor dream manager to new pattern. 
* commit '88aaef71289177644f723d3d0f20f34a6f9b3d2c':
  Refactor dream manager to new pattern.
 2014-02-14 01:54:32 -08:00
Jeff Brown
2811490455 am f75aaf02: am ae254a8d: am 3048191b: Remove onCreate() method that should not be there. 
* commit 'f75aaf0282531f8e8448bfb1cbdfb239f683ae8b':
  Remove onCreate() method that should not be there.
 2014-02-14 09:50:48 +00:00
Jeff Brown
88aaef7128 am ce0552f3: am 8a4c2bb1: am 567f7ca4: Refactor dream manager to new pattern. 
* commit 'ce0552f360d8c8f0bc45095293be369800ce9c93':
  Refactor dream manager to new pattern.
 2014-02-14 09:50:37 +00:00
Jeff Brown
f75aaf0282 am ae254a8d: am 3048191b: Remove onCreate() method that should not be there. 
* commit 'ae254a8d716b0515c5c91359a690987dfe8d5e9d':
  Remove onCreate() method that should not be there.
 2014-02-14 09:41:42 +00:00
Jeff Brown
ce0552f360 am 8a4c2bb1: am 567f7ca4: Refactor dream manager to new pattern. 
* commit '8a4c2bb1f07cf1d971290a7310d7b71aceb71590':
  Refactor dream manager to new pattern.
 2014-02-14 09:41:38 +00:00
Jeff Brown
ae254a8d71 am 3048191b: Remove onCreate() method that should not be there. 
* commit '3048191b4cf9eff7a72b84065dec2b3dd1e89b3c':
  Remove onCreate() method that should not be there.
 2014-02-14 09:14:15 +00:00
Jeff Brown
8a4c2bb1f0 am 567f7ca4: Refactor dream manager to new pattern. 
* commit '567f7ca424280ae957b04d4f3df690055f2d41df':
  Refactor dream manager to new pattern.
 2014-02-14 09:14:09 +00:00
Jeff Brown
3048191b4c Remove onCreate() method that should not be there. 
Change-Id: I8355dd78f910afa9895d2fa00cb627a0885d9eec
 2014-02-13 23:26:59 -08:00
Jeff Brown
567f7ca424 Refactor dream manager to new pattern. 
Change-Id: I99ab4bd98d56a290368dc4b24e5bb24e0656b522
 2014-02-13 23:26:59 -08:00
Adam Powell
0aae2da318 am 00aefc8f: Fix build 
* commit '00aefc8fa85f7a1dd171d7b0d906630abba7fc93':
  Fix build
 2014-02-13 19:30:27 -08:00
Adam Powell
00aefc8fa8 Fix build 
Change-Id: Iec813bf820b4b5cb87949f4476d1b288c89c5f8a
 2014-02-13 19:21:54 -08:00
Dianne Hackborn
2864cd637e am c63abee9: am 6231c948: am dc3561df: am 01de2432: am 24d8fa73: Merge "frameworks/base: move idmap from frameworks/native" 
* commit 'c63abee945949dc9ac8a3fb9e17726ca420ce1fd':
  frameworks/base: move idmap from frameworks/native
 2014-02-13 18:06:42 -08:00
Wink Saville
c19a10b1b2 am c1e0f9be: am df10f02a: am e574f7de: am ea56c795: am bbba8211: Merge "Telephony: Handle DATA_CALL_LIST in DCC." 
* commit 'c1e0f9be09750055914f873e690d334821739909':
  Telephony: Handle DATA_CALL_LIST in DCC.
 2014-02-13 18:06:39 -08:00
Dianne Hackborn
c63abee945 am 6231c948: am dc3561df: am 01de2432: am 24d8fa73: Merge "frameworks/base: move idmap from frameworks/native" 
* commit '6231c948b0dc8dc97a5054f26c398a9a2884921f':
  frameworks/base: move idmap from frameworks/native
 2014-02-14 02:03:48 +00:00
Wink Saville
c1e0f9be09 am df10f02a: am e574f7de: am ea56c795: am bbba8211: Merge "Telephony: Handle DATA_CALL_LIST in DCC." 
* commit 'df10f02a1428e12acda695360a5e760c8e806ea2':
  Telephony: Handle DATA_CALL_LIST in DCC.
 2014-02-14 02:03:44 +00:00
Dianne Hackborn
6231c948b0 am dc3561df: am 01de2432: am 24d8fa73: Merge "frameworks/base: move idmap from frameworks/native" 
* commit 'dc3561df118a17a099285c9be312fb66f91314ec':
  frameworks/base: move idmap from frameworks/native
 2014-02-14 02:00:49 +00:00
Wink Saville
df10f02a14 am e574f7de: am ea56c795: am bbba8211: Merge "Telephony: Handle DATA_CALL_LIST in DCC." 
* commit 'e574f7decf7bc2c6861aff2fd4458b9f96a08a28':
  Telephony: Handle DATA_CALL_LIST in DCC.
 2014-02-14 02:00:46 +00:00
Dianne Hackborn
dc3561df11 am 01de2432: am 24d8fa73: Merge "frameworks/base: move idmap from frameworks/native" 
* commit '01de243263d347f2ac13a239d67d41817e34df33':
  frameworks/base: move idmap from frameworks/native
 2014-02-14 01:54:49 +00:00
Wink Saville
e574f7decf am ea56c795: am bbba8211: Merge "Telephony: Handle DATA_CALL_LIST in DCC." 
* commit 'ea56c795b0b4997f5835ec42a18eccdb173bc468':
  Telephony: Handle DATA_CALL_LIST in DCC.
 2014-02-14 01:54:43 +00:00
Alan Viverette
e192e344fa am 23160f4f: Merge "Refactor AbsListView position scrollers for better abstraction" 
* commit '23160f4fb911811759643bd3ef42e7b96abc1265':
  Refactor AbsListView position scrollers for better abstraction
 2014-02-13 17:52:21 -08:00
Dianne Hackborn
01de243263 am 24d8fa73: Merge "frameworks/base: move idmap from frameworks/native" 
* commit '24d8fa739b7ca0791174af260ed95cdc139e0903':
  frameworks/base: move idmap from frameworks/native
 2014-02-13 17:50:53 -08:00
Wink Saville
ea56c795b0 am bbba8211: Merge "Telephony: Handle DATA_CALL_LIST in DCC." 
* commit 'bbba8211f9eca938d5d482583fd6e047615b4334':
  Telephony: Handle DATA_CALL_LIST in DCC.
 2014-02-13 17:50:51 -08:00
Alan Viverette
23160f4fb9 Merge "Refactor AbsListView position scrollers for better abstraction" 2014-02-14 01:48:59 +00:00
Alan Viverette
d22db216fe Refactor AbsListView position scrollers for better abstraction 
The AbsListView sub-scroller knows nothing about layout. That's now
handled by ListView and GridView, with subclasses of AbsListView using
the default PositionScroller. Removes unnecessary (unreleased) APIs.

Also fixes a bounds check that was using the item position rather than
the child view position.

BUG: 13006641
Change-Id: I2adb0f15623e32295facf81f5ada974083ba03ce
 2014-02-13 17:47:38 -08:00
Fabrice Di Meglio
98f5a7a963 am 73f3a33b: Merge "Fix bug #12993929 Screen orientation change replaces wifi password dialog with Add network dialog" 
* commit '73f3a33b46691deb9ce7f3ce54feef8c973686ff':
  Fix bug #12993929 Screen orientation change replaces wifi password dialog with Add network dialog
 2014-02-13 17:45:48 -08:00
Dianne Hackborn
24d8fa739b Merge "frameworks/base: move idmap from frameworks/native" 2014-02-14 01:45:12 +00:00
Fabrice Di Meglio
73f3a33b46 Merge "Fix bug #12993929 Screen orientation change replaces wifi password dialog with Add network dialog" 2014-02-14 01:42:36 +00:00
Alan Viverette
787f6f0e97 am 7d57765d: Merge "Add selection properties to CollectionInfo, CollectionItemInfo" 
* commit '7d57765db927d8803bd8898463cc6f9979b6bf35':
  Add selection properties to CollectionInfo, CollectionItemInfo
 2014-02-13 17:17:54 -08:00
Alan Viverette
7d57765db9 Merge "Add selection properties to CollectionInfo, CollectionItemInfo" 2014-02-14 01:15:04 +00:00
ztenghui
ef94c6f88f Separate spot and ambient shadow strength setting 
Change-Id: I4530e618b09a7f44b5382f8a40646c0ebf5f214c
 2014-02-13 17:09:45 -08:00
Fabrice Di Meglio
08189afdb0 Fix bug #12993929 Screen orientation change replaces wifi password dialog with Add network dialog 
- do not make inactive the fragment when its transition animation is ending.

Long explanation:

Context: you need to have a first fragment pushed and then a second one replacing
the first one, and then create a DialogFragment on top of it. The FragmentManager
has then three "active" Fragments.

The mActive ArrayList of the FragmentManager is then containing:

mActive[0] = first fragment
mActive[1] = second fragment (parent of the dialog fragment)
mActive[2[ = dialog fragment

Then suppose you are changing the orientation.

During the restoration of the FragmentManager states, you will see that the
first Fragment is marked "inactive" and the mActive ArrayList is looking like:

mActive[0] = dialog fragment
mActive[1] = second fragment

which leads first to have a call to onCreateDialog() for the DialogFragment and
before it can be able to restore its state thru the calls to onCreate() and
onCreateView() for the parent (the second fragment).

Change-Id: I0268bdf13e4bdd07a783c2c82a13b431d0c5c8e4
 2014-02-13 17:02:11 -08:00
Wink Saville
bbba8211f9 Merge "Telephony: Handle DATA_CALL_LIST in DCC." 2014-02-13 23:37:04 +00:00
Derek Tan
ded7d1871d Fix the inconsistent name on @param and the real param. 
Change-Id: If9853e91f55c0be89cdf77ae7c4369f274a45bb6
 2014-02-13 14:49:26 -08:00
David Christie
5b1e07514a am d63b4314: Merge "Log history of location requests in LocationManager. -Assists with debugging power issues. Bug: 12824233" 
* commit 'd63b4314b85e982a1d70d4064af59851f476dd36':
  Log history of location requests in LocationManager. -Assists with debugging power issues. Bug: 12824233
 2014-02-13 12:28:48 -08:00
David Christie
d63b4314b8 Merge "Log history of location requests in LocationManager. -Assists with debugging power issues. Bug: 12824233" 2014-02-13 20:25:01 +00:00
Craig Mautner
581cd3ccb7 am 6b1a93fc: am 3816fa8b: am 21ab13ff: am 474f1fbe: Merge "Don\'t null class member before using it." into klp-modular-dev 
* commit '6b1a93fcb9551730583f1d3ea36dbfd5589859f3':
  Don't null class member before using it.
 2014-02-13 11:27:04 -08:00
Craig Mautner
6b1a93fcb9 am 3816fa8b: am 21ab13ff: am 474f1fbe: Merge "Don\'t null class member before using it." into klp-modular-dev 
* commit '3816fa8beec3592360bf4ec1c4dde22c271b17f9':
  Don't null class member before using it.
 2014-02-13 19:24:23 +00:00
Craig Mautner
3816fa8bee am 21ab13ff: am 474f1fbe: Merge "Don\'t null class member before using it." into klp-modular-dev 
* commit '21ab13ff743fda1cec1923a8dec6b5553a514759':
  Don't null class member before using it.
 2014-02-13 19:21:41 +00:00
Craig Mautner
21ab13ff74 am 474f1fbe: Merge "Don\'t null class member before using it." into klp-modular-dev 
* commit '474f1fbe8d87563909c3cb69ec921d427cd1f0b0':
  Don't null class member before using it.
 2014-02-13 19:18:04 +00:00