Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
186,786 Commits 3 Branches 0 Tags
cdf0a97f387eba1d5954273bad02b00e6df6d49f
Commit Graph

186786 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
cdf0a97f38 Merge "Change carrier text to 'airplane mode' when on" 2015-04-02 12:58:39 +00:00
Jim Miller
0feaaafd7a Merge "Prepare to make Fingerprint API public." 2015-04-02 03:09:39 +00:00
Etan Cohen
36711e0e2c Merge changes from topic 'mwd-merge-040115' 
* changes:
  Merge (manually) pag/209446: Increase allowed duration to connect to HOGP profile
  Merge commit 'd91f193' into merge2
  Merge commit '5718646' into merge2
  Merge commit '7aa0345' into merge2
 2015-04-02 03:08:02 +00:00
Eric Gilmore
ae896d3188 am 82a7e2a8: am a16d42cd: am 7278d89c: am f2204720: am b2b93762: Merge "Changing wording to reflect c2dm shutdown." into lmp-docs 
* commit '82a7e2a8dde29613dacf2add9be0acc867ffb576':
  Changing wording to reflect c2dm shutdown.
 2015-04-02 02:58:42 +00:00
Elliott Hughes
d14f7f12a1 am 095428d2: am d15958f6: am 64c8a073: Merge "Early return in RemoteViewsAdapter is too late" 
* commit '095428d262f1cb0cf09d8722fdd9a53661d7513b':
  Early return in RemoteViewsAdapter is too late
 2015-04-02 02:58:34 +00:00
Alan Viverette
0048b6e629 Merge "Scale month view for small screens, use verbatim span for AM/PM label" 2015-04-02 02:51:24 +00:00
Eric Gilmore
82a7e2a8dd am a16d42cd: am 7278d89c: am f2204720: am b2b93762: Merge "Changing wording to reflect c2dm shutdown." into lmp-docs 
* commit 'a16d42cd4ff9ed66eda1d9b983058b598e7b60d1':
  Changing wording to reflect c2dm shutdown.
 2015-04-02 02:33:33 +00:00
Elliott Hughes
095428d262 am d15958f6: am 64c8a073: Merge "Early return in RemoteViewsAdapter is too late" 
* commit 'd15958f661c8748b811e6b12642321f4e47f2817':
  Early return in RemoteViewsAdapter is too late
 2015-04-02 02:33:15 +00:00
Jim Miller
ebbf205bc6 Prepare to make Fingerprint API public. 
- move fingerprint support files into hardware area
- move jni into services/core

Change-Id: I48a8e43d6d328fb66d79919c255e4c44e984b4d1
 2015-04-01 19:20:08 -07:00
Eric Laurent
1b76e4b0db Merge "audio port: support multiple clients" 2015-04-02 02:03:03 +00:00
Scott Rowe
991d45b4fd am bb18c2d4: am 0f2f0350: am 5f78af44: am a03245a3: am 4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs 
* commit 'bb18c2d4ab7ed592810eb9031a892fb4748ecadc':
  docs: Building Live TV Apps
 2015-04-02 01:39:39 +00:00
Alex Klyubin
2ea13d4268 Add fingerprint-specific AndroidKeyStore API. 
Bug: 18088752
Change-Id: I333d3ffc820d28ae678e28dafc2e8a24cb7eb073
 2015-04-01 18:35:36 -07:00
Eric Gilmore
a16d42cd4f am 7278d89c: am f2204720: am b2b93762: Merge "Changing wording to reflect c2dm shutdown." into lmp-docs 
* commit '7278d89c1b51bc937e79021eae523dfd0f3d30a1':
  Changing wording to reflect c2dm shutdown.
 2015-04-02 01:31:30 +00:00
Alex Klyubin
6c3d3db3b4 Merge "resolved conflicts for merge of 261e7a37 to master" 2015-04-02 01:24:54 +00:00
Alex Klyubin
305ebe207a resolved conflicts for merge of 261e7a37 to master 
Change-Id: If0a3389764965fe27bf567090a6e24069b61c544
 2015-04-01 18:23:27 -07:00
