Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
125,367 Commits 3 Branches 0 Tags
b8b54bc69c272ecdf535a89ba24b6f527fb6e563
Commit Graph

36838 Commits

Author SHA1 Message Date
Fabrice Di Meglio
b8b54bc69c am c39d3d32: Merge "Revert "Fix bug #12993929 Screen orientation change replaces wifi password dialog with Add network dialog"" 
* commit 'c39d3d32abd70dd48ba58b6fb28b12bb61e375d9':
  Revert "Fix bug #12993929 Screen orientation change replaces wifi password dialog with Add network dialog"
 2014-02-18 17:19:09 -08:00
Fabrice Di Meglio
c39d3d32ab Merge "Revert "Fix bug #12993929 Screen orientation change replaces wifi password dialog with Add network dialog"" 2014-02-19 01:14:46 +00:00
Fabrice Di Meglio
494440be14 Revert "Fix bug #12993929 Screen orientation change replaces wifi password dialog with Add network dialog" 
This reverts commit 08189afdb0.

Change-Id: Ie8797daca642685ee9a2a541d11a35daa28f0564
 2014-02-19 01:11:21 +00:00
Jay Shrauner
8b9a2278d2 am ae586241: Merge "Prevent SpellChecker from setting invalid range" 
* commit 'ae58624157798ef72be6bcbdaaca7979302e3f7f':
  Prevent SpellChecker from setting invalid range
 2014-02-18 16:27:18 -08:00
Jay Shrauner
ae58624157 Merge "Prevent SpellChecker from setting invalid range" 2014-02-19 00:24:39 +00:00
Adam Lesinski
5fdcc33963 am 5441745e: am 019b1f26: am 2ea983a5: am 3d9bcb90: Create FEATURE_ constants for print and backup 
* commit '5441745effb885589c03050b59885e8a3ad96ad6':
  Create FEATURE_ constants for print and backup
 2014-02-18 15:07:14 -08:00
Adam Lesinski
5441745eff am 019b1f26: am 2ea983a5: am 3d9bcb90: Create FEATURE_ constants for print and backup 
* commit '019b1f2668ac17f5e52b6ce32a524d26134a062a':
  Create FEATURE_ constants for print and backup
 2014-02-18 23:03:37 +00:00
Adam Lesinski
2ea983a567 am 3d9bcb90: Create FEATURE_ constants for print and backup 
* commit '3d9bcb90ee6c0ffff93642539ae64fb672c7f14a':
  Create FEATURE_ constants for print and backup
 2014-02-18 22:57:37 +00:00
Dianne Hackborn
2bbd02bbd8 am 93b55c11: Merge "Implement wifi part of issue #12973036: Improve power_profile.xml" 
* commit '93b55c1149bb4a03b0df7887182265969af2ab71':
  Implement wifi part of issue #12973036: Improve power_profile.xml
 2014-02-18 14:47:07 -08:00
Dianne Hackborn
93b55c1149 Merge "Implement wifi part of issue #12973036: Improve power_profile.xml" 2014-02-18 22:45:17 +00:00
Dianne Hackborn
ca1bf21c51 Implement wifi part of issue #12973036: Improve power_profile.xml 
Add battery stats tracking of wifi state.

Also update when we retrieve the current time to use a more
consistent value across stats tracking.

Change-Id: I6a7c3efd58ff2c8ea86dac141c8f848e7996d63f
 2014-02-18 14:43:14 -08:00
Dan Sandler
2db7163cf0 am 2b330dde: Merge "Allow a user to elect to see private notifications in public." 
* commit '2b330dde2c46e6e94687649b8e888f9a2d9855bf':
  Allow a user to elect to see private notifications in public.
 2014-02-18 14:33:51 -08:00
Adam Lesinski
3d9bcb90ee Create FEATURE_ constants for print and backup 
Bug:13079822

Change-Id: I6f4b759951d45989e8aad4011fae431ee2ecae0c
 2014-02-18 14:33:00 -08:00
Dan Sandler
2b330dde2c Merge "Allow a user to elect to see private notifications in public." 2014-02-18 22:30:50 +00:00
Alan Viverette
35ed004d67 am e082ae6b: Merge "Fix sub scroller bounds checking" 
* commit 'e082ae6bd6032a1b8f50234b1808287fe7ad124d':
  Fix sub scroller bounds checking
 2014-02-18 14:10:23 -08:00
Alan Viverette
e082ae6bd6 Merge "Fix sub scroller bounds checking" 2014-02-18 22:08:24 +00:00
Alan Viverette
bb9364279f Fix sub scroller bounds checking 
BUG: 13031919
Change-Id: I6b569b50034fbe70441e11e56706faa9f2acfcbd
 2014-02-18 14:07:35 -08:00
