OSDN Git Service
Matthew Williams [Thu, 21 Jan 2016 19:08:07 +0000 (19:08 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours am:
a76208d4e4 am:
9e52b29fe2 am:
1f6dbd910b -s ours am:
5cb2597a9d
am:
08d7e9608e
* commit '
08d7e9608ea822815b15be15a66f26be664ce541':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 19:01:02 +0000 (19:01 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours am:
a76208d4e4 am:
9e52b29fe2 am:
1f6dbd910b -s ours
am:
5cb2597a9d
* commit '
5cb2597a9da3202229fdbc91c12b8e172b2b5667':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 18:54:44 +0000 (18:54 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours am:
a76208d4e4 am:
9e52b29fe2
am:
1f6dbd910b -s ours
* commit '
1f6dbd910bf9bf93df8a708209e92add61fbff44':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 18:48:55 +0000 (18:48 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours am:
a76208d4e4
am:
9e52b29fe2
* commit '
9e52b29fe27035df4720db582637157ce9ce268d':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 18:41:55 +0000 (18:41 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours
am:
a76208d4e4
* commit '
a76208d4e4f7f690f5fde4210a00a5c3022721bd':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 18:37:01 +0000 (18:37 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a
am:
9c841923df -s ours
* commit '
9c841923dfc36db046909e388b8a2fda3b694be1':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 18:29:33 +0000 (18:29 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours
am:
0d3e46391a
* commit '
0d3e46391a0ffa0c428b8c8082195d1cbc4b1efa':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 18:19:53 +0000 (18:19 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0
am:
5fc753acaf -s ours
* commit '
5fc753acaf9731742957db256b2818376fe8c4a4':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 18:14:32 +0000 (18:14 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93
am:
06ef7dfdf0
* commit '
06ef7dfdf0a3efb44326228c55309ec6df134376':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 18:07:55 +0000 (18:07 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs
am:
a5cafd2a93
* commit '
a5cafd2a93ce1c481328e2ce25c3bf2a19b81601':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Tue, 19 Jan 2016 23:04:04 +0000 (23:04 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs
BUG:
26094635
If the caller to ContentResolver#getCurrentSyncs does not hold the
GET_ACCOUNTS permission, return a SyncInfo object that does not
contain any Account information.
Change-Id: I5628ebe1f56c8e3f784aaf1b3281e6b829d19314
(cherry picked from commit
b63057e698a01dafcefc7ba09b397b0336bba43d)
Chenjie Luo [Wed, 20 Jan 2016 23:38:46 +0000 (23:38 +0000)]
Merge "Fix bug in AssetAtlas packing loop" into cw-e-dev
Chenjie Luo [Wed, 20 Jan 2016 21:25:11 +0000 (13:25 -0800)]
Fix bug in AssetAtlas packing loop
There is a bug in AssetAtlasService that it always choose the
MAX_SIZE as height. The for loop of height calculation starts
from MAX_SIZE and breaks when it finds a working texture. This
means the height loop will always break for the initial value.
Reording the loop optimize the algorithm to find a smaller
atlas texture. The MIN_SIZE is also changed to 512 for fewer
assets case.
Bug:
26429912
Change-Id: Ic0b2396e9697c417a24f81ec792f8a8af53915ad
Matthew Williams [Wed, 20 Jan 2016 18:08:33 +0000 (18:08 +0000)]
Redact Account info from getCurrentSyncs am:
f39549e389 am:
1a0aed3257 am:
0e7cd0a9fb am:
be136b7a3e am:
a947baa87c am:
0f292147f3
am:
ce3842eb1a
* commit '
ce3842eb1a5184331ee4aad3e36d5f11f999cf2e':
Redact Account info from getCurrentSyncs
Matthew Williams [Wed, 20 Jan 2016 11:55:52 +0000 (11:55 +0000)]
Redact Account info from getCurrentSyncs am:
f39549e389 am:
1a0aed3257 am:
0e7cd0a9fb am:
be136b7a3e am:
a947baa87c
am:
0f292147f3
* commit '
0f292147f3ac803a8701afd7362ad3e0487fd496':
Redact Account info from getCurrentSyncs
Matthew Williams [Wed, 20 Jan 2016 11:51:42 +0000 (11:51 +0000)]
Redact Account info from getCurrentSyncs am:
f39549e389 am:
1a0aed3257 am:
0e7cd0a9fb am:
be136b7a3e
am:
a947baa87c
* commit '
a947baa87caeb6733846d6de4ef2bf84f7ab0fa1':
Redact Account info from getCurrentSyncs
Matthew Williams [Wed, 20 Jan 2016 11:46:39 +0000 (11:46 +0000)]
Redact Account info from getCurrentSyncs am:
f39549e389 am:
1a0aed3257 am:
0e7cd0a9fb
am:
be136b7a3e
* commit '
be136b7a3e3f117dea283d194d1e6979fb47662b':
Redact Account info from getCurrentSyncs
Matthew Williams [Wed, 20 Jan 2016 11:41:23 +0000 (11:41 +0000)]
Redact Account info from getCurrentSyncs am:
f39549e389 am:
1a0aed3257
am:
0e7cd0a9fb
* commit '
0e7cd0a9fbdcb48c551d54627eb964364dd946d0':
Redact Account info from getCurrentSyncs
Matthew Williams [Wed, 20 Jan 2016 11:37:17 +0000 (11:37 +0000)]
Redact Account info from getCurrentSyncs am:
f39549e389
am:
1a0aed3257
* commit '
1a0aed3257ad1b8216930928090885cf4210bd87':
Redact Account info from getCurrentSyncs
Matthew Williams [Wed, 20 Jan 2016 11:32:56 +0000 (11:32 +0000)]
Redact Account info from getCurrentSyncs
am:
f39549e389
* commit '
f39549e389edf62f43bacd95a1b8580d75ad77ed':
Redact Account info from getCurrentSyncs
Matthew Williams [Tue, 19 Jan 2016 23:04:04 +0000 (23:04 +0000)]
Redact Account info from getCurrentSyncs
BUG:
26094635
If the caller to ContentResolver#getCurrentSyncs does not hold the
GET_ACCOUNTS permission, return a SyncInfo object that does not
contain any Account information.
Change-Id: I5628ebe1f56c8e3f784aaf1b3281e6b829d19314
(cherry picked from commit
b63057e698a01dafcefc7ba09b397b0336bba43d)
Chenjie Luo [Thu, 14 Jan 2016 02:22:15 +0000 (02:22 +0000)]
Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev
Chenjie Luo [Wed, 13 Jan 2016 19:01:59 +0000 (11:01 -0800)]
Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
Bug:
25860409
Change-Id: I3f525c9c8df81807d98391c70cd2d1f8c139c8f5
Nancy Zheng [Wed, 13 Jan 2016 23:23:56 +0000 (15:23 -0800)]
Pulling in https://android-review.googlesource.com/#/c/186482/1
Fix memory leak in HWUI
std::unique_ptr::release just releases the ownership of the
managed object. To delete the object, std::unique_ptr::reset
function should be called.
Bug:
26116596
Change-Id: If65f74085b1fc2be3a9fffc433326e0bcdb40ff3
Matthew Bouyack [Tue, 12 Jan 2016 22:28:21 +0000 (22:28 +0000)]
Merge "In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments." into cw-e-dev
Matthew Bouyack [Tue, 12 Jan 2016 20:01:48 +0000 (12:01 -0800)]
In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos
and save the result. Then pass that value to
UiFrameInfoBuilder::setVsync as both arguments.
The order of function argument evaluation is undefined in C++. Because
the value returned from TimeLord::latestVsync may be changed by
the preceding call to TimeLord::computeFrameTimeNanos the values of the
arguments passed to UiFrameInfoBuilder::setVsync is also undefined. This
change removes any ambiguity.
Change-Id: Ie71ee453f9ccc725edfe5f7cc9b277f2a809dfdc
Geoff Mendal [Mon, 11 Jan 2016 15:46:49 +0000 (15:46 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev am:
66841a62f1 -s ours am:
73992aee94 -s ours
am:
0663959eb7 -s ours
* commit '
0663959eb73127a49d0a72a70000f3b092adc3e6':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 15:42:10 +0000 (15:42 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev am:
66841a62f1 -s ours
am:
73992aee94 -s ours
* commit '
73992aee94ce78b8827fe05bb5537068a96c835d':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 15:37:27 +0000 (15:37 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev
am:
66841a62f1 -s ours
* commit '
66841a62f1d71eba843e69d1c8b5ca9453c5b42b':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 15:33:48 +0000 (15:33 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 11 Jan 2016 15:33:28 +0000 (15:33 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
a4505e926410cbf20dcd301f35f3496628cad9de.
Change-Id: I5929282b07b1df7a3d618e3be00974609cfcc5cf
Geoff Mendal [Mon, 11 Jan 2016 14:52:22 +0000 (14:52 +0000)]
Revert "Import translations. DO NOT MERGE" am:
8874f9754f -s ours am:
4df8f4abe0 -s ours am:
009fb756ec -s ours am:
b409a99ccc -s ours am:
14c37a57ea -s ours
am:
0b8de39728 -s ours
* commit '
0b8de39728014ad51ff6784a3850a3d752f715e3':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 14:50:39 +0000 (14:50 +0000)]
Import translations. DO NOT MERGE am:
9f9e736e0d -s ours am:
b441c6926b -s ours am:
83bf32ebe5 -s ours am:
42692affe2 -s ours am:
8ea585955c -s ours
am:
4ae777097e -s ours
* commit '
4ae777097e4242e546c0b7e477cbd0829689dff5':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 11 Jan 2016 14:45:46 +0000 (14:45 +0000)]
Revert "Import translations. DO NOT MERGE" am:
8874f9754f -s ours am:
4df8f4abe0 -s ours am:
009fb756ec -s ours am:
b409a99ccc -s ours
am:
14c37a57ea -s ours
* commit '
14c37a57eaf9fe962fe7ee9ecb33bc883ededf7b':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 14:41:17 +0000 (14:41 +0000)]
Revert "Import translations. DO NOT MERGE" am:
8874f9754f -s ours am:
4df8f4abe0 -s ours am:
009fb756ec -s ours
am:
b409a99ccc -s ours
* commit '
b409a99ccc0a42814f3918c689d06526c09f726b':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 14:36:52 +0000 (14:36 +0000)]
Revert "Import translations. DO NOT MERGE" am:
8874f9754f -s ours am:
4df8f4abe0 -s ours
am:
009fb756ec -s ours
* commit '
009fb756ecabd78e5300c619c267f2e55cfd0922':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 14:32:35 +0000 (14:32 +0000)]
Revert "Import translations. DO NOT MERGE" am:
8874f9754f -s ours
am:
4df8f4abe0 -s ours
* commit '
4df8f4abe076d870b0e406efcd9c2d7cb6e4c81f':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 14:28:57 +0000 (14:28 +0000)]
Revert "Import translations. DO NOT MERGE"
am:
8874f9754f -s ours
* commit '
8874f9754f909dafcc2c5c23109e35297263f469':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 14:24:19 +0000 (14:24 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
9f9e736e0dc08f7fd84d3b557ee4ae8212c61be4.
Change-Id: I7164f13dedd0713b948b4f6bcf4b54aa0bdcc0c8
Geoff Mendal [Mon, 11 Jan 2016 14:22:02 +0000 (14:22 +0000)]
Revert "Import translations. DO NOT MERGE" am:
9e5fe1a7da -s ours am:
1c51eb41ee -s ours
am:
eab7785333 -s ours
* commit '
eab778533331bc25b3b201ebb9519a016a451ae4':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 14:16:41 +0000 (14:16 +0000)]
Import translations. DO NOT MERGE am:
9f9e736e0d -s ours am:
b441c6926b -s ours am:
83bf32ebe5 -s ours am:
42692affe2 -s ours
am:
8ea585955c -s ours
* commit '
8ea585955c8aa06daa87a6690421f73f98bb036e':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 11 Jan 2016 14:16:40 +0000 (14:16 +0000)]
Revert "Import translations. DO NOT MERGE" am:
9e5fe1a7da -s ours
am:
1c51eb41ee -s ours
* commit '
1c51eb41ee57bb2aeff62dd23576c6565a86de17':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 14:11:44 +0000 (14:11 +0000)]
Import translations. DO NOT MERGE am:
9f9e736e0d -s ours am:
b441c6926b -s ours am:
83bf32ebe5 -s ours
am:
42692affe2 -s ours
* commit '
42692affe23352b7e0bbcc9ef4d6f5fb661cc943':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 11 Jan 2016 14:11:44 +0000 (14:11 +0000)]
Revert "Import translations. DO NOT MERGE"
am:
9e5fe1a7da -s ours
* commit '
9e5fe1a7da02055c03b434db04f0927ba174f3f9':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 14:05:05 +0000 (14:05 +0000)]
Import translations. DO NOT MERGE am:
9f9e736e0d -s ours am:
b441c6926b -s ours
am:
83bf32ebe5 -s ours
* commit '
83bf32ebe589fa2ed4c8501eb6b0def97e2dd9ac':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 11 Jan 2016 14:04:51 +0000 (14:04 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
f7e5202668cd2b0dc26a65e46b68a4267567bce0.
Change-Id: Ia54e4b766ea2a9f9815baef29df546605d1c3672
Geoff Mendal [Mon, 11 Jan 2016 13:59:58 +0000 (13:59 +0000)]
Import translations. DO NOT MERGE am:
9f9e736e0d -s ours
am:
b441c6926b -s ours
* commit '
b441c6926bbc977956cd1cb6afcc338b09e5d6e3':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 11 Jan 2016 13:54:49 +0000 (13:54 +0000)]
Import translations. DO NOT MERGE
am:
9f9e736e0d -s ours
* commit '
9f9e736e0dc08f7fd84d3b557ee4ae8212c61be4':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 11 Jan 2016 13:54:46 +0000 (13:54 +0000)]
Import translations. DO NOT MERGE am:
a4505e9264 -s ours am:
bc3b9e2a83 -s ours
am:
a6a761d9fd -s ours
* commit '
a6a761d9fdbcae6c62fc50f0a36c64c57c8c7403':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 11 Jan 2016 13:52:00 +0000 (13:52 +0000)]
Import translations. DO NOT MERGE am:
f7e5202668 -s ours am:
0b1a880876 -s ours
am:
f272b0a87e -s ours
* commit '
f272b0a87ed5af0317285ef047cf95cd4601ebca':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 11 Jan 2016 13:49:05 +0000 (13:49 +0000)]
Import translations. DO NOT MERGE am:
a4505e9264 -s ours
am:
bc3b9e2a83 -s ours
* commit '
bc3b9e2a83909cb170de2d48023db2d67388162f':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 11 Jan 2016 13:46:48 +0000 (08:46 -0500)]
Import translations. DO NOT MERGE
Change-Id: I96e1041e8b74246336e2178ad73cb4d61ad41e37
Auto-generated-cl: translation import
Geoff Mendal [Mon, 11 Jan 2016 13:46:15 +0000 (13:46 +0000)]
Import translations. DO NOT MERGE am:
f7e5202668 -s ours
am:
0b1a880876 -s ours
* commit '
0b1a88087604f1f94d616934947a530c8ea40f0f':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 11 Jan 2016 13:43:25 +0000 (13:43 +0000)]
Import translations. DO NOT MERGE
am:
a4505e9264 -s ours
* commit '
a4505e926410cbf20dcd301f35f3496628cad9de':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 11 Jan 2016 13:40:07 +0000 (13:40 +0000)]
Import translations. DO NOT MERGE
am:
f7e5202668 -s ours
* commit '
f7e5202668cd2b0dc26a65e46b68a4267567bce0':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 11 Jan 2016 13:34:53 +0000 (08:34 -0500)]
Import translations. DO NOT MERGE
Change-Id: I3480788044f57b8097e54c28cb7984024719b8ca
Auto-generated-cl: translation import
Geoff Mendal [Mon, 11 Jan 2016 13:22:53 +0000 (08:22 -0500)]
Import translations. DO NOT MERGE
Change-Id: I2591758894a20c8459e7161ab6d97ac3a9a32654
Auto-generated-cl: translation import
Baligh Uddin [Thu, 7 Jan 2016 16:39:15 +0000 (16:39 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
61f9f31468 am:
4340e0677b am:
aa2210c5c1 am:
78f672ef05 am:
8d85292827
am:
212fe88251
* commit '
212fe88251a6c769ba71f562fd2f51c30926ccc1':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:35:00 +0000 (16:35 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
61f9f31468 am:
4340e0677b am:
aa2210c5c1 am:
78f672ef05
am:
8d85292827
* commit '
8d8529282719f035d0ce7460ffd640f94d6c6eb8':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:31:02 +0000 (16:31 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
61f9f31468 am:
4340e0677b am:
aa2210c5c1
am:
78f672ef05
* commit '
78f672ef05d9dbfbd0abf1b29b76f8cb22d84979':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:26:49 +0000 (16:26 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
61f9f31468 am:
4340e0677b
am:
aa2210c5c1
* commit '
aa2210c5c174fd681fd52fd43e55de6c018a93ad':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:26:48 +0000 (16:26 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
71921cb23c
am:
6980f76931
* commit '
6980f76931d3a52a2c071b10a5736afe8de0fdf4':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:22:23 +0000 (16:22 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
61f9f31468
am:
4340e0677b
* commit '
4340e0677b691f2ab12549556c23b88e599cf8c1':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:18:11 +0000 (16:18 +0000)]
Fix plurals variable to unblock Translations Pipeline.
am:
61f9f31468
* commit '
61f9f31468c5fc4dd2605c9ab8cb6a54cc58d6f9':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:18:10 +0000 (16:18 +0000)]
Fix plurals variable to unblock Translations Pipeline.
am:
71921cb23c
* commit '
71921cb23c7493ae6c7186d5554233540c9bcc9c':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Fri, 30 Jan 2015 15:09:16 +0000 (07:09 -0800)]
Fix plurals variable to unblock Translations Pipeline.
Bug:
19067882
(cherry picked from commit
50d23adfe26bf0cf9a34138efc299eaec04127e9)
Change-Id: I86022d6edab73dc4d11269783900710dc07a5b49
Baligh Uddin [Fri, 30 Jan 2015 15:09:16 +0000 (07:09 -0800)]
Fix plurals variable to unblock Translations Pipeline.
Bug:
19067882
(cherry picked from commit
50d23adfe26bf0cf9a34138efc299eaec04127e9)
Change-Id: I86022d6edab73dc4d11269783900710dc07a5b49
Gus Prevas [Tue, 29 Dec 2015 15:09:26 +0000 (15:09 +0000)]
Merge "Defines task to front/back animations in styles_micro." into cw-e-dev
Gus Prevas [Mon, 28 Dec 2015 20:02:13 +0000 (15:02 -0500)]
Defines task to front/back animations in styles_micro.
Bug:
26112737
Change-Id: I9f8c1da21580d525c32a76f25e223dc24d012837
Bryce Lee [Fri, 18 Dec 2015 23:02:40 +0000 (23:02 +0000)]
Merge "Remove duplicate Bluetooth profiles." into cw-e-dev
Daniel Koulomzin [Fri, 18 Dec 2015 19:49:18 +0000 (19:49 +0000)]
Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev
Bryce Lee [Fri, 18 Dec 2015 19:34:20 +0000 (11:34 -0800)]
Remove duplicate Bluetooth profiles.
Change-Id: I04fd867511713dd02ef249b113f7a46c69f22f98
Robert Greenwalt [Fri, 18 Dec 2015 19:31:54 +0000 (11:31 -0800)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev. am:
5a77651489 am:
5946a9b798 am:
2ecc918bd3 am:
81674b1ff5 am:
1e04dfb926
am:
3927089cce
* commit '
3927089cce9d43a0b517f53fd6a542f07cb0955b':
Protect some new broadcasts.
Robert Greenwalt [Fri, 18 Dec 2015 19:24:53 +0000 (11:24 -0800)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev. am:
5a77651489 am:
5946a9b798 am:
2ecc918bd3 am:
81674b1ff5
am:
1e04dfb926
* commit '
1e04dfb926040a6fad073fca0835777123d155e7':
Protect some new broadcasts.
Robert Greenwalt [Fri, 18 Dec 2015 19:17:58 +0000 (19:17 +0000)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev. am:
5a77651489 am:
5946a9b798 am:
2ecc918bd3
am:
81674b1ff5
* commit '
81674b1ff5deedcf2f1a79f07441e506a4f66354':
Protect some new broadcasts.
Robert Greenwalt [Fri, 18 Dec 2015 19:04:25 +0000 (19:04 +0000)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev. am:
5a77651489 am:
5946a9b798
am:
2ecc918bd3
* commit '
2ecc918bd3c7f63ea70a7395b3a622c7f1a40f84':
Protect some new broadcasts.
Robert Greenwalt [Fri, 18 Dec 2015 18:48:59 +0000 (18:48 +0000)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev. am:
5a77651489
am:
5946a9b798
* commit '
5946a9b798f9a4b0e9eacd2685fc5ec9d6cc9ed6':
Protect some new broadcasts.
Robert Greenwalt [Fri, 18 Dec 2015 18:38:10 +0000 (18:38 +0000)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev.
am:
5a77651489
* commit '
5a77651489ace080671034a85e5771c6ddc73525':
Protect some new broadcasts.
Daniel Koulomzin [Wed, 16 Dec 2015 22:52:25 +0000 (17:52 -0500)]
Making ViewRootImpl drop input events when the Activity is in ambient
mode.
WearableActivityController tells ViewRootImpl about ambient mode.
Bug:
25912259
Bug:
25973146
Bug:
25714113
Change-Id: Idcca2b254db3145039f50f2a7dfd38a224ec287e
Robert Greenwalt [Fri, 18 Dec 2015 03:32:43 +0000 (19:32 -0800)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev.
Change-Id: I240cac5cba106a7f0fab61e04af2c757b46b0bb0
Robert Greenwalt [Thu, 17 Dec 2015 23:04:24 +0000 (23:04 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dev am:
4557ef32fe
am:
628b8f1f5f
* commit '
628b8f1f5f6d249e2f222602352d14c40d648d97':
Check permissions on getDeviceId.
Robert Greenwalt [Thu, 17 Dec 2015 23:01:33 +0000 (23:01 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dr-dev
am:
ef58df63d6
* commit '
ef58df63d6ba9d56620b6a440f15d0e07c842a44':
Check permissions on getDeviceId.
Robert Greenwalt [Thu, 17 Dec 2015 22:58:14 +0000 (22:58 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dev
am:
4557ef32fe
* commit '
4557ef32fe36b6f7ef7918052400d18af51d452f':
Check permissions on getDeviceId.
Robert Greenwalt [Thu, 17 Dec 2015 22:52:58 +0000 (22:52 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dr-dev
Robert Greenwalt [Thu, 17 Dec 2015 22:52:56 +0000 (22:52 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dev
Bryce Lee [Thu, 17 Dec 2015 19:40:47 +0000 (19:40 +0000)]
Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev
Bryce Lee [Thu, 17 Dec 2015 00:02:41 +0000 (00:02 +0000)]
Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev
Bryce Lee [Wed, 16 Dec 2015 23:33:59 +0000 (15:33 -0800)]
Add UUID to BluetoothHeadsetClientCall
This will allow for unique identification of a call as id only provides
uniqueness per session.
Bug:
26016489
Change-Id: I643d24bf5ff5680c26e530075649ef2a4f378295
Adam Lesinski [Wed, 16 Dec 2015 23:16:18 +0000 (23:16 +0000)]
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am:
b2c5155638
am:
40d1ab91d2
* commit '
40d1ab91d2a0ed1f066b6a8de821c9c4c70ca512':
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
Adam Lesinski [Wed, 16 Dec 2015 23:09:27 +0000 (23:09 +0000)]
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
am:
b2c5155638
* commit '
b2c51556382acd3981e5a6380e2fb3d85c2f68a5':
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
Adam Lesinski [Wed, 2 Dec 2015 23:40:19 +0000 (15:40 -0800)]
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
Include <uses-permission-sdk-23> permissions in dump badging and dump permissions.
This will also add implied features for that permission, marked as -sdk-23 features.
Ex:
uses-permission: name='android.permission.ACCESS_FINE_LOCATION'
uses-permission-sdk-23: name='android.permission.CAMERA'
feature-group: label=''
uses-feature: name='android.hardware.location'
uses-implied-feature: name='android.hardware.location' reason='...'
uses-feature-sdk-23: name='android.hardware.camera'
uses-implied-feature-sdk-23: name='android.hardware.camera' reason='...'
Bug:
24939655
Change-Id: Ifb374696ed4760b0ba2f1cc3516f3bf08e6cb6a3
(cherry picked from commit
5f3b2ecb3e9d27e77bd59c7b9006a6239b773944)
Bryce Lee [Wed, 16 Dec 2015 21:32:28 +0000 (13:32 -0800)]
Add setting for declaring disabled bluetooth profiles.
Bug:
25900899
Change-Id: I420a7c590d72ba10f3e466d15dccfdbb520e810a
Geoff Mendal [Wed, 16 Dec 2015 05:05:18 +0000 (05:05 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 16 Dec 2015 05:03:50 +0000 (21:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia8ab8097f7b82ed5fb344351035535c5b3b0690d
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 05:02:26 +0000 (05:02 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 16 Dec 2015 05:00:49 +0000 (21:00 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ifbe7e97f2a1fe1b688642a8179c0e184d69ba3cb
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 04:49:00 +0000 (04:49 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 16 Dec 2015 04:45:33 +0000 (20:45 -0800)]
Import translations. DO NOT MERGE
Change-Id: Idc7e685457dc0bc2da4df2bd10ac2187d64fa00f
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 04:36:13 +0000 (04:36 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 16 Dec 2015 04:34:53 +0000 (20:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic3c47d16450ddb80c815369cf01bb63be1f73a88
Auto-generated-cl: translation import