Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,611 Commits 3 Branches 0 Tags
c56cd34dcafe0d854a3a2b234a32cf859708f1df
Commit Graph

176611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
27fbe65afe am 45930934: (-s ours) am 2ebf761e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '459309349b0653c4ba3649c1df7ecc79f472e3aa':
  Import translations. DO NOT MERGE
 2014-11-14 00:42:20 +00:00
Christopher Tate
fbec21ff43 Teach bmgr that "android" is a valid package name 
Bug 18379037

Change-Id: I4d6da2893f83e672920bbda9447aa4cbd1ecec7b
 2014-11-13 16:39:56 -08:00
Sarah Maddox
4a3dc665f7 am baec01af: am 2f8d4ea2: am f21e7d31: am aa3a93ed: am 67b0ac71: Merge "docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length." into lmp-docs 
* commit 'baec01af4bc604b1c9a93297d11b0efa2029f569':
  docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length.
 2014-11-14 00:32:49 +00:00
Sarah Maddox
baec01af4b am 2f8d4ea2: am f21e7d31: am aa3a93ed: am 67b0ac71: Merge "docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length." into lmp-docs 
* commit '2f8d4ea2064940b373c96b47d6fcdefad3732ee8':
  docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length.
 2014-11-14 00:27:54 +00:00
Sarah Maddox
2f8d4ea206 am f21e7d31: am aa3a93ed: am 67b0ac71: Merge "docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length." into lmp-docs 
* commit 'f21e7d31582b404e479d9a594f192e67e2b95d8f':
  docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length.
 2014-11-14 00:21:14 +00:00
Craig Mautner
27e579ad4e Use package name as custom resolver process name 
The process name was being assigned null. This meant that after the
process attached we weren't matching the name in
ActivityStackSupervisor.attachApplicationLocked(). That meant missing
the call to realStartActivityLocked() and then the resolver didn't
start until window manager timed out and resumeTopActivity was
called five seconds later.

Fixes bug 18301267.

Change-Id: If3721caeebb309c6054150b2f707e3d6e38a74d2
 2014-11-13 16:17:17 -08:00
John Reck
b35c9602cf Wire up surface width/height to lockHardwareCanvas 
Bug: 18338026
Change-Id: I6c37774ef1312278ae81280561060662fef923fb
 2014-11-13 16:15:08 -08:00
Mark Renouf
de7187b956 Sets windowOverscan for all Wear DeviceDefault themes. 
Without this flag, window insets will be consumed by the first View
which does not explicitly override onApplyWindowInsets. This is either
SwipeDismissLayout or the content view of the activity (if swipeDismiss
is not enabled).

BUG: 18376451
Change-Id: I5e590bad9810a9a232a6c318f715d587a3290f34
 2014-11-13 19:12:55 -05:00
Sarah Maddox
f21e7d3158 am aa3a93ed: am 67b0ac71: Merge "docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length." into lmp-docs 
* commit 'aa3a93ede76b46ef6ca0daa18ca9a6cd77c26f66':
  docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length.
 2014-11-14 00:09:12 +00:00
Andreas Gampe
e64565e0a5 Merge "Frameworks/base: Mask pdfium warning" into lmp-mr1-dev-plus-aosp 2014-11-14 00:09:02 +00:00
Andreas Gampe
f4e341d99c Frameworks/base: Mask pdfium warning 
Mask out warnings from external/.

Change-Id: I371e1346925c7eb5cdc9c4dcffab41ff0c6ddd63
 2014-11-13 16:07:13 -08:00
Chris Craik
bbac83fc79 am c3784c4d: am 6b3bf0ce: Merge "Add offset method to Outline" into lmp-mr1-dev 
* commit 'c3784c4d6140517a6927685f552fa8719353e46f':
  Add offset method to Outline
 2014-11-14 00:03:33 +00:00
Alan Viverette
8f5de8c6c0 am 96dacf36: am 24859ba0: Merge "Don\'t dismiss AutoCompleteTextView on focus change while temp detached" into lmp-mr1-dev 
* commit '96dacf3659c6fe9a1ac509ec242eb446307c6833':
  Don't dismiss AutoCompleteTextView on focus change while temp detached
 2014-11-14 00:03:27 +00:00
Alan Viverette
57f77e44c1 am d200288a: am 3fbb55c9: Merge "Make indeterminate progress alpha consistent with determinate" into lmp-mr1-dev 
* commit 'd200288a8b703d200859682baa3d6ff7afabd175':
  Make indeterminate progress alpha consistent with determinate
 2014-11-14 00:03:22 +00:00
ztenghui
bac3f5a6f0 am 9f671553: am 475569e9: Merge "Fix the starting pen\'s position when a path close." into lmp-mr1-dev 
* commit '9f67155332e49686ef622b096b715ee62845d401':
  Fix the starting pen's position when a path close.
 2014-11-14 00:03:16 +00:00
