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

186687 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Laurent
2615afb1b0 audio port: support multiple clients 
Add support for more than one audio port callback client per process.

Change-Id: I48051f27fa0b58ce4634b9db46ec8f2aa900398c
 2015-04-01 17:31:49 -07:00
Kweku Adams
05e061b141 Merge "Fixing issue related to printing out of display state and idle mode in the batterystats checkin." 2015-04-02 00:20:09 +00:00
Seigo Nonaka
77840f4e8f Merge "Fix cursor position calculation." 2015-04-02 00:07:08 +00:00
Kweku Adams
030980a1fb Fixing issue related to printing out of display state and idle mode in the batterystats checkin. 
Change-Id: I533bd53f375bf6d9f818a8e8aa75932986ad779b
 2015-04-01 16:07:48 -07:00
Andreas Gampe
80eaa6aaaf Merge "resolved conflicts for merge of 844e44c9 to master" 2015-04-01 22:58:02 +00:00
Andreas Gampe
ac038f3b69 resolved conflicts for merge of 844e44c9 to master 
Change-Id: I8f682da1a50151547f01b4d3a949852525fe6299
 2015-04-01 15:57:17 -07:00
ztenghui
d29c29270a Merge "Start searching the dimension configuration for atlas from the biggest value." 2015-04-01 22:41:39 +00:00
Santos Cordon
885b3ef519 Merge "New generic intent for SIM Activation" 2015-04-01 22:38:26 +00:00
Santos Cordon
15a13781ad New generic intent for SIM Activation 
New hidden intents and permissions for a generic SIM-activation
activity.  New activity will handle generic SIM setup requests and then
delegate to the appropriate activation method (OTASP, HFA,
CARRIER_SETUP).

Change-Id: I1b22200544abefe486ec961b67a6e77b4d15aec3
 2015-04-01 15:35:55 -07:00
Luan Nguyen
bb664e12e2 am 51d58c9f: am e5bc03da: am d7fe75d6: am 92aa846d: am d01ada25: Merge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp-docs 
* commit '51d58c9f216c727e35ebe2ce8fa253ca49434494':
  docs: Update ambient mode to mention disabling bitmap filtering
 2015-04-01 22:09:55 +00:00
Luan Nguyen
385ece87bd am fa0842fc: am 0c50a4f1: am 13803e43: am 03bafac7: am 649d839b: Merge "docs: Remove misleading information about hardware layer performance benefits for optimizing views." into lmp-docs 
* commit 'fa0842fc2468da417a0e98d6fcdc0658105f5820':
  docs: Remove misleading information about hardware layer performance benefits for optimizing views.
 2015-04-01 22:09:48 +00:00
Luan Nguyen
c588e8871b am 9c0dbf40: am b79d9912: am b9b2801d: am b2bd8f8a: am 7542c44e: Merge "docs: Add voice intent for starting a stopwatch" into lmp-docs 
* commit '9c0dbf4093aee08743b83cbee9de16eb146b5c3f':
  docs: Add voice intent for starting a stopwatch
 2015-04-01 22:09:40 +00:00
Bryce Lee
2ed3e5fba6 am d7e349e8: am 7eeaad24: am 7a1454fe: Merge "Do not use the status bar as the system decor layer if it is not visible." into lmp-mr1-modular-dev 
* commit 'd7e349e8cbfc290f1cbbf099b0b9c76e545f5357':
  Do not use the status bar as the system decor layer if it is not visible.
 2015-04-01 22:09:19 +00:00
Wale Ogunwale
fdeb796fe6 Merge "Fixed NPE when trying to animate a windows whose display is gone." 2015-04-01 21:50:25 +00:00
ztenghui
072be09aaf Start searching the dimension configuration for atlas from the biggest value. 
The old way will almost always miss the MAX_SIZE * MAX_SIZE case.
Most of time, it will be fine.
But if the threshold is just fall a bit short from MAX_SIZE * MAX_SIZE, then
it is likely that no generated configuration can be bigger than the threshold.

At the same time, a power of 2 size texture is more likely be used in the new
way. Better for memory alignment (or usage) and potential performance.

b/19966623

Change-Id: I4683fd5dea347158bc05d95cc7d777cc391b7fba
 2015-04-01 14:42:33 -07:00
Seigo Nonaka
b89a605b58 Fix cursor position calculation. 
The cursor position calculation of not well known CharSequence implementation
has problem. getTextRunCursor() returns the relative path of passed string
buffer, so need to fix the origin by adding the copied buffer origin.

BUG: 17448027
Change-Id: I413c553bfccbccee4a390b6c83aa09ac7fd04126
 2015-04-02 06:13:37 +09:00