Elliott Hughes
d15958f661 am 64c8a073: Merge "Early return in RemoteViewsAdapter is too late" 
* commit '64c8a07345cb7cb01b3e98442b52c51d473fbf2d':
  Early return in RemoteViewsAdapter is too late
 2015-04-02 01:13:09 +00:00
Alex Klyubin
56a33230b7 am 66b96b59: am 78014a78: am 04047af6: Merge "Use Keymaster-friendly validity dates." 
* commit '66b96b59774838998b1e67f83f3d67be5cc3a3e2':
  Use Keymaster-friendly validity dates.
 2015-04-02 01:10:02 +00:00
Eric Gilmore
7278d89c1b am f2204720: am b2b93762: Merge "Changing wording to reflect c2dm shutdown." into lmp-docs 
* commit 'f2204720eac6fd959eb5a3732c0084636bc16095':
  Changing wording to reflect c2dm shutdown.
 2015-04-02 01:06:52 +00:00
Lorenzo Colitti
25e9d87b11 Merge "Deal with null characters in string options." 2015-04-02 01:04:00 +00:00
Eric Gilmore
f2204720ea am b2b93762: Merge "Changing wording to reflect c2dm shutdown." into lmp-docs 
* commit 'b2b93762b8165ee47f49765816fc7ba0428c371c':
  Changing wording to reflect c2dm shutdown.
 2015-04-02 00:59:34 +00:00
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
Alan Viverette
f63757b7a6 Scale month view for small screens, use verbatim span for AM/PM label 
Also fixes initial day selection in DatePickerDialog.

Bug: 19933912
Bug: 19937345
Change-Id: I88264a192c087361dbf21b055e74e1facf2506bc
 2015-04-01 17:14:45 -07:00
Seigo Nonaka
77840f4e8f Merge "Fix cursor position calculation." 2015-04-02 00:07:08 +00:00
Elliott Hughes
64c8a07345 Merge "Early return in RemoteViewsAdapter is too late" 2015-04-01 23:34:25 +00:00
Eric Gilmore
b2b93762b8 Merge "Changing wording to reflect c2dm shutdown." into lmp-docs 2015-04-01 23:13:26 +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
Scott Rowe
bb18c2d4ab am 0f2f0350: am 5f78af44: am a03245a3: am 4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs 
* commit '0f2f03506654e6669db64147e9f22340c24629e8':
  docs: Building Live TV Apps
 2015-04-01 21:58:23 +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
Scott Rowe
0f2f035066 am 5f78af44: am a03245a3: am 4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs 
* commit '5f78af44bd9627dace7db4ce47fdf61cf8d78b42':
  docs: Building Live TV Apps
 2015-04-01 21:46:45 +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
Scott Rowe
5f78af44bd am a03245a3: am 4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs 
* commit 'a03245a343fe7906e4459b6a4dfcc41f60c56fd6':
  docs: Building Live TV Apps
 2015-04-01 21:35:39 +00:00
Scott Rowe
a03245a343 am 4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs 
* commit '4fc3d3ff404c777e07616b704c68176d9060c4e4':
  docs: Building Live TV Apps
 2015-04-01 21:25:53 +00: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
Scott Rowe
4fc3d3ff40 Merge "docs: Building Live TV Apps" into lmp-docs 2015-04-01 21:05:42 +00:00
Chet Haase
79274b3066 Merge "Fix Drawable.getOpacity() docs" 2015-04-01 20:54:43 +00:00
Alex Klyubin
261e7a37df am 39b99186: am 97467d82: Merge "Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString." 
* commit '39b9918631061340361b7776ace9b9cd4b25be7c':
  Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString.
 2015-04-01 20:48:17 +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
Alex Klyubin
39b9918631 am 97467d82: Merge "Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString." 
* commit '97467d82a31964e36cb6bc32ac4cf00e884c190e':
  Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString.
 2015-04-01 20:38:07 +00:00