Nick Kralevich
188b609946 am e66c031d: am c9754740: Merge "fix crash on invalid base64 key" into lmp-mr1-dev 
* commit 'e66c031da48b52b8d03e59476d24dfdfdfd94551':
  fix crash on invalid base64 key
 2014-11-14 00:03:10 +00:00
kmccormick
5b5c83d797 am 99453e57: am 12780933: am 90bdbe8c: am 30aee7fc: am feb1347b: Merge "Doc update: new reg error code + snippet" into lmp-docs 
* commit '99453e5742f38ca06bcd0e0c61236105432bfe10':
  Doc update: new reg error code + snippet
 2014-11-14 00:03:03 +00:00
Jeff Sharkey
670cf5c663 am 22c3f906: am 628d2606: Merge "Move ringtone redirection to MediaPlayer." into lmp-mr1-dev 
* commit '22c3f90639fa8d74de68a63b0a13412740580845':
  Move ringtone redirection to MediaPlayer.
 2014-11-14 00:02:58 +00:00
Abhijith Shastry
0f0642075e am 530f25d6: am fb8db1c8: Merge "new sms/mms carrier app API" into lmp-mr1-dev 
* commit '530f25d629f0e78ca2e0cd372e907207d2318182':
  new sms/mms carrier app API
 2014-11-14 00:02:51 +00:00
Sarah Maddox
aa3a93ede7 am 67b0ac71: Merge "docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length." into lmp-docs 
* commit '67b0ac719a87ba52c849a6cf055ef235f230dd6e':
  docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length.
 2014-11-14 00:02:38 +00:00
Sarah Maddox
67b0ac719a Merge "docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length." into lmp-docs 2014-11-13 23:57:32 +00:00
Andreas Gampe
c25e0dcea9 am 5b50cd13: Merge "Frameworks/base: Fix build" 
* commit '5b50cd13688e0a71991b5335d3a28189e1906a2c':
  Frameworks/base: Fix build
 2014-11-13 23:55:38 +00:00
Chris Craik
c3784c4d61 am 6b3bf0ce: Merge "Add offset method to Outline" into lmp-mr1-dev 
* commit '6b3bf0ceef92d1a627360c6502f52f0237f7e50a':
  Add offset method to Outline
 2014-11-13 23:53:18 +00:00
Alan Viverette
96dacf3659 am 24859ba0: Merge "Don\'t dismiss AutoCompleteTextView on focus change while temp detached" into lmp-mr1-dev 
* commit '24859ba016f740c16113e04271ebe6b3eb61a241':
  Don't dismiss AutoCompleteTextView on focus change while temp detached
 2014-11-13 23:53:13 +00:00
Alan Viverette
d200288a8b am 3fbb55c9: Merge "Make indeterminate progress alpha consistent with determinate" into lmp-mr1-dev 
* commit '3fbb55c9061f6ea4b7bc63dfea1d86ba5bb308ad':
  Make indeterminate progress alpha consistent with determinate
 2014-11-13 23:53:08 +00:00
ztenghui
9f67155332 am 475569e9: Merge "Fix the starting pen\'s position when a path close." into lmp-mr1-dev 
* commit '475569e98a7d8d42b981df54c70974ad99336328':
  Fix the starting pen's position when a path close.
 2014-11-13 23:53:03 +00:00
Nick Kralevich
e66c031da4 am c9754740: Merge "fix crash on invalid base64 key" into lmp-mr1-dev 
* commit 'c9754740a804bb6ed870dcf6ab0cb40490551b09':
  fix crash on invalid base64 key
 2014-11-13 23:52:58 +00:00
kmccormick
99453e5742 am 12780933: am 90bdbe8c: am 30aee7fc: am feb1347b: Merge "Doc update: new reg error code + snippet" into lmp-docs 
* commit '127809334c2c576b398c1bacc34bd179aea26f7c':
  Doc update: new reg error code + snippet
 2014-11-13 23:52:54 +00:00
Jeff Sharkey
22c3f90639 am 628d2606: Merge "Move ringtone redirection to MediaPlayer." into lmp-mr1-dev 
* commit '628d2606f757da7b6734c7cd438535069f77b065':
  Move ringtone redirection to MediaPlayer.
 2014-11-13 23:50:16 +00:00
Abhijith Shastry
530f25d629 am fb8db1c8: Merge "new sms/mms carrier app API" into lmp-mr1-dev 
* commit 'fb8db1c84b7fd59f596a6c090a8035fab08ef2f5':
  new sms/mms carrier app API
 2014-11-13 23:50:12 +00:00
Andreas Gampe
5b50cd1368 Merge "Frameworks/base: Fix build" 2014-11-13 23:45:07 +00:00
Andreas Gampe
577f48c1c9 Frameworks/base: Fix build 
Fix a typo.

Change-Id: Ida417c842563576b053d9f5553a2aa8d5862897c
 2014-11-13 15:44:27 -08:00
