Jorim Jaggi
569af4e9f8
am 1727a8e0: am 31519f63: am ea9675e7: Merge "Do not issue config change command when not needed" into mnc-dr-dev
...
* commit '1727a8e0ea3334efd7ce07d7b7a0130e1f485f01':
Do not issue config change command when not needed
2015-09-25 18:09:07 +00:00
Pankaj Kanwar
1e595bc225
am 52762ce8: am f99986ee: am 65bfe1ca: Merge "AudioService: cleanup sco audio mode upon disconnection." into mnc-dr-dev
...
* commit '52762ce874200ad2fdbe24fa83ebf8ef6cbf08a4':
AudioService: cleanup sco audio mode upon disconnection.
2015-09-25 18:08:59 +00:00
Baligh Uddin
252044e5e0
am 8403b9b7: (-s ours) am 437ee52a: (-s ours) am 2f09d2a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '8403b9b7262527a27c7f77901ba4bb7d52a5c301':
Import translations. DO NOT MERGE
2015-09-25 18:08:32 +00:00
Baligh Uddin
e8b72edb18
am b4f7abbd: (-s ours) am 56c2f8ee: (-s ours) am 4ee34138: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit 'b4f7abbdaedafd3ec1bed152d74f0bdfaa96f53c':
Import translations. DO NOT MERGE
2015-09-25 18:08:26 +00:00
Baligh Uddin
58bed419ad
am c266a512: (-s ours) am 6a39ee4d: (-s ours) am 9db221c8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit 'c266a512cc4d4d844d152ad0ea8086966ee26dc9':
Import translations. DO NOT MERGE
2015-09-25 18:08:20 +00:00
Baligh Uddin
2b3f2f4509
am fdfd01be: (-s ours) am 683db030: (-s ours) am 9b1c6f77: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit 'fdfd01bef34ada326ff502f327e4387b8b14aa81':
Import translations. DO NOT MERGE
2015-09-25 18:08:14 +00:00
Jorim Jaggi
c594e9354a
am f9f9999d: am b7b9b31f: am ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev
...
* commit 'f9f9999d3245dffc8463a1f3f5f74dc900aa0196':
Deliver camera launch source for analytics
2015-09-25 18:07:52 +00:00
Michael Lentine
561f697e4b
am a86465d7: am 8c743655: am cb13da97: Merge "Revert "Dismiss color fade when it is no longer used."" into mnc-dr-dev
...
* commit 'a86465d7af8c8995210166954ec42624560bf86e':
Revert "Dismiss color fade when it is no longer used."
2015-09-25 18:07:41 +00:00
Gus Prevas
41110261bb
am b17d1e5e: Merge "Adds an option to override RemoteViews transition." into cw-e-dev
...
* commit 'b17d1e5e6aa53f5925efc2135b9a603a9a0ed2df':
Adds an option to override RemoteViews transition.
2015-09-25 17:24:39 +00:00
Gus Prevas
b17d1e5e6a
Merge "Adds an option to override RemoteViews transition." into cw-e-dev
2015-09-25 17:17:44 +00:00
Ian Pedowitz
4c74a02eea
am 3af6163a: am 31fe464d: Merge "Give the DhcpClient alarm broadcasts foreground priority." into mnc-dr-dev
...
* commit '3af6163a66dceb7a6e6e300f5f8de828c88919d4':
Give the DhcpClient alarm broadcasts foreground priority.
2015-09-25 17:17:25 +00:00
Gus Prevas
1ed322b123
Adds an option to override RemoteViews transition.
...
This change adds a configuration option,
"config_overrideRemoteViewsActivityTransition", which is false by
default and true on watches. If it's true, when a RemoteViews
is clicked, it will use a new attribute on the active window animation
style, "activityOpenRemoteViewsEnterAnimation", to determine
the entry transition to use, instead of the current hard-coded
default.
Bug: 23534750
Change-Id: I91e92804a663ab71a3e46c3430fa579b87cc7931
2015-09-25 13:10:52 -04:00
Ian Pedowitz
3af6163a66
am 31fe464d: Merge "Give the DhcpClient alarm broadcasts foreground priority." into mnc-dr-dev
...
* commit '31fe464d50bcd4360ac004d44d6938eac762d78d':
Give the DhcpClient alarm broadcasts foreground priority.
2015-09-25 17:10:33 +00:00
Ian Pedowitz
31fe464d50
Merge "Give the DhcpClient alarm broadcasts foreground priority." into mnc-dr-dev
2015-09-25 17:04:14 +00:00
Joe LaPenna
5d05db2877
am ac342d38: (-s ours) Merge "Disable debugging for device idle in wear branch DO NOT MERGE ANYWHERE" into cw-e-dev
...
* commit 'ac342d3831991060c1ccac26aaa764e0a9ae7e15':
Disable debugging for device idle in wear branch DO NOT MERGE ANYWHERE
2015-09-25 09:40:15 +00:00
Joe LaPenna
ac342d3831
Merge "Disable debugging for device idle in wear branch DO NOT MERGE ANYWHERE" into cw-e-dev
2015-09-25 08:53:34 +00:00
Joe LaPenna
818c379782
Disable debugging for device idle in wear branch DO NOT MERGE ANYWHERE
...
BUG: 23753686
Change-Id: Ia75046df38ebb8630e1b5ea1709bfe63eb8f177e
2015-09-25 01:29:57 -07:00
Jorim Jaggi
1727a8e0ea
am 31519f63: am ea9675e7: Merge "Do not issue config change command when not needed" into mnc-dr-dev
...
* commit '31519f637d3373ff8546360742a4b05706f0ad61':
Do not issue config change command when not needed
2015-09-25 07:11:24 +00:00
Jorim Jaggi
31519f637d
am ea9675e7: Merge "Do not issue config change command when not needed" into mnc-dr-dev
...
* commit 'ea9675e7aa11219d426a3c0ab3929ea16a34a4c7':
Do not issue config change command when not needed
2015-09-25 07:02:08 +00:00
Jorim Jaggi
ea9675e7aa
Merge "Do not issue config change command when not needed" into mnc-dr-dev
2015-09-25 06:54:42 +00:00
Pankaj Kanwar
52762ce874
am f99986ee: am 65bfe1ca: Merge "AudioService: cleanup sco audio mode upon disconnection." into mnc-dr-dev
...
* commit 'f99986eec6a263e74833d26dc8dcb107b15a9c04':
AudioService: cleanup sco audio mode upon disconnection.
2015-09-25 04:51:38 +00:00
Pankaj Kanwar
f99986eec6
am 65bfe1ca: Merge "AudioService: cleanup sco audio mode upon disconnection." into mnc-dr-dev
...
* commit '65bfe1cac3297d3d4463db753c0397f28c872637':
AudioService: cleanup sco audio mode upon disconnection.
2015-09-25 04:45:52 +00:00
Pankaj Kanwar
65bfe1cac3
Merge "AudioService: cleanup sco audio mode upon disconnection." into mnc-dr-dev
2015-09-25 04:40:23 +00:00
Lorenzo Colitti
9795a1d8b9
Give the DhcpClient alarm broadcasts foreground priority.
...
Bug: 24265658
Bug: 24224067
Change-Id: I375097e7957643efb4bc0bb81318b13d9b9c82c1
2015-09-25 12:57:39 +09:00
Baligh Uddin
8403b9b726
am 437ee52a: (-s ours) am 2f09d2a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '437ee52a65e609ffce91aff8eff438ebc73d9105':
Import translations. DO NOT MERGE
2015-09-25 03:11:40 +00:00
Baligh Uddin
b4f7abbdae
am 56c2f8ee: (-s ours) am 4ee34138: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '56c2f8eefb7100ddc8850ccf744a7bc55e8d295d':
Import translations. DO NOT MERGE
2015-09-25 03:11:34 +00:00
Baligh Uddin
c266a512cc
am 6a39ee4d: (-s ours) am 9db221c8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '6a39ee4db5f81795cbbfce0c2a864d619e860d88':
Import translations. DO NOT MERGE
2015-09-25 03:11:26 +00:00
Baligh Uddin
fdfd01bef3
am 683db030: (-s ours) am 9b1c6f77: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '683db0306cfd756ff96fabbd0de07fa8b0184483':
Import translations. DO NOT MERGE
2015-09-25 03:11:16 +00:00
Baligh Uddin
437ee52a65
am 2f09d2a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '2f09d2a999edfba173771ab020b87eca7ec7ef26':
Import translations. DO NOT MERGE
2015-09-25 03:05:16 +00:00
Baligh Uddin
56c2f8eefb
am 4ee34138: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '4ee34138c03dee1fd248046b135d9b4bcd84efdd':
Import translations. DO NOT MERGE
2015-09-25 03:05:12 +00:00
Baligh Uddin
6a39ee4db5
am 9db221c8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '9db221c88c678419b1c6ac7cd8223b37cd2a43a4':
Import translations. DO NOT MERGE
2015-09-25 03:05:08 +00:00
Baligh Uddin
683db0306c
am 9b1c6f77: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '9b1c6f7781fba239c1636a418a9678c8b3e53896':
Import translations. DO NOT MERGE
2015-09-25 03:05:04 +00:00
Baligh Uddin
2f09d2a999
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-09-25 02:58:40 +00:00
Baligh Uddin
4ee34138c0
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-09-25 02:57:21 +00:00
Baligh Uddin
9db221c88c
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-09-25 02:56:40 +00:00
Baligh Uddin
9b1c6f7781
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-09-25 02:56:35 +00:00
Baligh Uddin
9a2979b27d
Import translations. DO NOT MERGE
...
Change-Id: Iac1fe89a00d3f4e30b20e8f07c48a0845ce41d81
Auto-generated-cl: translation import
2015-09-24 19:36:51 -07:00
Eric Laurent
48221250ba
AudioService: cleanup sco audio mode upon disconnection.
...
Clean up SCO forced usage and A2DP suspend state upon
SCO device or profile disconnection.
This is in case the Bluetooth Headset service does not
do it.
Bug: 24316765.
Change-Id: Ifc0305607c186be49b2eb42b7868647292e56137
2015-09-24 18:41:48 -07:00
Baligh Uddin
a37c71c2b7
Import translations. DO NOT MERGE
...
Change-Id: I50eeba5466bb054212dc51f8a8d1b5b76f56a31d
Auto-generated-cl: translation import
2015-09-24 18:40:38 -07:00
Jorim Jaggi
f9f9999d32
am b7b9b31f: am ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev
...
* commit 'b7b9b31f6969dc48174757ec236622f8d49222d0':
Deliver camera launch source for analytics
2015-09-25 01:38:07 +00:00
Jorim Jaggi
3b3cbb5325
Do not issue config change command when not needed
...
This caused a but where WindowManager was blocked on this to perform a
layout, leading to delays in screen wake-ups.
Bug: 24383169
Change-Id: I42bc08dae9057060f09c301328bb4839a970c597
2015-09-25 01:30:56 +00:00
Jorim Jaggi
b7b9b31f69
am ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev
...
* commit 'ad26dc5f15d6ac13741ad8724c25ef8c58e73e81':
Deliver camera launch source for analytics
2015-09-25 01:30:43 +00:00
Jorim Jaggi
ad26dc5f15
Merge "Deliver camera launch source for analytics" into mnc-dr-dev
2015-09-25 01:27:05 +00:00
Baligh Uddin
32b843ecc0
Import translations. DO NOT MERGE
...
Change-Id: I45388638f08ea212ddb1f15716a4020c3abc761c
Auto-generated-cl: translation import
2015-09-24 18:12:20 -07:00
Baligh Uddin
566c766027
Import translations. DO NOT MERGE
...
Change-Id: Iebbf559a27c2c55ec7f172ad7e6592e86452edff
Auto-generated-cl: translation import
2015-09-24 18:10:14 -07:00
Michael Lentine
a86465d7af
am 8c743655: am cb13da97: Merge "Revert "Dismiss color fade when it is no longer used."" into mnc-dr-dev
...
* commit '8c7436558fa61b5ce9e82116b6b385f8f246d87e':
Revert "Dismiss color fade when it is no longer used."
2015-09-25 00:48:02 +00:00
Michael Lentine
8c7436558f
am cb13da97: Merge "Revert "Dismiss color fade when it is no longer used."" into mnc-dr-dev
...
* commit 'cb13da9772b41c3466c3ed514e6321c2cfb85c2a':
Revert "Dismiss color fade when it is no longer used."
2015-09-25 00:40:39 +00:00
Michael Lentine
cb13da9772
Merge "Revert "Dismiss color fade when it is no longer used."" into mnc-dr-dev
2015-09-25 00:31:24 +00:00
Michael Lentine
68eafe7f88
Revert "Dismiss color fade when it is no longer used."
...
Bug: 24371570
This reverts commit 193560002fbc080f0006df088f8f5e9c165bfd78.
2015-09-25 00:18:19 +00:00
Adrian Roos
f73aab339e
am 2ce4fb0c: am a4150f49: am f02ba4b8: am 09945c0b: am fe7ceca1: (-s ours) am 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev
...
* commit '2ce4fb0c1f4824981f6ed03135bf513d98fb3153':
DO NOT MERGE Send next alarm's show intent via PendingIntent
2015-09-25 00:08:22 +00:00