Yorke Lee
440f0a34ff
Merge "Add permission annotations to TelecomManager"
2015-09-25 21:29:30 +00:00
Oren Blasberg
b8c7ef5eaf
Merge "Make context menus show as popup menus."
2015-09-25 21:09:18 +00:00
Winson Chung
44950c094e
Merge "Fixing issue incorrect resources being used with docked windows."
2015-09-25 21:05:17 +00:00
Winson
6aa91e6357
Removing unused resources.
...
Change-Id: Ie013b164892eaccaaab7b8c2bcdd3cb5ac51a485
2015-09-25 20:13:25 +00:00
Wale Ogunwale
024ce628de
Merge "Added trace points for task/stack resizing."
2015-09-25 19:46:59 +00:00
Blazej Magnowski
c8433b60a7
Merge "Integration into other unlock mechanisms"
2015-09-25 19:42:07 +00:00
Blazej Magnowski
6dc59b48c0
Integration into other unlock mechanisms
...
Replaces all the older falsing thresholds unless the
HumanInteractionClassifier is disabled.
Change-Id: Idfc3cb1b6bc0bbdbc792cd75499f0c3b4f1b7142
2015-09-25 12:36:25 -07:00
Oren Blasberg
ed3912692f
Make context menus show as popup menus.
...
This means that right-clicking/long pressing on a view that is registered for
context menu will show the context menu as a popup menu instead.
Bug: 20016398
Change-Id: I96fea60435fff2f981d288521f490f8ff24ada15
2015-09-25 12:01:01 -07:00
Gus Prevas
efca0aa919
am 3197cd36: am 41110261: am b17d1e5e: Merge "Adds an option to override RemoteViews transition." into cw-e-dev
...
* commit '3197cd36fef11b1fdd59bdd341f65f9f2364ed2a':
Adds an option to override RemoteViews transition.
2015-09-25 18:59:45 +00:00
Ian Pedowitz
3a08975000
am cafb3192: am 4c74a02e: am 3af6163a: am 31fe464d: Merge "Give the DhcpClient alarm broadcasts foreground priority." into mnc-dr-dev
...
* commit 'cafb3192a06e237ae2a7466d051ee66e05cac11d':
Give the DhcpClient alarm broadcasts foreground priority.
2015-09-25 18:59:37 +00:00
Joe LaPenna
1cff973b89
am 84270fb6: (-s ours) am 5d05db28: (-s ours) am ac342d38: (-s ours) Merge "Disable debugging for device idle in wear branch DO NOT MERGE ANYWHERE" into cw-e-dev
...
* commit '84270fb60ab29e9e0aa7975c9d300a758f0b16ef':
Disable debugging for device idle in wear branch DO NOT MERGE ANYWHERE
2015-09-25 18:59:31 +00:00
Jorim Jaggi
0d3c613ecf
am 569af4e9: am 1727a8e0: am 31519f63: am ea9675e7: Merge "Do not issue config change command when not needed" into mnc-dr-dev
...
* commit '569af4e9f8927426bb3da2c6f2c13215c05592ea':
Do not issue config change command when not needed
2015-09-25 18:59:19 +00:00
Pankaj Kanwar
82418d110f
am 1e595bc2: am 52762ce8: am f99986ee: am 65bfe1ca: Merge "AudioService: cleanup sco audio mode upon disconnection." into mnc-dr-dev
...
* commit '1e595bc225a4d2f1a9c8e59a2047bee33dd79439':
AudioService: cleanup sco audio mode upon disconnection.
2015-09-25 18:59:11 +00:00
Baligh Uddin
38de1b5a9c
am 252044e5: (-s ours) am 8403b9b7: (-s ours) am 437ee52a: (-s ours) am 2f09d2a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '252044e5e067367ac5cd1c75afcb2fcafeedde64':
Import translations. DO NOT MERGE
2015-09-25 18:59:04 +00:00
Baligh Uddin
7b9ab82252
am e8b72edb: (-s ours) am b4f7abbd: (-s ours) am 56c2f8ee: (-s ours) am 4ee34138: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit 'e8b72edb1878aceeaabe13d3cc1b68eb81e8cc03':
Import translations. DO NOT MERGE
2015-09-25 18:58:57 +00:00
Baligh Uddin
3d601990c8
am 58bed419: (-s ours) am c266a512: (-s ours) am 6a39ee4d: (-s ours) am 9db221c8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '58bed419ad0572e051560509ebacab5e04b8b0f1':
Import translations. DO NOT MERGE
2015-09-25 18:58:46 +00:00
Baligh Uddin
1ace12cb47
am 2b3f2f45: (-s ours) am fdfd01be: (-s ours) am 683db030: (-s ours) am 9b1c6f77: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '2b3f2f45098dad06f0044a6e5a1a83f71ed89018':
Import translations. DO NOT MERGE
2015-09-25 18:58:39 +00:00
Jorim Jaggi
fc832e3ef2
resolved conflicts for c594e935 to master
...
Change-Id: Ifaf8c6c2b80e5284e027278f5ff0437202439cf0
2015-09-25 11:54:05 -07:00
Winson
b200d05e2f
Fixing issue incorrect resources being used with docked windows.
2015-09-25 11:39:47 -07:00
Wale Ogunwale
cad05a0a1f
Added trace points for task/stack resizing.
...
Change-Id: I6c812d92f3822528890b5d875c228b5bd1210bff
2015-09-25 11:30:55 -07:00
Michael Lentine
bf0282105a
am 561f697e: am a86465d7: am 8c743655: am cb13da97: Merge "Revert "Dismiss color fade when it is no longer used."" into mnc-dr-dev
...
* commit '561f697e4b8527cc674f8ada5f82952c53760049':
Revert "Dismiss color fade when it is no longer used."
2015-09-25 18:20:29 +00:00
Gus Prevas
3197cd36fe
am 41110261: am b17d1e5e: Merge "Adds an option to override RemoteViews transition." into cw-e-dev
...
* commit '41110261bb4f9f733b579b3dc26d3d6de5642ef5':
Adds an option to override RemoteViews transition.
2015-09-25 18:09:41 +00:00
Ian Pedowitz
cafb3192a0
am 4c74a02e: am 3af6163a: am 31fe464d: Merge "Give the DhcpClient alarm broadcasts foreground priority." into mnc-dr-dev
...
* commit '4c74a02eea04c5faa541812607a5782505bacf00':
Give the DhcpClient alarm broadcasts foreground priority.
2015-09-25 18:09:35 +00:00
Joe LaPenna
84270fb60a
am 5d05db28: (-s ours) am ac342d38: (-s ours) Merge "Disable debugging for device idle in wear branch DO NOT MERGE ANYWHERE" into cw-e-dev
...
* commit '5d05db28773dc0b242d8f894abd65f6b3c2a17c4':
Disable debugging for device idle in wear branch DO NOT MERGE ANYWHERE
2015-09-25 18:09:16 +00:00
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
Wale Ogunwale
a5940f8dca
Merge "Revert "Fix leaking the first activity while preserving windows.""
2015-09-25 17:09:04 +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
Wale Ogunwale
a5ffea3b7d
Revert "Fix leaking the first activity while preserving windows."
...
This reverts commit 640a3909a33c5688f7752e5db6f7c6b23801300c.
Bug: 24293179
Change-Id: I9819f85d96bee240544beee9583b070c751cb9fc
2015-09-25 09:01:22 -07:00
Ben Kwa
6fd4f7f7c3
Merge "Activate selection mode when selecting via mouse."
2015-09-25 14:58:42 +00:00
Ben Kwa
bd7da4c44e
Activate selection mode when selecting via mouse.
...
Modify the MultiSelectManager so that toggling selection on an item
notifies listeners of selection changes, if necessary. This fixes a bug
where notifySelectionChanged wasn't getting called when the selection
changed.
BUG=23944862
Change-Id: I3aef41cc92c560dc15bdc0fe310c340bdb3005f6
2015-09-25 07:47:56 -07:00
Wale Ogunwale
49966d67a8
Merge "Batch ACTION_MOVE events to vsync boundries when resizing task"
2015-09-25 14:39:42 +00:00
Abodunrinwa Toki
ca4aaf3c17
Add more TextView selection (by touch) tests.
...
This change adds simple tests for:
- longpress and drag to select
- double-tap and drag to select
Bug: 24102650
Change-Id: I8614c8ec430dfc204159a03be409a2361cd7d844
2015-09-25 10:53:19 +01: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