Andreas Gampe
d99c25eff3 am 37079e29: Merge "Frameworks/base: Wall Werror in packages" 
* commit '37079e29171df20b6355244882dce9d745da55db':
  Frameworks/base: Wall Werror in packages
 2014-11-13 23:39:49 +00:00
Andreas Gampe
035a7b0235 am 0626ec58: Merge "Frameworks/base: Wall Werror in core/jni" 
* commit '0626ec58243c9dc7f4812a453ef9456b1f7ff1f4':
  Frameworks/base: Wall Werror in core/jni
 2014-11-13 23:35:22 +00:00
Miao Wang
8f3cc4582d Add Float32 suppor for IntrinsicResize. base part. 
Change-Id: I37e8826cfab92512cc641b106a42723162bffe58
 2014-11-13 15:32:18 -08:00
Andreas Gampe
37079e2917 Merge "Frameworks/base: Wall Werror in packages" 2014-11-13 23:29:31 +00:00
Andreas Gampe
423ba098bd Frameworks/base: Wall Werror in packages 
Turn on -Wall -Werror in packages/. Fix warnings.

Change-Id: I4ec7256a7df46017e1895575719f2b5aca978bd0
 2014-11-13 15:25:34 -08:00
Prashant Malani
33538249f2 Don't animate screen brightness if there is a pending off transition 
When the DisplayPowerRequest policy is POLICY_OFF, a screen state
transition animation to DISPLAY_OFF is intiated. However, in
updatePowerState() the screen brightness setting, based on the current
display state, is set to normal brightness and an animation is
triggered. This causes a transient flash on some devices, which are
transitioning from a dimmed screen to screen off.

This change checks for a pending screen off transition before
triggering a screen brightness animation, to prevent the flashes.

Bug: 18136235
Change-Id: I37f9fb28b3ec8a4fdbb45920c40d25ebd50c220b
 2014-11-13 15:23:27 -08:00
Andreas Gampe
0626ec5824 Merge "Frameworks/base: Wall Werror in core/jni" 2014-11-13 23:21:36 +00:00
Andreas Gampe
0f0b491966 Frameworks/base: Wall Werror in core/jni 
Turn on -Wall -Werror in core/jni. Fix warnings.

Clang TODO: For GCC we need to turn off Wunused-but-set-variable in
the GL bindings. However, Clang doesn't have that warning and thus
complains about an unknown pragma. It is necessary to make the
pragma #ifdef-ed on the compiler being GCC.

Change-Id: I14cab48d45c2771eef0432082356c47ed44a3d7f
 2014-11-13 15:20:37 -08:00
Ruben Brunk
0c22e6919a camera2: Add READ_SETTINGS capability. 
Bug: 18281970
Change-Id: I28be92a85f0a843c690f9ff49263440cd871e40d
 2014-11-13 15:15:07 -08:00
Alan Viverette
d03963ce36 Set current degrees when updating RotateDrawable from typed array 
This regressed after enabling theming in RotateDrawable.

BUG: 18288235
Change-Id: I61a7b2c178253ed2d550fa0636e27e021ac9eb64
 2014-11-13 15:14:36 -08:00
Alan Viverette
9538eea5ff Ignore accessibility overlays during visible window computation 
Previously, the conditional for checking the layer type before
accounting for the window bounds was incorrectly inverted, but
we can simplify by just skipping accessibility overlay windows
completely.

BUG: 18358878
BUG: 18359820
BUG: 18359788
Change-Id: I9ba1e43a0fef4fa40693bd8c7e883c2ef45b4c4d
 2014-11-13 23:07:05 +00:00
Chris Craik
6b3bf0ceef Merge "Add offset method to Outline" into lmp-mr1-dev 2014-11-13 22:46:22 +00:00
Alan Viverette
24859ba016 Merge "Don't dismiss AutoCompleteTextView on focus change while temp detached" into lmp-mr1-dev 2014-11-13 22:45:12 +00:00
Alan Viverette
3fbb55c906 Merge "Make indeterminate progress alpha consistent with determinate" into lmp-mr1-dev 2014-11-13 22:44:13 +00:00
ztenghui
475569e98a Merge "Fix the starting pen's position when a path close." into lmp-mr1-dev 2014-11-13 22:41:55 +00:00
Nick Kralevich
c9754740a8 Merge "fix crash on invalid base64 key" into lmp-mr1-dev 2014-11-13 22:37:03 +00:00
kmccormick
127809334c am 90bdbe8c: am 30aee7fc: am feb1347b: Merge "Doc update: new reg error code + snippet" into lmp-docs 
* commit '90bdbe8c999df88330b28daa492eeb4425863dab':
  Doc update: new reg error code + snippet
 2014-11-13 22:34:03 +00:00
Winson Chung
90d5136ebd Fixing crash in querying the task stack from a fresh load plan. (Bug 18371946) 2014-11-13 14:30:26 -08:00