OSDN Git Service
Deepanshu Gupta [Fri, 9 Oct 2015 21:54:19 +0000 (14:54 -0700)]
LayoutLib: Fix android:dependency for preferences.
Bug: http://b.android.com/189314
Change-Id: I229632d11a2529e865f3f2e8eca3a78b47ad462c
Deepanshu Gupta [Wed, 7 Oct 2015 18:47:50 +0000 (11:47 -0700)]
LayoutLib: Fix ring rendering.
Bug: http://b.android.com/65503
Change-Id: I6ed901703cffee345f3083ea3ddeb52a28f4ac64
Deepanshu Gupta [Wed, 7 Oct 2015 17:08:30 +0000 (17:08 +0000)]
Merge "Skip drawing empty shapes to keep Apple JRE happy." into mnc-ub-dev
Deepanshu Gupta [Wed, 7 Oct 2015 16:26:46 +0000 (09:26 -0700)]
Skip drawing empty shapes to keep Apple JRE happy.
Bug: http://b.android.com/178278
Change-Id: I693912678ed79e9c6690560b618a605da5a807c6
Diego Perez [Wed, 7 Oct 2015 11:33:44 +0000 (12:33 +0100)]
Implement Path.approximate and add PathMeasure support
PathMeasure is needed to use the trimPath* properties in drawables.
These properties are used in the vector drawable for indeterminate
progress bars in Material so this is needed to be able to render them
correctly in the preview.
PathMeasure makes use of Path.approximate to calculate which segments to
paint.
Change-Id: Ic513f0a30a6aac0317f7c13cd75e9154c37405c8
Eric Laurent [Wed, 7 Oct 2015 13:50:02 +0000 (13:50 +0000)]
am
f5d3f960: am
2a6f1d4a: Merge "ZenModeHelper: fix cross deadlock with AudioService" into mnc-dr-dev
* commit '
f5d3f96001b42ff902022ebf4d97f9ab5e1f26f8':
ZenModeHelper: fix cross deadlock with AudioService
Eric Laurent [Wed, 7 Oct 2015 13:46:48 +0000 (13:46 +0000)]
am
2a6f1d4a: Merge "ZenModeHelper: fix cross deadlock with AudioService" into mnc-dr-dev
* commit '
2a6f1d4af39a72abecf16cc0a95feda7431afc07':
ZenModeHelper: fix cross deadlock with AudioService
Eric Laurent [Wed, 7 Oct 2015 13:39:51 +0000 (13:39 +0000)]
Merge "ZenModeHelper: fix cross deadlock with AudioService" into mnc-dr-dev
Selim Cinek [Tue, 6 Oct 2015 02:11:51 +0000 (02:11 +0000)]
am
235a6911: am
714a61cd: Merge "Ambient display now comes up immediately when a notification comes in" into mnc-dr-dev
* commit '
235a6911b0939adc598e4135e1f1c6fcda9ff169':
Ambient display now comes up immediately when a notification comes in
Selim Cinek [Tue, 6 Oct 2015 02:06:20 +0000 (02:06 +0000)]
am
714a61cd: Merge "Ambient display now comes up immediately when a notification comes in" into mnc-dr-dev
* commit '
714a61cd586c789b18acfd0567cfea2b4ea170dd':
Ambient display now comes up immediately when a notification comes in
Selim Cinek [Tue, 6 Oct 2015 01:59:50 +0000 (01:59 +0000)]
Merge "Ambient display now comes up immediately when a notification comes in" into mnc-dr-dev
Adam Lesinski [Tue, 6 Oct 2015 01:03:49 +0000 (01:03 +0000)]
am
c87996e5: am
8461f2fa: am
46684d2c: Merge "Add anydpi to the providing-resources docs" into mnc-dev
* commit '
c87996e5382a5e9bc4ae400e1879d7c655d8b46a':
Add anydpi to the providing-resources docs
Adam Lesinski [Tue, 6 Oct 2015 00:57:43 +0000 (00:57 +0000)]
am
8461f2fa: am
46684d2c: Merge "Add anydpi to the providing-resources docs" into mnc-dev
* commit '
8461f2fa02c4c2ca2eef5bae391f1d1ff2c28593':
Add anydpi to the providing-resources docs
Adam Lesinski [Tue, 6 Oct 2015 00:51:13 +0000 (00:51 +0000)]
am
46684d2c: Merge "Add anydpi to the providing-resources docs" into mnc-dev
* commit '
46684d2caeef93f43be260d996e925ea6e4147ea':
Add anydpi to the providing-resources docs
Jean-Michel Trivi [Tue, 6 Oct 2015 00:20:09 +0000 (00:20 +0000)]
am
38b987ab: am
0155856a: Fix AudioService rotation helper thread
* commit '
38b987ab794f7e249a239db26dcf98ca8d2ff72b':
Fix AudioService rotation helper thread
Jean-Michel Trivi [Tue, 6 Oct 2015 00:14:01 +0000 (00:14 +0000)]
am
0155856a: Fix AudioService rotation helper thread
* commit '
0155856a1d1cb272d83b6175953dd7151fe65daa':
Fix AudioService rotation helper thread
Pirama Arumuga Nainar [Mon, 5 Oct 2015 23:42:13 +0000 (23:42 +0000)]
am
a186456f: Safely handle interrupts during Thread.join()
* commit '
a186456ff58a6091603956b6788565a273a29485':
Safely handle interrupts during Thread.join()
Pirama Arumuga Nainar [Fri, 2 Oct 2015 23:38:08 +0000 (16:38 -0700)]
Safely handle interrupts during Thread.join()
Interrupt current thread if InterruptedException is received during
Thread.join(). Also, log the interruption.
Change-Id: I452124915ea3f19610e6d4a3411d741f2f604af2
(cherry picked from commit
83461d73bc50d41f631e1db5c195d12b4eb9e6cf)
Deepanshu Gupta [Mon, 5 Oct 2015 21:37:54 +0000 (14:37 -0700)]
LayoutLib: Fix bitmap scaling.
Bug: http://b.android.com/187939
Change-Id: I20bf61746e8af3bb87ba9cfcc9bf58854ac7c5be
Adam Lesinski [Mon, 5 Oct 2015 22:31:22 +0000 (22:31 +0000)]
Merge "Add anydpi to the providing-resources docs" into mnc-dev
Jean-Michel Trivi [Mon, 5 Oct 2015 22:26:21 +0000 (15:26 -0700)]
Fix AudioService rotation helper thread
Fix a race condition where the wait index can be incremented inbetween
the while() loop and the lock
Fix when updateOrientation() is called: after the sleep, otherwise
the last sleep is useless.
Bug
24677424
Change-Id: I03770a0fc8af57f4696ebee7e9c9110e17c55a24
Adam Lesinski [Tue, 8 Sep 2015 21:16:49 +0000 (14:16 -0700)]
Add anydpi to the providing-resources docs
Change-Id: Ic108d9da2e39b9f8581311fe610a1959a24a732f
Nick Armstrong-Crews [Mon, 5 Oct 2015 18:29:24 +0000 (18:29 +0000)]
am
13a71fbc: Merge "Fix the logging of wake time saved by Ungaze." into cw-e-dev
* commit '
13a71fbcf056d34421a7740a75e2c8dc11d30eb6':
Fix the logging of wake time saved by Ungaze.
Nick Armstrong-Crews [Mon, 5 Oct 2015 18:23:12 +0000 (18:23 +0000)]
Merge "Fix the logging of wake time saved by Ungaze." into cw-e-dev
Nick Armstrong-Crews [Wed, 30 Sep 2015 23:49:19 +0000 (16:49 -0700)]
Fix the logging of wake time saved by Ungaze.
The logging of saved time was erroneously being called more than once
per wake period. Moved the logging logic to be called from
finishWakefulnessChange(), which is only called once per wake period.
Change-Id: I268ef44edce5807644fcc8fb0dcaa1a96cae6c9e
Eric Laurent [Thu, 1 Oct 2015 00:44:28 +0000 (17:44 -0700)]
ZenModeHelper: fix cross deadlock with AudioService
Processing ZenModeHelper.setConfig() synchronously in
ZenModeConditions.onConditionChanged() can cause a cross deadlock between
ConditionProviders.mMutex and AudioService.mSettingsLock.
Add a method to set Zen mode config asynchronously.
Bug:
24528290.
Change-Id: I9c1701ca6bef084527821175d84002b612241995
Geoff Mendal [Mon, 5 Oct 2015 14:09:18 +0000 (14:09 +0000)]
am
3daab8e7: (-s ours) am
faebbe82: (-s ours) Import translations. DO NOT MERGE
* commit '
3daab8e7a7e68ceb8f15cfcb0d8becf4e86a6c05':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 14:05:00 +0000 (14:05 +0000)]
am
faebbe82: (-s ours) Import translations. DO NOT MERGE
* commit '
faebbe82fa72036db75d679d366681822d2d551c':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 13:58:33 +0000 (06:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: I21cc5a0ce2710498f3aa76c904e653b90a14ecda
Auto-generated-cl: translation import
Pirama Arumuga Nainar [Fri, 2 Oct 2015 22:54:04 +0000 (22:54 +0000)]
am
67775422: Retry if interrupted before mMessageThread has joined
* commit '
677754225d9dcd3982d486bc4ead31d6f74de89b':
Retry if interrupted before mMessageThread has joined
Pirama Arumuga Nainar [Fri, 2 Oct 2015 19:06:10 +0000 (12:06 -0700)]
Retry if interrupted before mMessageThread has joined
Bug:
24342101
If interrupted during mMessageThread.join(), retry the join instead of
assuming the thread has joined and continuing. Continuing to destroy
the context will cause a segfault when the message thread attempts to
use the destroyed context.
Change-Id: I3213091a0e996449bceb403dffca3063786d5a65
(cherry picked from commit
2f25ce7753f7f1f6a0cc549a0df0082286bd5f85)
Tim Murray [Fri, 2 Oct 2015 20:54:58 +0000 (20:54 +0000)]
am
3af80eff: am
79176379: Merge "Send POWER_HINT_INTERACTION on rotate." into mnc-dr-dev
* commit '
3af80eff608b2ee2de7291f82b9163d5df4b15cf':
Send POWER_HINT_INTERACTION on rotate.
Tim Murray [Fri, 2 Oct 2015 20:48:04 +0000 (20:48 +0000)]
am
79176379: Merge "Send POWER_HINT_INTERACTION on rotate." into mnc-dr-dev
* commit '
791763796e5f21e34c3ae81c1faad2a4c1a515dd':
Send POWER_HINT_INTERACTION on rotate.
Tim Murray [Fri, 2 Oct 2015 20:43:30 +0000 (20:43 +0000)]
Merge "Send POWER_HINT_INTERACTION on rotate." into mnc-dr-dev
Jorim Jaggi [Fri, 2 Oct 2015 20:08:11 +0000 (20:08 +0000)]
am
54afa2bd: am
8c66fa94: Merge "Add minimum time for double tap gesture" into mnc-dr-dev
* commit '
54afa2bdc2be09542feea634f7a87a0f2f9defac':
Add minimum time for double tap gesture
Jorim Jaggi [Fri, 2 Oct 2015 20:00:34 +0000 (20:00 +0000)]
am
8c66fa94: Merge "Add minimum time for double tap gesture" into mnc-dr-dev
* commit '
8c66fa94361b51f39f87530f6d1f714120437cc6':
Add minimum time for double tap gesture
Jorim Jaggi [Fri, 2 Oct 2015 19:55:26 +0000 (19:55 +0000)]
Merge "Add minimum time for double tap gesture" into mnc-dr-dev
Jean-Michel Trivi [Fri, 2 Oct 2015 02:56:39 +0000 (02:56 +0000)]
am
5f48baef: am
24806db8: AudioService: alternative way of handling device rotation
* commit '
5f48baef5f42dd39fff9bc03b3ac8ba222955b86':
AudioService: alternative way of handling device rotation
Jean-Michel Trivi [Fri, 2 Oct 2015 02:52:40 +0000 (02:52 +0000)]
am
24806db8: AudioService: alternative way of handling device rotation
* commit '
24806db8f6f523542510097ce0af4a32beeda83b':
AudioService: alternative way of handling device rotation
Jianing Wei [Fri, 2 Oct 2015 02:23:10 +0000 (02:23 +0000)]
am
3c708be3: am
6ffe9f05: am
2813b0fa: Camera2: Update video stabilization API doc.
* commit '
3c708be364d4c2a45aacc66ca027cdcb19d7dda5':
Camera2: Update video stabilization API doc.
Jianing Wei [Fri, 2 Oct 2015 02:11:55 +0000 (02:11 +0000)]
am
6ffe9f05: am
2813b0fa: Camera2: Update video stabilization API doc.
* commit '
6ffe9f05de81fab8e3cb4031a784e26c2c0acce1':
Camera2: Update video stabilization API doc.
Jean-Michel Trivi [Thu, 1 Oct 2015 22:00:59 +0000 (15:00 -0700)]
AudioService: alternative way of handling device rotation
For devices that monitor orientation (primarily for channel assignment
to stereo speakers):
The com.android.server.policy.WindowOrientationListener API is more
power efficient than simply monitoring the device's orientation. When
supported, use it instead of android.view.OrientationEventListener.
When WindowOrientationListener reports an orientation change, start
a thread to poll the UI orientation, as its change may lag behind
the observed rotation. Gradually increasing delays between polls
are stored in a table.
Bug
24415763
Change-Id: I69bf68da6107af24cd02a48961dd17ceab557816
Tim Murray [Fri, 2 Oct 2015 00:07:12 +0000 (17:07 -0700)]
Send POWER_HINT_INTERACTION on rotate.
Send a POWER_HINT_INTERACTION to improve redraw performance when the
phone is rotated.
bug
24583227
Change-Id: I1978f0dfb9a25c00ad4da5b44d10410ad7412001
Jorim Jaggi [Thu, 1 Oct 2015 21:13:04 +0000 (14:13 -0700)]
Add minimum time for double tap gesture
Bug:
24304031
Change-Id: I15629d6b05175aea9b0d02571f6245966094f162
Jianing Wei [Thu, 1 Oct 2015 16:40:21 +0000 (16:40 +0000)]
am
2813b0fa: Camera2: Update video stabilization API doc.
* commit '
2813b0fae99fed1096dc23c3899e223459a54cec':
Camera2: Update video stabilization API doc.
Deepanshu Gupta [Wed, 30 Sep 2015 22:16:22 +0000 (22:16 +0000)]
Merge "Don't break error string (easier grepping)" into mnc-ub-dev
Jeff Sharkey [Wed, 30 Sep 2015 20:21:17 +0000 (20:21 +0000)]
am
792a9cc3: am
30fd0628: Merge "Relax auto-launch checks for GET_CONTENT." into mnc-dr-dev
* commit '
792a9cc3a5a8aee7ccf79ba5fb2570263505b23f':
Relax auto-launch checks for GET_CONTENT.
Jeff Sharkey [Wed, 30 Sep 2015 20:21:11 +0000 (20:21 +0000)]
am
58843059: am
e69ff2a8: Merge "Clean stale entries when deleting files." into mnc-dr-dev
* commit '
588430591b7bb5340ff02f05f1c02eaf924326ad':
Clean stale entries when deleting files.
Geoff Mendal [Wed, 30 Sep 2015 20:21:04 +0000 (20:21 +0000)]
am
a4a75803: (-s ours) am
a6bf0ebd: (-s ours) Import translations. DO NOT MERGE
* commit '
a4a758032537cceb47a0924b5082cb2197c5e446':
Import translations. DO NOT MERGE
Jeff Sharkey [Wed, 30 Sep 2015 20:11:22 +0000 (20:11 +0000)]
am
30fd0628: Merge "Relax auto-launch checks for GET_CONTENT." into mnc-dr-dev
* commit '
30fd0628970b418dea382b388120f52504ff2243':
Relax auto-launch checks for GET_CONTENT.
Jeff Sharkey [Wed, 30 Sep 2015 20:11:17 +0000 (20:11 +0000)]
am
e69ff2a8: Merge "Clean stale entries when deleting files." into mnc-dr-dev
* commit '
e69ff2a878ee7635a467259995e2924fb96a3a72':
Clean stale entries when deleting files.
Geoff Mendal [Wed, 30 Sep 2015 20:11:13 +0000 (20:11 +0000)]
am
a6bf0ebd: (-s ours) Import translations. DO NOT MERGE
* commit '
a6bf0ebd6e7decda9ee02811cc5b73b96b9b9de5':
Import translations. DO NOT MERGE
Deepanshu Gupta [Wed, 30 Sep 2015 19:49:42 +0000 (12:49 -0700)]
Don't break error string (easier grepping)
Change-Id: If52097ba90481644707dd0323ec63ca3ddf0986b
Jeff Sharkey [Wed, 30 Sep 2015 16:22:17 +0000 (16:22 +0000)]
Merge "Relax auto-launch checks for GET_CONTENT." into mnc-dr-dev
Jeff Sharkey [Wed, 30 Sep 2015 16:20:40 +0000 (16:20 +0000)]
Merge "Clean stale entries when deleting files." into mnc-dr-dev
Geoff Mendal [Wed, 30 Sep 2015 14:01:01 +0000 (07:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I22e6ce4ec3dd122bef49b23a26c9bc2d76980068
Auto-generated-cl: translation import
Diego Perez [Wed, 30 Sep 2015 09:29:40 +0000 (09:29 +0000)]
Merge "Reduce the amount of allocations on Paint_Delegate" into mnc-ub-dev
Diego Perez [Thu, 24 Sep 2015 13:52:59 +0000 (14:52 +0100)]
Reduce the amount of allocations on Paint_Delegate
When the text properties of the Paint object are updated, or when .set()
is called, updateFontObject will be called. This method is currently at the
top of the methods for number of allocations.
This CL reduces the number of calls to updateFontObject by a 90%,
reducing the number of Font allocations.
Change-Id: I3e232f9e6e230da8ecdd19921faadf2d3f4ff763
Deepanshu Gupta [Wed, 30 Sep 2015 00:45:52 +0000 (00:45 +0000)]
Merge "Support databinding in listitem layouts." into mnc-ub-dev
Deepanshu Gupta [Tue, 29 Sep 2015 01:03:18 +0000 (18:03 -0700)]
Support databinding in listitem layouts.
Add a wrapper around the PullParser to support stripping out databinding
parts.
Bug: http://b.android.com/187428
Change-Id: I88080d8f4108cb5ae27a137ad20c5dd7d516f3ea
Adam Lesinski [Tue, 29 Sep 2015 23:39:08 +0000 (23:39 +0000)]
am
8197e2de: am
ffc6ce00: Merge "Fix asymmetry in parceling/unparceling code for BatteryStats summary" into mnc-dr-dev
* commit '
8197e2de06bb96b0076469528a44b36a080ec9e1':
Fix asymmetry in parceling/unparceling code for BatteryStats summary
Adam Lesinski [Tue, 29 Sep 2015 23:30:27 +0000 (23:30 +0000)]
am
ffc6ce00: Merge "Fix asymmetry in parceling/unparceling code for BatteryStats summary" into mnc-dr-dev
* commit '
ffc6ce000568c08a50f7b538bd4cd7729e64c229':
Fix asymmetry in parceling/unparceling code for BatteryStats summary
Adam Lesinski [Tue, 29 Sep 2015 23:22:59 +0000 (23:22 +0000)]
Merge "Fix asymmetry in parceling/unparceling code for BatteryStats summary" into mnc-dr-dev
Jianing Wei [Tue, 29 Sep 2015 21:24:36 +0000 (14:24 -0700)]
Camera2: Update video stabilization API doc.
Bug:
23353979
Change-Id: I781006d1b6ebbdf522ebbf6acc35b2062aff76b6
Jeff Sharkey [Tue, 29 Sep 2015 20:04:46 +0000 (13:04 -0700)]
Relax auto-launch checks for GET_CONTENT.
When a developer wraps an intent with Intent.createChooser(), they're
indicating that the user should always be prompted, instead of using
any "always use" defaults. A recent CL changed the chooser behavior
to ensure that UI is always shown in the case where there is only one
match.
However, this caused us to start prompting for the GET_CONTENT intent,
for which there is only ever one DocumentsUI system app. Since that
app delivers on the createChooser() contract described above, we're
okay automatically launching it.
Bug:
24464358
Change-Id: I0279d3343479c134a35f41ddf3cb4204d0ae6a90
Selim Cinek [Thu, 24 Sep 2015 11:19:25 +0000 (13:19 +0200)]
Ambient display now comes up immediately when a notification comes in
Previously there was always a 1s delay which could even become a 5-8s
delay if the Alarm was not delivered in time.
Bug:
24355754
Change-Id: I1625c69719eee81403a1fcce1358d4d6c9fcf3e9
Bill Rassieur [Mon, 28 Sep 2015 23:15:24 +0000 (23:15 +0000)]
am
3de2d53a: am
c25d5460: Merge "Fix jank: Don\'t write lockout deadline if not needed" into mnc-dr-dev
* commit '
3de2d53a75ed66ee3e64412adfb77ff5a729b43a':
Fix jank: Don't write lockout deadline if not needed
Bill Rassieur [Mon, 28 Sep 2015 23:09:10 +0000 (23:09 +0000)]
am
c25d5460: Merge "Fix jank: Don\'t write lockout deadline if not needed" into mnc-dr-dev
* commit '
c25d546050423845c42a5e8cc8e356caa1f4f71a':
Fix jank: Don't write lockout deadline if not needed
Bill Rassieur [Mon, 28 Sep 2015 23:02:46 +0000 (23:02 +0000)]
Merge "Fix jank: Don't write lockout deadline if not needed" into mnc-dr-dev
Jorim Jaggi [Mon, 28 Sep 2015 20:57:37 +0000 (13:57 -0700)]
Fix jank: Don't write lockout deadline if not needed
In the longterm, we should move these synchronous writes
off the main thread, but in the short term, avoiding an unnecessary
write is good enough for the main case.
Bug:
24471234
Change-Id: Id996ff29e61410cd077760a06d7868a413ae88da
Adam Lesinski [Mon, 28 Sep 2015 17:21:33 +0000 (10:21 -0700)]
Fix asymmetry in parceling/unparceling code for BatteryStats summary
Bug:
24434303
Change-Id: I638979e54076004860035396738f6a1281e26c20
Billy Lau [Mon, 28 Sep 2015 17:38:08 +0000 (17:38 +0000)]
am
cb4bafb4: am
86e153d5: am
f360bbca: Merge "Bug:
24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev
* commit '
cb4bafb4c97dc5e73b055ae1c0e4a548068062cd':
Bug:
24112165 Update docs for protection level of CHANGE_NETWORK_STATE
Billy Lau [Mon, 28 Sep 2015 17:31:48 +0000 (17:31 +0000)]
am
86e153d5: am
f360bbca: Merge "Bug:
24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev
* commit '
86e153d5f0614c9f3da137fd0b815a398598928b':
Bug:
24112165 Update docs for protection level of CHANGE_NETWORK_STATE
Billy Lau [Mon, 28 Sep 2015 17:24:25 +0000 (17:24 +0000)]
am
f360bbca: Merge "Bug:
24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev
* commit '
f360bbca969f60ee968240d22bc0b1f1e5e17218':
Bug:
24112165 Update docs for protection level of CHANGE_NETWORK_STATE
Billy Lau [Mon, 28 Sep 2015 17:18:30 +0000 (17:18 +0000)]
Merge "Bug:
24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev
Jae Seo [Mon, 28 Sep 2015 17:17:00 +0000 (17:17 +0000)]
Merge "docs: fix a wrong link" into mnc-ub-dev
Adam Lesinski [Mon, 28 Sep 2015 07:06:55 +0000 (07:06 +0000)]
am
d913782f: am
d5f10154: Bump BatteryStats version
* commit '
d913782f1b48e1ef5928f869279c541e023d1cb7':
Bump BatteryStats version
Adam Lesinski [Mon, 28 Sep 2015 07:00:52 +0000 (07:00 +0000)]
am
d5f10154: Bump BatteryStats version
* commit '
d5f10154c772b925f6527e25aeb8461de8c710cd':
Bump BatteryStats version
Baligh Uddin [Sun, 27 Sep 2015 22:37:45 +0000 (22:37 +0000)]
am
a9abcc43: (-s ours) am
edd35f92: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
a9abcc43ae71b907e6944ec0710834ef56801145':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 22:37:39 +0000 (22:37 +0000)]
am
4ac4ba5d: (-s ours) am
0307a2a6: (-s ours) Import translations. DO NOT MERGE
* commit '
4ac4ba5d1295b31a759609fd1e495cbf5e18ea64':
Import translations. DO NOT MERGE
Adam Lesinski [Sun, 27 Sep 2015 21:24:49 +0000 (21:24 +0000)]
Bump BatteryStats version
Bug:
24434303
Change-Id: I697deb30c211c77c36cdd810259507f965f3b93b
Baligh Uddin [Sun, 27 Sep 2015 20:55:44 +0000 (20:55 +0000)]
am
edd35f92: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
edd35f922c492bb23d266c54e9c69505d3539680':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 20:55:40 +0000 (20:55 +0000)]
am
0307a2a6: (-s ours) Import translations. DO NOT MERGE
* commit '
0307a2a68dd4afceb480d1d0fdc792690ad88df7':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 04:05:09 +0000 (04:05 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Sat, 26 Sep 2015 20:05:11 +0000 (13:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibaf19bf407113bcedc96d367a80b3a7b1999f7c5
Auto-generated-cl: translation import
Baligh Uddin [Sat, 26 Sep 2015 19:34:51 +0000 (12:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I349825f72d9e929562abd599816a4ae428112ea6
Auto-generated-cl: translation import
Bryce Lee [Sat, 26 Sep 2015 02:48:18 +0000 (02:48 +0000)]
am
24e5efda: Merge "Add additional broadcast for when a phone account is unregistered." into cw-e-dev
* commit '
24e5efda0509871d2a7a779739cce5264de68459':
Add additional broadcast for when a phone account is unregistered.
Bryce Lee [Sat, 26 Sep 2015 02:41:50 +0000 (02:41 +0000)]
Merge "Add additional broadcast for when a phone account is unregistered." into cw-e-dev
Bryce Lee [Sat, 26 Sep 2015 01:41:22 +0000 (01:41 +0000)]
am
f0740e0a: Merge "Add ThermalObserver system service to capture thermal state uevents." into cw-e-dev
* commit '
f0740e0a2e51d2cb9b6e9ea7fbd251bfa9b2a0ad':
Add ThermalObserver system service to capture thermal state uevents.
Bryce Lee [Sat, 26 Sep 2015 01:33:00 +0000 (01:33 +0000)]
Merge "Add ThermalObserver system service to capture thermal state uevents." into cw-e-dev
Bryce Lee [Fri, 25 Sep 2015 23:43:01 +0000 (16:43 -0700)]
Add ThermalObserver system service to capture thermal state uevents.
Bug:
21445745
Change-Id: I980d60b66ca51942a1fd62502d6cf1f09208fc3a
Adrian Roos [Fri, 25 Sep 2015 23:36:15 +0000 (23:36 +0000)]
am
1a6f9216: am
896b9c62: Merge "Show charging speed when time to full is available" into mnc-dr-dev
* commit '
1a6f9216f49f6392d33fc30cee7e1ccbca93c081':
Show charging speed when time to full is available
Adrian Roos [Fri, 25 Sep 2015 23:27:59 +0000 (23:27 +0000)]
am
896b9c62: Merge "Show charging speed when time to full is available" into mnc-dr-dev
* commit '
896b9c6261641e285bc37c4d22a589b01ce11ffe':
Show charging speed when time to full is available
Adrian Roos [Fri, 25 Sep 2015 23:23:26 +0000 (23:23 +0000)]
Merge "Show charging speed when time to full is available" into mnc-dr-dev
Adrian Roos [Thu, 24 Sep 2015 00:03:47 +0000 (17:03 -0700)]
Show charging speed when time to full is available
Only shows if translation is available, follow-up
I3e883eeca002e86d4df30c2b238e18bd63bbddea to show in
all locales.
Bug:
24167496
Change-Id: I667cde69e5d5f8aec8ac9fd105bbfb7e118ced64
Nick Vaccaro [Fri, 25 Sep 2015 21:44:26 +0000 (21:44 +0000)]
am
faf3f370: Merge "Fix sensor usage model" into cw-e-dev
* commit '
faf3f3706140c3b90c805e77c3c72c0978b0d61a':
Fix sensor usage model
Nick Vaccaro [Fri, 25 Sep 2015 21:36:14 +0000 (21:36 +0000)]
Merge "Fix sensor usage model" into cw-e-dev
Ned Burns [Fri, 25 Sep 2015 21:20:08 +0000 (21:20 +0000)]
am
1b69fcbf: am
f4e1d10c: Kill ActivityView\'s background thread when it\'s destroyed
* commit '
1b69fcbf810a805a0fa3dbfc6a3d7cc49d87f33e':
Kill ActivityView's background thread when it's destroyed
Ned Burns [Fri, 25 Sep 2015 21:10:09 +0000 (21:10 +0000)]
am
f4e1d10c: Kill ActivityView\'s background thread when it\'s destroyed
* commit '
f4e1d10cd35a4c1f87ec6dc3e59a9d08e562ffca':
Kill ActivityView's background thread when it's destroyed
Nick Vaccaro [Fri, 18 Sep 2015 00:22:44 +0000 (17:22 -0700)]
Fix sensor usage model
Changed to use the correct API based on the reporting type of the
chosen sensor. The code was incorrectly treating the WRIST TILT
sensor as a one-shot sensor instead of a special-reporting sensor.
Bug:
11661021
Change-Id: Ib8b7ef5bad9642773f4c0e22e218fbec8c34439b
OSDN Git Service
