OSDN Git Service
Jeff Brown [Thu, 2 Apr 2015 23:12:50 +0000 (23:12 +0000)]
Merge "Clarify settings update code."
Tenghui Zhu [Thu, 2 Apr 2015 22:59:17 +0000 (22:59 +0000)]
Merge "Revert "Revert "Use AVD for checkbox animation."""
Chris Craik [Thu, 2 Apr 2015 22:38:48 +0000 (22:38 +0000)]
Merge "Add compat path for restore underflow"
Chris Craik [Thu, 2 Apr 2015 22:28:08 +0000 (15:28 -0700)]
Add compat path for restore underflow
bug:
19829784
Change-Id: Ia761664208ab80c055ca11174db3ddc74457b92b
Alex Klyubin [Thu, 2 Apr 2015 22:02:45 +0000 (22:02 +0000)]
am
58031d5e: am
378df98e: am
3cc9e5d6: Merge "Improve the AndroidKeyStore-backed HMAC state machine."
* commit '
58031d5eb5531f8bc45ac1789ea1cc9134591358':
Improve the AndroidKeyStore-backed HMAC state machine.
Alex Klyubin [Thu, 2 Apr 2015 21:58:27 +0000 (14:58 -0700)]
resolved conflicts for merge of
e7e705d4 to master
Change-Id: If3e8c985f4f122f9fb36aab206787aac1407a74e
Alex Klyubin [Thu, 2 Apr 2015 21:34:52 +0000 (21:34 +0000)]
am
378df98e: am
3cc9e5d6: Merge "Improve the AndroidKeyStore-backed HMAC state machine."
* commit '
378df98eab65547f62cb900e9dca0b7419095755':
Improve the AndroidKeyStore-backed HMAC state machine.
Alex Klyubin [Thu, 2 Apr 2015 21:34:48 +0000 (21:34 +0000)]
am
acee5b2b: am
9635a56a: Merge "Expose new key use constraints in KeyPairGeneratorSpec."
* commit '
acee5b2b4902479fabfb557aba745d352d49ce1a':
Expose new key use constraints in KeyPairGeneratorSpec.
Alex Klyubin [Thu, 2 Apr 2015 21:25:56 +0000 (21:25 +0000)]
am
3cc9e5d6: Merge "Improve the AndroidKeyStore-backed HMAC state machine."
* commit '
3cc9e5d68d89ea1ffa79ad6981585bc46362c4a7':
Improve the AndroidKeyStore-backed HMAC state machine.
Alex Klyubin [Thu, 2 Apr 2015 21:25:50 +0000 (21:25 +0000)]
am
9635a56a: Merge "Expose new key use constraints in KeyPairGeneratorSpec."
* commit '
9635a56acfe3318d9ae5020727090a2dc8c118d0':
Expose new key use constraints in KeyPairGeneratorSpec.
Alex Klyubin [Thu, 2 Apr 2015 21:06:27 +0000 (21:06 +0000)]
Merge "Improve the AndroidKeyStore-backed HMAC state machine."
Alex Klyubin [Thu, 2 Apr 2015 21:04:08 +0000 (21:04 +0000)]
am
a44e7fd6: am
957e982c: am
d2eec1a7: Merge "Add exception types for AndroidKeyStore key validity issues."
* commit '
a44e7fd6228638f25472e331241a5d1f5cfaacbf':
Add exception types for AndroidKeyStore key validity issues.
Alex Klyubin [Thu, 2 Apr 2015 21:03:11 +0000 (21:03 +0000)]
Merge "Expose new key use constraints in KeyPairGeneratorSpec."
Alex Klyubin [Thu, 2 Apr 2015 20:53:05 +0000 (20:53 +0000)]
am
957e982c: am
d2eec1a7: Merge "Add exception types for AndroidKeyStore key validity issues."
* commit '
957e982cd5fdbf45817500abf68fe8a0689adc34':
Add exception types for AndroidKeyStore key validity issues.
Alex Klyubin [Thu, 2 Apr 2015 20:42:59 +0000 (20:42 +0000)]
am
d2eec1a7: Merge "Add exception types for AndroidKeyStore key validity issues."
* commit '
d2eec1a7865dd552114b330fce1a1472a9e08806':
Add exception types for AndroidKeyStore key validity issues.
Andrew Solovay [Thu, 2 Apr 2015 20:38:20 +0000 (20:38 +0000)]
am
93b3d665: am
7818f205: am
f99a16c9: am
589a272e: am
f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs
* commit '
93b3d6658762a84b23cd3421d0f41e4d82693cc3':
docs: Fixed formatting in android:documentLaunchMode syntax section
Yuichi Araki [Thu, 2 Apr 2015 20:38:08 +0000 (20:38 +0000)]
am
428c2fa0: am
c3fbf13d: am
e2fc3adb: am
61ce6c9b: am
776cf41d: Fix a broken link in javadoc
* commit '
428c2fa0f8b3c49e8bd48458c15363fcd98e8944':
Fix a broken link in javadoc
Andrew Solovay [Thu, 2 Apr 2015 20:29:28 +0000 (20:29 +0000)]
am
7818f205: am
f99a16c9: am
589a272e: am
f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs
* commit '
7818f205e5b18d8d7fddcf01736d546cb08bfd62':
docs: Fixed formatting in android:documentLaunchMode syntax section
Yuichi Araki [Thu, 2 Apr 2015 20:29:24 +0000 (20:29 +0000)]
am
c3fbf13d: am
e2fc3adb: am
61ce6c9b: am
776cf41d: Fix a broken link in javadoc
* commit '
c3fbf13d525a0bcf1202618b197f4160750b54f1':
Fix a broken link in javadoc
Alex Klyubin [Thu, 2 Apr 2015 20:24:47 +0000 (20:24 +0000)]
Merge "Add exception types for AndroidKeyStore key validity issues."
Andrew Solovay [Thu, 2 Apr 2015 20:19:15 +0000 (20:19 +0000)]
am
f99a16c9: am
589a272e: am
f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs
* commit '
f99a16c943a4366bdfdba19534457f9e45538f7d':
docs: Fixed formatting in android:documentLaunchMode syntax section
Yuichi Araki [Thu, 2 Apr 2015 20:19:09 +0000 (20:19 +0000)]
am
e2fc3adb: am
61ce6c9b: am
776cf41d: Fix a broken link in javadoc
* commit '
e2fc3adbb4040400496aebdab80c4cac1083da27':
Fix a broken link in javadoc
Andrew Solovay [Thu, 2 Apr 2015 20:10:55 +0000 (20:10 +0000)]
am
589a272e: am
f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs
* commit '
589a272e97d1f24abee1bdfce18ab88cbd5f12a9':
docs: Fixed formatting in android:documentLaunchMode syntax section
Yuichi Araki [Thu, 2 Apr 2015 20:10:48 +0000 (20:10 +0000)]
am
61ce6c9b: am
776cf41d: Fix a broken link in javadoc
* commit '
61ce6c9b705e41800662b33601c01a4848c174d3':
Fix a broken link in javadoc
Andrew Solovay [Thu, 2 Apr 2015 19:56:41 +0000 (19:56 +0000)]
am
f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs
* commit '
f2ff12ba00ba7c290bc15ea28fdcf3c6d6d1029a':
docs: Fixed formatting in android:documentLaunchMode syntax section
Yuichi Araki [Thu, 2 Apr 2015 19:56:35 +0000 (19:56 +0000)]
am
776cf41d: Fix a broken link in javadoc
* commit '
776cf41d7c8f239d20397886f2120407396cfc87':
Fix a broken link in javadoc
Andrew Solovay [Thu, 2 Apr 2015 19:25:24 +0000 (19:25 +0000)]
Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs
Jeff Davidson [Thu, 2 Apr 2015 18:55:14 +0000 (18:55 +0000)]
Merge "Actually allow all valid characters in a Wi-Fi SSID."
Jorim Jaggi [Thu, 2 Apr 2015 18:44:36 +0000 (18:44 +0000)]
Merge "Change light status bar tint color to spec"
Jorim Jaggi [Fri, 20 Mar 2015 21:39:24 +0000 (14:39 -0700)]
Change light status bar tint color to spec
Bug:
19233606
Change-Id: I0586e006b6783d3af23defb67da666477484c1ee
Dianne Hackborn [Thu, 2 Apr 2015 18:18:40 +0000 (18:18 +0000)]
Merge "Rework assist to walk down the view hierarchy."
John Spurlock [Thu, 2 Apr 2015 16:24:02 +0000 (12:24 -0400)]
Add new notification category for reminders.
Bug:
20045407
Change-Id: I5c449551fb7ec5a3e2c350f443e1a18b84b4d03f
John Spurlock [Thu, 2 Apr 2015 18:10:49 +0000 (18:10 +0000)]
Merge "Introduce new volume dialog."
John Spurlock [Wed, 25 Mar 2015 22:09:51 +0000 (18:09 -0400)]
Introduce new volume dialog.
- New VolumeDialog (presentation) + VolumeDialogController (state)
to implement a volume dialog that keeps track of multiple audio
streams, including all remote streams.
- The dialog starts out with a single stream, with more detail available
behind an expand chevron.
- Existing zen options reorganized under a master switch bar
named "Block interruptions", with "None" renamed to "No interruptions"
and "Priority" renamed to "Priority only".
- Combined "Block interruptions" icon replaces the now-obsolete star/no-smoking
icons in the status bar.
- New icons for all sliders.
- All sliders present a continuous facade, mapped to discrete integer units
under the hood.
- All interesting volume events and state changes piped through one central
helper for future routing.
- VolumePanel is obsolete, still accessible via a sysprop if needed.
Complete removal / garbage collection deferred until all needed
functionality is ported over.
Bug:
19260237
Change-Id: I6689de3e4d14ae666d3e8da302cc9da2d4d77b9b
Alan Viverette [Thu, 2 Apr 2015 18:02:03 +0000 (18:02 +0000)]
Merge "Fix issues with theming of preloaded ColorStateLists"
Wale Ogunwale [Thu, 2 Apr 2015 17:34:28 +0000 (10:34 -0700)]
resolved conflicts for merge of
65073b91 to master
Change-Id: I65a9d95caa98ec33e41480546b4447ec787c6840
Olawale Ogunwale [Thu, 2 Apr 2015 17:10:51 +0000 (17:10 +0000)]
am
9987b6e8: am
e4d4e22f: Merge "[ActivityManager] Avoid improper resume top activity."
* commit '
9987b6e867d862c27cd1339d7fa8135b75d565f1':
[ActivityManager] Avoid improper resume top activity.
Alex Klyubin [Thu, 2 Apr 2015 16:58:08 +0000 (09:58 -0700)]
Expose new key use constraints in KeyPairGeneratorSpec.
The constraints are currently ignored.
Bug:
18088752
Change-Id: Iabd2018200afb2bf8ac1748d1def47af74bfb9d3
Olawale Ogunwale [Thu, 2 Apr 2015 17:00:12 +0000 (17:00 +0000)]
am
e4d4e22f: Merge "[ActivityManager] Avoid improper resume top activity."
* commit '
e4d4e22f26bfd36a553fb24232d2fd4ddf4fc907':
[ActivityManager] Avoid improper resume top activity.
Olawale Ogunwale [Thu, 2 Apr 2015 16:39:18 +0000 (16:39 +0000)]
Merge "[ActivityManager] Avoid improper resume top activity."
Filip Gruszczynski [Thu, 2 Apr 2015 15:57:07 +0000 (15:57 +0000)]
Merge "Provide size hint inside UNSPECIFIED measure spec."
Jason Monk [Thu, 2 Apr 2015 12:58:38 +0000 (12:58 +0000)]
Merge "Change carrier text to 'airplane mode' when on"
riddle_hsu [Thu, 2 Apr 2015 08:43:13 +0000 (16:43 +0800)]
[ActivityManager] Avoid improper resume top activity.
When there is a process died, only resume top if
it contains visible activity.
This can fix case 1 in
https://android-review.googlesource.com/#/c/120901/
Change-Id: I45584e76f9e863980d04bbb593d7d26a8900acd0
Yuichi Araki [Fri, 20 Mar 2015 09:01:02 +0000 (18:01 +0900)]
Fix a broken link in javadoc
Bug:
19856130
Change-Id: I0456e951f8bed36e3a62ddfd882f9c2d2bef9627
Jim Miller [Thu, 2 Apr 2015 03:09:38 +0000 (03:09 +0000)]
Merge "Prepare to make Fingerprint API public."
Etan Cohen [Thu, 2 Apr 2015 03:07:28 +0000 (03:07 +0000)]
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
Eric Gilmore [Thu, 2 Apr 2015 02:58:42 +0000 (02:58 +0000)]
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.
Elliott Hughes [Thu, 2 Apr 2015 02:58:34 +0000 (02:58 +0000)]
am
095428d2: am
d15958f6: am
64c8a073: Merge "Early return in RemoteViewsAdapter is too late"
* commit '
095428d262f1cb0cf09d8722fdd9a53661d7513b':
Early return in RemoteViewsAdapter is too late
Alan Viverette [Thu, 2 Apr 2015 02:51:22 +0000 (02:51 +0000)]
Merge "Scale month view for small screens, use verbatim span for AM/PM label"
Eric Gilmore [Thu, 2 Apr 2015 02:33:33 +0000 (02:33 +0000)]
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.
Elliott Hughes [Thu, 2 Apr 2015 02:33:15 +0000 (02:33 +0000)]
am
d15958f6: am
64c8a073: Merge "Early return in RemoteViewsAdapter is too late"
* commit '
d15958f661c8748b811e6b12642321f4e47f2817':
Early return in RemoteViewsAdapter is too late
Jim Miller [Wed, 1 Apr 2015 00:24:34 +0000 (17:24 -0700)]
Prepare to make Fingerprint API public.
- move fingerprint support files into hardware area
- move jni into services/core
Change-Id: I48a8e43d6d328fb66d79919c255e4c44e984b4d1
Eric Laurent [Thu, 2 Apr 2015 02:03:02 +0000 (02:03 +0000)]
Merge "audio port: support multiple clients"
Scott Rowe [Thu, 2 Apr 2015 01:39:39 +0000 (01:39 +0000)]
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
Alex Klyubin [Wed, 1 Apr 2015 21:41:28 +0000 (14:41 -0700)]
Add fingerprint-specific AndroidKeyStore API.
Bug:
18088752
Change-Id: I333d3ffc820d28ae678e28dafc2e8a24cb7eb073
Eric Gilmore [Thu, 2 Apr 2015 01:31:30 +0000 (01:31 +0000)]
am
7278d89c: am
f2204720: am
b2b93762: Merge "Changing wording to reflect c2dm shutdown." into lmp-docs
* commit '
7278d89c1b51bc937e79021eae523dfd0f3d30a1':
Changing wording to reflect c2dm shutdown.
Alex Klyubin [Thu, 2 Apr 2015 01:24:53 +0000 (01:24 +0000)]
Merge "resolved conflicts for merge of
261e7a37 to master"
Alex Klyubin [Thu, 2 Apr 2015 01:21:35 +0000 (18:21 -0700)]
resolved conflicts for merge of
261e7a37 to master
Change-Id: If0a3389764965fe27bf567090a6e24069b61c544
Elliott Hughes [Thu, 2 Apr 2015 01:13:09 +0000 (01:13 +0000)]
am
64c8a073: Merge "Early return in RemoteViewsAdapter is too late"
* commit '
64c8a07345cb7cb01b3e98442b52c51d473fbf2d':
Early return in RemoteViewsAdapter is too late
Alex Klyubin [Thu, 2 Apr 2015 01:10:02 +0000 (01:10 +0000)]
am
66b96b59: am
78014a78: am
04047af6: Merge "Use Keymaster-friendly validity dates."
* commit '
66b96b59774838998b1e67f83f3d67be5cc3a3e2':
Use Keymaster-friendly validity dates.
Eric Gilmore [Thu, 2 Apr 2015 01:06:52 +0000 (01:06 +0000)]
am
f2204720: am
b2b93762: Merge "Changing wording to reflect c2dm shutdown." into lmp-docs
* commit '
f2204720eac6fd959eb5a3732c0084636bc16095':
Changing wording to reflect c2dm shutdown.
Lorenzo Colitti [Thu, 2 Apr 2015 01:03:58 +0000 (01:03 +0000)]
Merge "Deal with null characters in string options."
Eric Gilmore [Thu, 2 Apr 2015 00:59:34 +0000 (00:59 +0000)]
am
b2b93762: Merge "Changing wording to reflect c2dm shutdown." into lmp-docs
* commit '
b2b93762b8165ee47f49765816fc7ba0428c371c':
Changing wording to reflect c2dm shutdown.
Eric Laurent [Wed, 25 Mar 2015 21:51:08 +0000 (14:51 -0700)]
audio port: support multiple clients
Add support for more than one audio port callback client per process.
Change-Id: I48051f27fa0b58ce4634b9db46ec8f2aa900398c
Kweku Adams [Thu, 2 Apr 2015 00:20:08 +0000 (00:20 +0000)]
Merge "Fixing issue related to printing out of display state and idle mode in the batterystats checkin."
Tenghui Zhu [Thu, 2 Apr 2015 00:18:20 +0000 (00:18 +0000)]
Revert "Revert "Use AVD for checkbox animation.""
This reverts commit
c243221435dcaa43ae132b49b2b8bf4bdb62783a.
Change-Id: Ie77ddca201d1661482e3361b5db12eb0d6a81a89
Alan Viverette [Thu, 2 Apr 2015 00:14:45 +0000 (17:14 -0700)]
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
Dianne Hackborn [Wed, 1 Apr 2015 23:45:03 +0000 (16:45 -0700)]
Rework assist to walk down the view hierarchy.
Instead of collecting all of the data directly in AssistStructure,
we now have a dispatch mechanism down the hierarchy to do so.
While doing this, also added the ability to automatically collect
assist data from AccessibilityNodeProviders attached to views
(so now we see all of the data in for example Calendar).
This is a first step needed towards being able to asynchronously
populate assist data.
Change-Id: I59ee1ea104ca8207bad8df7a38195d93da1adea7
Seigo Nonaka [Thu, 2 Apr 2015 00:07:05 +0000 (00:07 +0000)]
Merge "Fix cursor position calculation."
Elliott Hughes [Wed, 1 Apr 2015 23:34:24 +0000 (23:34 +0000)]
Merge "Early return in RemoteViewsAdapter is too late"
Alex Klyubin [Wed, 1 Apr 2015 23:22:00 +0000 (16:22 -0700)]
Add exception types for AndroidKeyStore key validity issues.
Bug:
18088752
Change-Id: I7494cb6a793e2b57bb849a4253bba2803778c161
Eric Gilmore [Wed, 1 Apr 2015 23:13:25 +0000 (23:13 +0000)]
Merge "Changing wording to reflect c2dm shutdown." into lmp-docs
Kweku Adams [Wed, 1 Apr 2015 23:07:48 +0000 (16:07 -0700)]
Fixing issue related to printing out of display state and idle mode in the batterystats checkin.
Change-Id: I533bd53f375bf6d9f818a8e8aa75932986ad779b
Alex Klyubin [Wed, 1 Apr 2015 23:03:03 +0000 (16:03 -0700)]
Improve the AndroidKeyStore-backed HMAC state machine.
This defers the start of a new KeyStore operation after Mac.doFinal
until the next Mac.update or .doFinal. Previously, the a new KeyStore
operation was started immediately, at the end of doFinal.
Bug:
18088752
Change-Id: I2d594067ef261f519631d09f7a6087b715801656
Andreas Gampe [Wed, 1 Apr 2015 22:58:01 +0000 (22:58 +0000)]
Merge "resolved conflicts for merge of
844e44c9 to master"
Andreas Gampe [Wed, 1 Apr 2015 22:57:17 +0000 (15:57 -0700)]
resolved conflicts for merge of
844e44c9 to master
Change-Id: I8f682da1a50151547f01b4d3a949852525fe6299
ztenghui [Wed, 1 Apr 2015 22:41:39 +0000 (22:41 +0000)]
Merge "Start searching the dimension configuration for atlas from the biggest value."
Santos Cordon [Wed, 1 Apr 2015 22:38:25 +0000 (22:38 +0000)]
Merge "New generic intent for SIM Activation"
Santos Cordon [Wed, 1 Apr 2015 01:32:31 +0000 (18:32 -0700)]
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
Luan Nguyen [Wed, 1 Apr 2015 22:09:55 +0000 (22:09 +0000)]
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
Luan Nguyen [Wed, 1 Apr 2015 22:09:48 +0000 (22:09 +0000)]
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.
Luan Nguyen [Wed, 1 Apr 2015 22:09:40 +0000 (22:09 +0000)]
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
Bryce Lee [Wed, 1 Apr 2015 22:09:19 +0000 (22:09 +0000)]
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.
Scott Rowe [Wed, 1 Apr 2015 21:58:23 +0000 (21:58 +0000)]
am
0f2f0350: am
5f78af44: am
a03245a3: am
4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs
* commit '
0f2f03506654e6669db64147e9f22340c24629e8':
docs: Building Live TV Apps
Wale Ogunwale [Wed, 1 Apr 2015 21:50:24 +0000 (21:50 +0000)]
Merge "Fixed NPE when trying to animate a windows whose display is gone."
Scott Rowe [Wed, 1 Apr 2015 21:46:45 +0000 (21:46 +0000)]
am
5f78af44: am
a03245a3: am
4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs
* commit '
5f78af44bd9627dace7db4ce47fdf61cf8d78b42':
docs: Building Live TV Apps
ztenghui [Wed, 1 Apr 2015 20:26:08 +0000 (13:26 -0700)]
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
Scott Rowe [Wed, 1 Apr 2015 21:35:39 +0000 (21:35 +0000)]
am
a03245a3: am
4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs
* commit '
a03245a343fe7906e4459b6a4dfcc41f60c56fd6':
docs: Building Live TV Apps
Scott Rowe [Wed, 1 Apr 2015 21:25:53 +0000 (21:25 +0000)]
am
4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs
* commit '
4fc3d3ff404c777e07616b704c68176d9060c4e4':
docs: Building Live TV Apps
Seigo Nonaka [Wed, 1 Apr 2015 13:35:25 +0000 (22:35 +0900)]
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
Raph Levien [Wed, 1 Apr 2015 21:11:40 +0000 (21:11 +0000)]
Merge "Add breakStrategy attribute to TextView"
Scott Rowe [Wed, 1 Apr 2015 21:05:41 +0000 (21:05 +0000)]
Merge "docs: Building Live TV Apps" into lmp-docs
Chet Haase [Wed, 1 Apr 2015 20:54:43 +0000 (20:54 +0000)]
Merge "Fix Drawable.getOpacity() docs"
Alex Klyubin [Wed, 1 Apr 2015 20:48:17 +0000 (20:48 +0000)]
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.
Wale Ogunwale [Wed, 1 Apr 2015 18:23:15 +0000 (11:23 -0700)]
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
Chet Haase [Wed, 1 Apr 2015 20:37:09 +0000 (13:37 -0700)]
Fix Drawable.getOpacity() docs
Issue #
17140095 Drawable#getOpacity() is documented as ignoring custom alpha, e.g. setAlpha(). It is lying.
Change-Id: Iaef094be750c58a43e13491e7bf9d9b7e56e23d2
Alex Klyubin [Wed, 1 Apr 2015 20:38:07 +0000 (20:38 +0000)]
am
97467d82: Merge "Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString."
* commit '
97467d82a31964e36cb6bc32ac4cf00e884c190e':
Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString.
Alex Klyubin [Wed, 1 Apr 2015 20:31:42 +0000 (20:31 +0000)]
am
78014a78: am
04047af6: Merge "Use Keymaster-friendly validity dates."
* commit '
78014a78155ad05ca2e0af600c0545377c04bdbd':
Use Keymaster-friendly validity dates.
Alan Viverette [Wed, 1 Apr 2015 20:24:17 +0000 (20:24 +0000)]
Merge "Fix docs"
Alan Viverette [Wed, 1 Apr 2015 20:23:06 +0000 (13:23 -0700)]
Fix docs
Bug:
20011464
Change-Id: Ifcda3e562a3baea474b824e5ac2adcd36e17ae60