Raph Levien
521252225e Merge "Add breakStrategy attribute to TextView" 2015-04-01 21:11:41 +00:00
Chet Haase
79274b3066 Merge "Fix Drawable.getOpacity() docs" 2015-04-01 20:54:43 +00:00
Wale Ogunwale
f16a281066 Fixed NPE when trying to animate a windows whose display is gone. 
In some cases it is possible for the AppToken.allAppWindows list to
get out of sync with the list of windows known to WMS if the client
doesn't call Session.remove(Window). This can lead to an NPE when
the animation threads runs and the display for the window has been
removed.

Also corrected some method names/scopes I ran across while debugging.

Bug: 19972099
Change-Id: Ib0ae7ede6c506f833bbdd66723b88e7504a61907
 2015-04-01 13:43:34 -07:00
Chet Haase
ffb73620a2 Fix Drawable.getOpacity() docs 
Issue #17140095 Drawable#getOpacity() is documented as ignoring custom alpha, e.g. setAlpha(). It is lying.

Change-Id: Iaef094be750c58a43e13491e7bf9d9b7e56e23d2
 2015-04-01 13:42:25 -07:00
Alan Viverette
c21d0ca48e Merge "Fix docs" 2015-04-01 20:24:20 +00:00
Alan Viverette
1579edcaba Fix docs 
Bug: 20011464
Change-Id: Ifcda3e562a3baea474b824e5ac2adcd36e17ae60
 2015-04-01 13:23:06 -07:00
Andreas Gampe
844e44c96d am 7598a248: am e816f917: Merge "Frameworks/base: Use system property for cache prune counter" 
* commit '7598a248bdbeb58a4b40ad773f39137b0dde1137':
  Frameworks/base: Use system property for cache prune counter
 2015-04-01 20:15:59 +00:00
Luan Nguyen
51d58c9f21 am e5bc03da: am d7fe75d6: am 92aa846d: am d01ada25: Merge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp-docs 
* commit 'e5bc03da07489d603df4e02754e061b37b5978d0':
  docs: Update ambient mode to mention disabling bitmap filtering
 2015-04-01 20:15:55 +00:00
Luan Nguyen
fa0842fc24 am 0c50a4f1: am 13803e43: am 03bafac7: am 649d839b: Merge "docs: Remove misleading information about hardware layer performance benefits for optimizing views." into lmp-docs 
* commit '0c50a4f15cdd120eae331545888982dccdb7b8aa':
  docs: Remove misleading information about hardware layer performance benefits for optimizing views.
 2015-04-01 20:15:50 +00:00
Luan Nguyen
9c0dbf4093 am b79d9912: am b9b2801d: am b2bd8f8a: am 7542c44e: Merge "docs: Add voice intent for starting a stopwatch" into lmp-docs 
* commit 'b79d9912c7f54ca5c5f496753ee4a316e78ac17b':
  docs: Add voice intent for starting a stopwatch
 2015-04-01 20:15:46 +00:00
Andreas Gampe
7598a248bd am e816f917: Merge "Frameworks/base: Use system property for cache prune counter" 
* commit 'e816f917e0e1c21c8019436744284630f2408dc0':
  Frameworks/base: Use system property for cache prune counter
 2015-04-01 20:10:22 +00:00
Luan Nguyen
e5bc03da07 am d7fe75d6: am 92aa846d: am d01ada25: Merge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp-docs 
* commit 'd7fe75d687935060557920ff2e515b7246958405':
  docs: Update ambient mode to mention disabling bitmap filtering
 2015-04-01 20:05:17 +00:00
Luan Nguyen
0c50a4f15c am 13803e43: am 03bafac7: am 649d839b: Merge "docs: Remove misleading information about hardware layer performance benefits for optimizing views." into lmp-docs 
* commit '13803e43b3196378d26fac8104d211b1224cb9f1':
  docs: Remove misleading information about hardware layer performance benefits for optimizing views.
 2015-04-01 20:05:11 +00:00
Luan Nguyen
b79d9912c7 am b9b2801d: am b2bd8f8a: am 7542c44e: Merge "docs: Add voice intent for starting a stopwatch" into lmp-docs 
* commit 'b9b2801da423a1ce79b8738ef7ce8d8a6e4e8532':
  docs: Add voice intent for starting a stopwatch
 2015-04-01 20:05:05 +00:00
Luan Nguyen
d7fe75d687 am 92aa846d: am d01ada25: Merge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp-docs 
* commit '92aa846daf64119d5951453c0298f83115f26d48':
  docs: Update ambient mode to mention disabling bitmap filtering
 2015-04-01 19:55:08 +00:00
Luan Nguyen
13803e43b3 am 03bafac7: am 649d839b: Merge "docs: Remove misleading information about hardware layer performance benefits for optimizing views." into lmp-docs 
* commit '03bafac781492fed392cb6bcdc8773a44076c705':
  docs: Remove misleading information about hardware layer performance benefits for optimizing views.
 2015-04-01 19:55:02 +00:00