Dan Sandler
fd16d56419 Allow a user to elect to see private notifications in public. 
Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, if
set and nonzero, will show that user's notifications on the
secure lockscreen (assuming LOCK_SCREEN_ALLOW_NOTIFICATIONS
is also set). Note that this applies only to a particular
user's notifications, so if multiple users' notifications
are shown at once (currently this only applies to the
current user and USER_ALL) only that user's notifications
are affected.

USER_ALL is assumed to always allow private notifications in
public (because they can't be user-specific).

Change-Id: I32bb7939066c4919191e74161ca48ead01a88c7f
 2014-02-18 15:50:44 -05:00
Zhijun He
d424df6cda am 0ed25174: Merge "Camera2: Update java doc for tone.map.curveRed key" 
* commit '0ed25174f98fe473990b1d3298540117d8158e93':
  Camera2: Update java doc for tone.map.curveRed key
 2014-02-18 11:12:27 -08:00
Zhijun He
0ed25174f9 Merge "Camera2: Update java doc for tone.map.curveRed key" 2014-02-18 19:10:37 +00:00
Jessica Hummel
b7e4206768 am 587f43d8: Merge "Change API for setProfileOwner to require userId" 
* commit '587f43d8725b11632b5d64a0a56a647207f01668':
  Change API for setProfileOwner to require userId
 2014-02-18 09:34:11 -08:00
Jessica Hummel
587f43d872 Merge "Change API for setProfileOwner to require userId" 2014-02-18 17:31:31 +00:00
Deepanshu Gupta
389ecda9f8 am c0c4243e: Merge "Fix layoutlib by avoiding Java7 calls" 
* commit 'c0c4243e8537a2cb6550ca28e161b8fd2d9b9cbe':
  Fix layoutlib by avoiding Java7 calls
 2014-02-17 11:30:23 -08:00
Deepanshu Gupta
c0c4243e85 Merge "Fix layoutlib by avoiding Java7 calls" 2014-02-17 19:28:16 +00:00
Deepanshu Gupta
857ba4af85 Fix layoutlib by avoiding Java7 calls 
This change also fixes a NPE in TypedArray caused by changes in the
framework.

Change-Id: Ie64237c567fa16c35c807db22ce9a4b609ee411d
 2014-02-17 10:43:01 -08:00
Narayan Kamath
8c1fc83445 am 28879bbf: am be57fca4: Merge "Extended locales in AAPT / AssetManager." 
* commit '28879bbfe89dc4bf2067a7183975ecffb82f68e6':
  Extended locales in AAPT / AssetManager.
 2014-02-17 11:06:38 +00:00
Narayan Kamath
be57fca41a Merge "Extended locales in AAPT / AssetManager." 2014-02-17 11:00:30 +00:00
Adam Connors
661ec4710b Change API for setProfileOwner to require userId 
Previously the userId of the current process used but it
makes the provisioning process cleaner to be able to pass
it in explicitly.

Change-Id: I670c4cf3638f1340f6d0bf856c3e01045df8c29e
 2014-02-17 10:18:59 +00:00
Zhijun He
870922be23 Camera2: Update java doc for tone.map.curveRed key 
Change-Id: I39df3a14470a1f051ee3eb11866e7205ea7b16b6
 2014-02-15 21:47:51 -08:00
Zhijun He
2df3b5f153 am b35badac: Merge "Camera2: Unhide some capture request templates" 
* commit 'b35badac43f742456c4111d1d7369a216409c6f0':
  Camera2: Unhide some capture request templates
 2014-02-14 17:54:37 -08:00
Zhijun He
b35badac43 Merge "Camera2: Unhide some capture request templates" 2014-02-15 01:34:57 +00:00
Michael Wright
155a8eb851 am d35ceee7: Merge "Remove Japanese button swap" 
* commit 'd35ceee732ad7172e1f7a4261c361591da260120':
  Remove Japanese button swap
 2014-02-14 14:46:57 -08:00
Michael Wright
8a5dbac349 Remove Japanese button swap 
Bug: 12923922
Change-Id: I4960d8189e751514a595823d7ed9b273e3ff8eb8
 2014-02-14 13:20:58 -08:00
Zhijun He
fa8cc5f680 Camera2: Unhide some capture request templates 
Change-Id: I13a45b51c129ba562cce0374ae3c63e853144c10
 2014-02-14 10:48:38 -08:00
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 91447d88f2)

Change-Id: I1b43086860661012f949fb8e5deb7df44519b854
 2014-02-14 14:08:57 +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
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
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
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
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