Luan Nguyen
b9b2801da4 am b2bd8f8a: am 7542c44e: Merge "docs: Add voice intent for starting a stopwatch" into lmp-docs 
* commit 'b2bd8f8ac8405beaa5b531d1e23256315d7555bc':
  docs: Add voice intent for starting a stopwatch
 2015-04-01 19:54:52 +00:00
Andreas Gampe
e816f917e0 Merge "Frameworks/base: Use system property for cache prune counter" 2015-04-01 19:52:27 +00:00
Andreas Gampe
e324ba0e7c Frameworks/base: Use system property for cache prune counter 
Expose ART's -Xzygote-max-boot-retry through a new system property
dalvik.vm.zygote.max-boot-retry.

Bug: 19983101
Change-Id: Ib88f807e0082d71292c14c7af38e02cca5a5602c
 2015-04-01 19:50:58 +00:00
Luan Nguyen
92aa846daf am d01ada25: Merge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp-docs 
* commit 'd01ada25155ed82644b9cc23313c04d3f1a5721a':
  docs: Update ambient mode to mention disabling bitmap filtering
 2015-04-01 19:43:57 +00:00
Luan Nguyen
03bafac781 am 649d839b: Merge "docs: Remove misleading information about hardware layer performance benefits for optimizing views." into lmp-docs 
* commit '649d839b82a8fafc99ae79ba1ad5fc12218391cb':
  docs: Remove misleading information about hardware layer performance benefits for optimizing views.
 2015-04-01 19:43:54 +00:00
Luan Nguyen
b2bd8f8ac8 am 7542c44e: Merge "docs: Add voice intent for starting a stopwatch" into lmp-docs 
* commit '7542c44ee45a195404eccf50a82df7903e2ecd9c':
  docs: Add voice intent for starting a stopwatch
 2015-04-01 19:43:39 +00:00
Wale Ogunwale
356c628e1b fixed build breakage due to bad merge. again... 
Change-Id: I601bade61837e4408be083530d10c48c0595b38c
 2015-04-01 12:32:32 -07:00
Andrew Solovay
2e6d12543c am 6f09c95c: am 3e3af524: am 79c587ed: am aabcf5b5: am b2255d4f: docs: Fixed a typo. 
* commit '6f09c95c51d77c4f2a2d8d2b2271ec4d8efbea56':
  docs: Fixed a typo.
 2015-04-01 19:28:03 +00:00
Bryce Lee
d7e349e8cb am 7eeaad24: am 7a1454fe: Merge "Do not use the status bar as the system decor layer if it is not visible." into lmp-mr1-modular-dev 
* commit '7eeaad244cbd3ac49530b414fda29d8b23fae8ae':
  Do not use the status bar as the system decor layer if it is not visible.
 2015-04-01 19:27:27 +00:00
Luan Nguyen
d01ada2515 Merge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp-docs 2015-04-01 19:24:31 +00:00
Luan Nguyen
649d839b82 Merge "docs: Remove misleading information about hardware layer performance benefits for optimizing views." into lmp-docs 2015-04-01 19:23:22 +00:00
Wale Ogunwale
24904aa7b4 fixed build breakage due to bad merge. 
Change-Id: I0c6da2e831bfbe770b16a8763513b3d2895f6f60
 2015-04-01 12:22:16 -07:00
Luan Nguyen
7542c44ee4 Merge "docs: Add voice intent for starting a stopwatch" into lmp-docs 2015-04-01 19:21:41 +00:00
Bryce Lee
7eeaad244c am 7a1454fe: Merge "Do not use the status bar as the system decor layer if it is not visible." into lmp-mr1-modular-dev 
* commit '7a1454fe69bc2aa561874e550b05d5cb218bc047':
  Do not use the status bar as the system decor layer if it is not visible.
 2015-04-01 19:15:11 +00:00
Bryce Lee
7a1454fe69 Merge "Do not use the status bar as the system decor layer if it is not visible." into lmp-mr1-modular-dev 2015-04-01 19:09:34 +00:00
Alex Klyubin
3984bbc025 am 838f054f: am a4ea4726: am c461452e: Merge "Hook in user authenticators and their exceptions." 
* commit '838f054f88447d575afff105810800d95dd3eb13':
  Hook in user authenticators and their exceptions.
 2015-04-01 18:57:38 +00:00
Alex Klyubin
ef17b73c6a am 93e029e0: am f00cdf68: am c6cc9d82: Merge "A way to obtain KeyStore operation handle from crypto primitives." 
* commit '93e029e0066737f9f09f6dfef95dc664dc236b15':
  A way to obtain KeyStore operation handle from crypto primitives.
 2015-04-01 18:57:31 +00:00
Wale Ogunwale
16a6279e5f resolved conflicts for merge of 2094bf7b to master 
Change-Id: I1820d186ca602bb3cd21a15f3c23f7d6d309d43b
 2015-04-01 11:54:26 -07:00