OSDN Git Service
Winson Chung [Tue, 2 Jun 2015 14:21:57 +0000 (14:21 +0000)]
am
c50bb5b4: am
c85cd734: Merge "Don\'t focus view for invalid task index." into mnc-dev
* commit '
c50bb5b46255b0e1d7426401ef6c4f4381e8159e':
Don't focus view for invalid task index.
Adam Powell [Tue, 2 Jun 2015 14:21:46 +0000 (14:21 +0000)]
am
ecb6be7d: am
dc49d5f8: Merge "Fix one-action choosers with EXTRA_INITIAL_INTENTS" into mnc-dev
* commit '
ecb6be7d2889c2bb09179239817578fbb465bc99':
Fix one-action choosers with EXTRA_INITIAL_INTENTS
Tyler Gunn [Tue, 2 Jun 2015 14:21:40 +0000 (14:21 +0000)]
am
6b725182: am
29780eec: Merge "Cleanup Video API javadoc." into mnc-dev
* commit '
6b725182f58af150922a10a880c06f26c223acb9':
Cleanup Video API javadoc.
Tyler Gunn [Tue, 2 Jun 2015 14:21:33 +0000 (14:21 +0000)]
am
2f395f32: am
0feb9c9c: Merge "IMS: Conference fixes" into mnc-dev
* commit '
2f395f3233092032be55e4148edc7b8cb3d0697b':
IMS: Conference fixes
Dianne Hackborn [Tue, 2 Jun 2015 14:21:28 +0000 (14:21 +0000)]
am
0d69c19d: am
9ed0c410: Merge "Update VoiceInteractionService from API review." into mnc-dev
* commit '
0d69c19dcdc3df11c28d3981b086c40e94d860be':
Update VoiceInteractionService from API review.
Alan Viverette [Tue, 2 Jun 2015 14:21:13 +0000 (14:21 +0000)]
am
27e104d5: am
e1c68765: Merge "ActionBar menu text should look like Button" into mnc-dev
* commit '
27e104d56fc115c940429998c10d4bc7519f2f2d':
ActionBar menu text should look like Button
Raph Levien [Tue, 2 Jun 2015 14:21:07 +0000 (14:21 +0000)]
am
dcab9a13: am
fb2cdc4c: Merge "Revert "Revert "Use getRunAdvance to position cursor""" into mnc-dev
* commit '
dcab9a13f7220d4e29ecc18526ee17ccbd3b1b9f':
Revert "Revert "Use getRunAdvance to position cursor""
Alan Viverette [Tue, 2 Jun 2015 14:21:01 +0000 (14:21 +0000)]
am
49ceab84: am
e0e5c1cf: Merge "Clean up AbsListView constructor" into mnc-dev
* commit '
49ceab843872ea562d8deefc54ff86bf6dc3ba5f':
Clean up AbsListView constructor
Robert Shih [Tue, 2 Jun 2015 14:20:55 +0000 (14:20 +0000)]
am
8fe47569: am
eb8a51f3: Merge "MediaPlayer: trigger onError instead of exception on stale native notifications" into mnc-dev
* commit '
8fe47569912ffa5b98d9b092e63b7b1f0cd5f69b':
MediaPlayer: trigger onError instead of exception on stale native notifications
Abodunrinwa Toki [Mon, 1 Jun 2015 23:22:06 +0000 (23:22 +0000)]
am
d9b74249: am
bdd500ec: Merge "Fix FloatingToolbar look and animation for RTL." into mnc-dev
* commit '
d9b7424923662e465fe2cf155cb7a9e6eef434c0':
Fix FloatingToolbar look and animation for RTL.
Eino-Ville Talvala [Mon, 1 Jun 2015 23:22:00 +0000 (23:22 +0000)]
am
a2956f6e: am
14438d12: Merge "Camera2: Add tangential distortion coefficients" into mnc-dev
* commit '
a2956f6e059e8565a0f6d48ea3c85cc827bffdb4':
Camera2: Add tangential distortion coefficients
Andrew Flynn [Mon, 1 Jun 2015 23:21:55 +0000 (23:21 +0000)]
am
0a44e64a: am
9d28852f: Merge "Remove separate light/dark animated vector drawables" into mnc-dev
* commit '
0a44e64a8299277f58d29bfae94bb7db6e78cb86':
Remove separate light/dark animated vector drawables
Chris Craik [Mon, 1 Jun 2015 23:21:50 +0000 (23:21 +0000)]
am
e63136a3: am
8c1e287b: Merge "Fix RenderScript copy tracing sections" into mnc-dev
* commit '
e63136a36ec6e5f22d53654c85b8b3eb0b19cb27':
Fix RenderScript copy tracing sections
Winson Chung [Mon, 1 Jun 2015 23:21:35 +0000 (23:21 +0000)]
am
c85cd734: Merge "Don\'t focus view for invalid task index." into mnc-dev
* commit '
c85cd734bdf75a55608fae1d5a47b4ac72db4ee8':
Don't focus view for invalid task index.
Winson Chung [Mon, 1 Jun 2015 23:07:36 +0000 (23:07 +0000)]
Merge "Don't focus view for invalid task index." into mnc-dev
Winson Chung [Mon, 1 Jun 2015 23:02:58 +0000 (16:02 -0700)]
Don't focus view for invalid task index.
Bug:
21322861
Change-Id: I7b8397d18b488bd8f459e578b64d6e82e4f1437d
Adam Powell [Mon, 1 Jun 2015 22:40:22 +0000 (22:40 +0000)]
am
dc49d5f8: Merge "Fix one-action choosers with EXTRA_INITIAL_INTENTS" into mnc-dev
* commit '
dc49d5f8ae9005a119172f72ccda1de9bc85c2d9':
Fix one-action choosers with EXTRA_INITIAL_INTENTS
Tyler Gunn [Mon, 1 Jun 2015 22:40:17 +0000 (22:40 +0000)]
am
29780eec: Merge "Cleanup Video API javadoc." into mnc-dev
* commit '
29780eecd06bddcd33692c06075f8c5390b88357':
Cleanup Video API javadoc.
Tyler Gunn [Mon, 1 Jun 2015 22:40:13 +0000 (22:40 +0000)]
am
0feb9c9c: Merge "IMS: Conference fixes" into mnc-dev
* commit '
0feb9c9cf947deb893f5a400489ecf7e48626281':
IMS: Conference fixes
Dianne Hackborn [Mon, 1 Jun 2015 22:40:07 +0000 (22:40 +0000)]
am
9ed0c410: Merge "Update VoiceInteractionService from API review." into mnc-dev
* commit '
9ed0c4109df27c0956f97b7a074c0b67daa0ebd8':
Update VoiceInteractionService from API review.
Adam Powell [Mon, 1 Jun 2015 22:37:37 +0000 (22:37 +0000)]
Merge "Fix one-action choosers with EXTRA_INITIAL_INTENTS" into mnc-dev
Tyler Gunn [Mon, 1 Jun 2015 22:35:28 +0000 (22:35 +0000)]
Merge "Cleanup Video API javadoc." into mnc-dev
Tyler Gunn [Mon, 1 Jun 2015 22:33:57 +0000 (22:33 +0000)]
Merge "IMS: Conference fixes" into mnc-dev
Dianne Hackborn [Mon, 1 Jun 2015 22:28:44 +0000 (22:28 +0000)]
Merge "Update VoiceInteractionService from API review." into mnc-dev
Alan Viverette [Mon, 1 Jun 2015 22:15:08 +0000 (22:15 +0000)]
am
e1c68765: Merge "ActionBar menu text should look like Button" into mnc-dev
* commit '
e1c68765cf53473e710438f90e42e0cb26dffe1b':
ActionBar menu text should look like Button
Raph Levien [Mon, 1 Jun 2015 22:10:07 +0000 (22:10 +0000)]
am
fb2cdc4c: Merge "Revert "Revert "Use getRunAdvance to position cursor""" into mnc-dev
* commit '
fb2cdc4ca131ff95179414854eca02a098a29a8a':
Revert "Revert "Use getRunAdvance to position cursor""
Alan Viverette [Mon, 1 Jun 2015 22:10:02 +0000 (22:10 +0000)]
am
e0e5c1cf: Merge "Clean up AbsListView constructor" into mnc-dev
* commit '
e0e5c1cf1965302fcf177eaade372313504ea53a':
Clean up AbsListView constructor
Robert Shih [Mon, 1 Jun 2015 22:09:57 +0000 (22:09 +0000)]
am
eb8a51f3: Merge "MediaPlayer: trigger onError instead of exception on stale native notifications" into mnc-dev
* commit '
eb8a51f359e4e1f4187eb14fa5e584979d26768b':
MediaPlayer: trigger onError instead of exception on stale native notifications
Alan Viverette [Mon, 1 Jun 2015 22:08:27 +0000 (22:08 +0000)]
Merge "ActionBar menu text should look like Button" into mnc-dev
Raph Levien [Mon, 1 Jun 2015 21:41:58 +0000 (21:41 +0000)]
Merge "Revert "Revert "Use getRunAdvance to position cursor""" into mnc-dev
Alan Viverette [Mon, 1 Jun 2015 21:56:34 +0000 (21:56 +0000)]
Merge "Clean up AbsListView constructor" into mnc-dev
Robert Shih [Mon, 1 Jun 2015 21:55:49 +0000 (21:55 +0000)]
Merge "MediaPlayer: trigger onError instead of exception on stale native notifications" into mnc-dev
Tyler Gunn [Mon, 1 Jun 2015 21:29:11 +0000 (14:29 -0700)]
IMS: Conference fixes
- Set phoneaccount to Conference
- Handle conference call in DIALING state
Change-Id: I549bf664724473f0d5d4450cbc8d96f7b534f43a
Bug:
21376607
Abodunrinwa Toki [Mon, 1 Jun 2015 21:42:27 +0000 (21:42 +0000)]
am
bdd500ec: Merge "Fix FloatingToolbar look and animation for RTL." into mnc-dev
* commit '
bdd500ecd4ceea7d4e4a06ece08c9b9fd5d8aec5':
Fix FloatingToolbar look and animation for RTL.
Eino-Ville Talvala [Mon, 1 Jun 2015 21:42:22 +0000 (21:42 +0000)]
am
14438d12: Merge "Camera2: Add tangential distortion coefficients" into mnc-dev
* commit '
14438d122c1e7ab88a6169bca13a35d50e76e91e':
Camera2: Add tangential distortion coefficients
Andrew Flynn [Mon, 1 Jun 2015 21:42:08 +0000 (21:42 +0000)]
am
9d28852f: Merge "Remove separate light/dark animated vector drawables" into mnc-dev
* commit '
9d28852f6108b20266de0282f4bf858e679316b7':
Remove separate light/dark animated vector drawables
Chris Craik [Mon, 1 Jun 2015 21:41:40 +0000 (21:41 +0000)]
am
8c1e287b: Merge "Fix RenderScript copy tracing sections" into mnc-dev
* commit '
8c1e287bf801d98cbaa6df904524625c3935fdd0':
Fix RenderScript copy tracing sections
Raph Levien [Mon, 1 Jun 2015 21:34:47 +0000 (14:34 -0700)]
Revert "Revert "Use getRunAdvance to position cursor""
This reverts commit
5730c974800a0ffed59a041d9e249a5c42e417db.
Abodunrinwa Toki [Mon, 1 Jun 2015 21:31:19 +0000 (21:31 +0000)]
Merge "Fix FloatingToolbar look and animation for RTL." into mnc-dev
Eino-Ville Talvala [Mon, 1 Jun 2015 21:26:01 +0000 (21:26 +0000)]
Merge "Camera2: Add tangential distortion coefficients" into mnc-dev
Andrew Flynn [Mon, 1 Jun 2015 21:11:51 +0000 (21:11 +0000)]
Merge "Remove separate light/dark animated vector drawables" into mnc-dev
Chris Craik [Mon, 1 Jun 2015 20:58:01 +0000 (20:58 +0000)]
Merge "Fix RenderScript copy tracing sections" into mnc-dev
Robert Shih [Thu, 28 May 2015 01:11:44 +0000 (18:11 -0700)]
MediaPlayer: trigger onError instead of exception on stale native notifications
This change also reverted commit
2c838fbd87ad5685c0008b419ea02421159b9b70,
"MediaPlayer: add mPreparing to weed out unwanted prepared messages".
Bug:
21266735
Change-Id: I392342519420bee2fde1fe1915c51d24101ca27d
Andrew Flynn [Mon, 1 Jun 2015 20:34:21 +0000 (16:34 -0400)]
Remove separate light/dark animated vector drawables
Now that AnimatedVectorDrawables can use themed animations, SysUI no longer
needs to track separate AVDs for the carrier network change icons.
Bug:
21118142
Change-Id: Ifb6d7b5e7e3de85c10bc13183b4142fd2e6714b6
Chris Tate [Mon, 1 Jun 2015 20:27:42 +0000 (20:27 +0000)]
am
598d143a: am
88fb1453: Merge "DO NOT MERGE Fix bug regarding the comparator sorts Alarms into increasing time order." into mnc-dev
* commit '
598d143a0e0b211e3929a355afbffb7719404f1a':
DO NOT MERGE Fix bug regarding the comparator sorts Alarms into increasing time order.
John Spurlock [Mon, 1 Jun 2015 20:27:37 +0000 (20:27 +0000)]
am
587ae867: am
b0db15c6: Merge "Next alarm clock updates." into mnc-dev
* commit '
587ae8679d425bc18771a07622279c566e590db3':
Next alarm clock updates.
Andrew Flynn [Mon, 1 Jun 2015 20:27:32 +0000 (20:27 +0000)]
am
19390a64: am
78b16987: Merge "Change colors of AVD test" into mnc-dev
* commit '
19390a6458ed14ed35d5d7c36dbfd1c58bee1b90':
Change colors of AVD test
Chris Tate [Mon, 1 Jun 2015 20:20:54 +0000 (20:20 +0000)]
am
88fb1453: Merge "DO NOT MERGE Fix bug regarding the comparator sorts Alarms into increasing time order." into mnc-dev
* commit '
88fb14532421f049614c34120c706c26a9af6bbd':
DO NOT MERGE Fix bug regarding the comparator sorts Alarms into increasing time order.
John Spurlock [Mon, 1 Jun 2015 20:13:03 +0000 (20:13 +0000)]
am
b0db15c6: Merge "Next alarm clock updates." into mnc-dev
* commit '
b0db15c6d99ab5f9d8a7bd6a44fc097a5f61edca':
Next alarm clock updates.
Andrew Flynn [Mon, 1 Jun 2015 20:12:53 +0000 (20:12 +0000)]
am
78b16987: Merge "Change colors of AVD test" into mnc-dev
* commit '
78b16987dfb044c8adbb19d2cd206a8aaeb6e850':
Change colors of AVD test
Chris Tate [Mon, 1 Jun 2015 20:11:56 +0000 (20:11 +0000)]
Merge "DO NOT MERGE Fix bug regarding the comparator sorts Alarms into increasing time order." into mnc-dev
John Spurlock [Mon, 1 Jun 2015 20:07:38 +0000 (20:07 +0000)]
Merge "Next alarm clock updates." into mnc-dev
Raph Levien [Mon, 1 Jun 2015 20:06:24 +0000 (20:06 +0000)]
am
c73314bc: am
cf8b3b1c: Merge "Revert "Use getRunAdvance to position cursor"" into mnc-dev
* commit '
c73314bcb18f6879bb6f9923912ab38a0c831637':
Revert "Use getRunAdvance to position cursor"
Jason Monk [Mon, 1 Jun 2015 20:06:19 +0000 (20:06 +0000)]
am
eeee276b: am
061e2bbf: Merge "Be more careful with mAccessPoints usage" into mnc-dev
* commit '
eeee276b31260425098b321ddd089c6e005b6583':
Be more careful with mAccessPoints usage
Andrew Flynn [Mon, 1 Jun 2015 20:04:06 +0000 (20:04 +0000)]
Merge "Change colors of AVD test" into mnc-dev
Raph Levien [Mon, 1 Jun 2015 19:55:12 +0000 (19:55 +0000)]
am
cf8b3b1c: Merge "Revert "Use getRunAdvance to position cursor"" into mnc-dev
* commit '
cf8b3b1c56b5aaaa8552c1bc9bb88c8a1285f99f':
Revert "Use getRunAdvance to position cursor"
Jason Monk [Mon, 1 Jun 2015 19:55:08 +0000 (19:55 +0000)]
am
061e2bbf: Merge "Be more careful with mAccessPoints usage" into mnc-dev
* commit '
061e2bbf6bdbcccd71844248be953081f2b5fe70':
Be more careful with mAccessPoints usage
Raph Levien [Mon, 1 Jun 2015 19:45:24 +0000 (19:45 +0000)]
Merge "Revert "Use getRunAdvance to position cursor"" into mnc-dev
Jason Monk [Mon, 1 Jun 2015 19:45:22 +0000 (19:45 +0000)]
Merge "Be more careful with mAccessPoints usage" into mnc-dev
Raph Levien [Mon, 1 Jun 2015 19:40:42 +0000 (12:40 -0700)]
Revert "Use getRunAdvance to position cursor"
This reverts commit
cb5499c85097450c48f66f6c08a35bab2ad5ab12.
Bug:
21549197
Jorim Jaggi [Mon, 1 Jun 2015 19:29:19 +0000 (19:29 +0000)]
am
c8d5901b: am
1e47a8e0: Merge "Cleanup Keyguard handling when turning off screen" into mnc-dev
* commit '
c8d5901bc83814c0dab281fc108de643cdd7b09d':
Cleanup Keyguard handling when turning off screen
Filip Gruszczynski [Mon, 1 Jun 2015 19:29:14 +0000 (19:29 +0000)]
am
49895c6e: am
29c840eb: am
11d50c9c: am
06756f35: Dismiss or cancel in SwipeDismissLayout on screen off.
* commit '
49895c6eadcca35bfe4369b53c8fc2e13a603520':
Dismiss or cancel in SwipeDismissLayout on screen off.
Wale Ogunwale [Mon, 1 Jun 2015 19:29:10 +0000 (19:29 +0000)]
am
320b9534: am
4021117d: Merge "Allow app to stop lockTaskMode if started by manifest attribute" into mnc-dev
* commit '
320b953417ef8a048ede95ba933046b60c3b7532':
Allow app to stop lockTaskMode if started by manifest attribute
Jorim Jaggi [Mon, 1 Jun 2015 19:18:29 +0000 (19:18 +0000)]
am
1e47a8e0: Merge "Cleanup Keyguard handling when turning off screen" into mnc-dev
* commit '
1e47a8e096fc28dcab0a55bc4f2e6b747bfb1a07':
Cleanup Keyguard handling when turning off screen
Filip Gruszczynski [Mon, 1 Jun 2015 19:18:25 +0000 (19:18 +0000)]
am
29c840eb: am
11d50c9c: am
06756f35: Dismiss or cancel in SwipeDismissLayout on screen off.
* commit '
29c840ebb08d97451fd5a5923ad20d7bf1990048':
Dismiss or cancel in SwipeDismissLayout on screen off.
Wale Ogunwale [Mon, 1 Jun 2015 19:18:20 +0000 (19:18 +0000)]
am
4021117d: Merge "Allow app to stop lockTaskMode if started by manifest attribute" into mnc-dev
* commit '
4021117d0a78f89c9c9e5acc0e4d61092952e5f5':
Allow app to stop lockTaskMode if started by manifest attribute
Jorim Jaggi [Mon, 1 Jun 2015 19:13:10 +0000 (19:13 +0000)]
Merge "Cleanup Keyguard handling when turning off screen" into mnc-dev
Filip Gruszczynski [Mon, 1 Jun 2015 19:09:57 +0000 (19:09 +0000)]
am
11d50c9c: am
06756f35: Dismiss or cancel in SwipeDismissLayout on screen off.
* commit '
11d50c9cc6f9990af5b9abf2058f6b7d4a5c8ae0':
Dismiss or cancel in SwipeDismissLayout on screen off.
Wale Ogunwale [Mon, 1 Jun 2015 19:06:44 +0000 (19:06 +0000)]
Merge "Allow app to stop lockTaskMode if started by manifest attribute" into mnc-dev
Jason Monk [Mon, 1 Jun 2015 19:00:57 +0000 (15:00 -0400)]
Be more careful with mAccessPoints usage
Bug:
21559453
Change-Id: I1a0bcf7282ad1a651169dea7e8ac5bc618b580d1
Filip Gruszczynski [Mon, 1 Jun 2015 18:57:21 +0000 (18:57 +0000)]
am
06756f35: Dismiss or cancel in SwipeDismissLayout on screen off.
* commit '
06756f352d2046246bc147fa1f55d1dfbfcb37f5':
Dismiss or cancel in SwipeDismissLayout on screen off.
Winson Chung [Mon, 1 Jun 2015 18:52:07 +0000 (18:52 +0000)]
am
85fe74c3: am
6920474b: Merge "Ensuring that we write to disk first." into mnc-dev
* commit '
85fe74c3478f6bb1b2e72950697815d1eeadfec3':
Ensuring that we write to disk first.
Winson Chung [Mon, 1 Jun 2015 18:52:03 +0000 (18:52 +0000)]
am
a83faa66: am
a74f385b: Allow long-pressing task icon to show app-info.
* commit '
a83faa666f173d329370b7d17e53b0dfc219354c':
Allow long-pressing task icon to show app-info.
Yorke Lee [Mon, 1 Jun 2015 18:51:53 +0000 (18:51 +0000)]
am
4f606433: am
064fc83b: Merge "Add ability to modify default dialer via ADB" into mnc-dev
* commit '
4f606433ead5f76d2b49715fc208458f7ca933dc':
Add ability to modify default dialer via ADB
Alan Viverette [Mon, 1 Jun 2015 18:51:48 +0000 (18:51 +0000)]
am
c6296a76: am
0ee2c1ae: Merge "Prevent crash when ColorStateList has unresolved attrs" into mnc-dev
* commit '
c6296a76869422fd698ada889a74bc3129792db5':
Prevent crash when ColorStateList has unresolved attrs
Yin-Chia Yeh [Mon, 1 Jun 2015 18:51:43 +0000 (18:51 +0000)]
am
21f55342: am
254ed616: Merge "Camera2: Add missing LEGACY available keys" into mnc-dev
* commit '
21f55342d60e54c9e899aa746cf1a848f2910e61':
Camera2: Add missing LEGACY available keys
Alex Klyubin [Mon, 1 Jun 2015 18:51:38 +0000 (18:51 +0000)]
am
18fa9176: am
0de6dea6: Merge "No need to specify key size when importing." into mnc-dev
* commit '
18fa91765a00925787ee9214ad044dac28c77b76':
No need to specify key size when importing.
Andres Morales [Mon, 1 Jun 2015 18:51:32 +0000 (18:51 +0000)]
am
9250d972: am
0fddb1a6: Merge "Revert "[partition checking] re-enable bootimage/bootloader, add recovery"" into mnc-dev
* commit '
9250d9727b5a71267cb33b535bdd959c1c03b11a':
Revert "[partition checking] re-enable bootimage/bootloader, add recovery"
Chien-Yu Chen [Mon, 1 Jun 2015 18:51:27 +0000 (18:51 +0000)]
am
a56dee8e: am
61bae6d8: Merge "Camera2: update docs for reprocess timestamp" into mnc-dev
* commit '
a56dee8edecddfe298d348c4006de6dea0e92374':
Camera2: update docs for reprocess timestamp
Alan Viverette [Mon, 1 Jun 2015 18:51:12 +0000 (18:51 +0000)]
am
af3134ae: am
9be801c8: Merge "Don\'t ignore explicit dividerHeight of 0 specified in XML" into mnc-dev
* commit '
af3134ae74538bf716da8ecdc0a07f29e5bdc145':
Don't ignore explicit dividerHeight of 0 specified in XML
Alan Viverette [Mon, 1 Jun 2015 18:50:46 +0000 (18:50 +0000)]
am
508b6d2d: am
242b9c4e: Merge "Fix row/column order when unparcelling CollectionItemInfo" into mnc-dev
* commit '
508b6d2d576b1bdd528362fbb069961a9a65c2fb':
Fix row/column order when unparcelling CollectionItemInfo
Stuart Scott [Mon, 1 Jun 2015 18:50:39 +0000 (18:50 +0000)]
am
378c2cbf: am
e3e314df: Network Reset should have a lockdown like Factory Reset.
* commit '
378c2cbf2ebc2e3668da7d5a285fe3ec6b9d7ee8':
Network Reset should have a lockdown like Factory Reset.
Joe Fernandez [Mon, 1 Jun 2015 18:50:30 +0000 (18:50 +0000)]
am
2f752f8f: am
540d0e0d: am
583b7f2c: am
9bf0e9d0: Merge "docs: Android Dashboard - June 2015 update" into mnc-preview-docs
* commit '
2f752f8f771c269d5e2486067569d78850f105b5':
docs: Android Dashboard - June 2015 update
Filip Gruszczynski [Mon, 1 Jun 2015 18:50:25 +0000 (18:50 +0000)]
am
2e7e5c1c: am
48fe2631: resolved conflicts for merge of
a61e23f1 to mnc-dev
* commit '
2e7e5c1cbfeea58e5d083679a857d75c090f3289':
Only use outsets for full screen windows.
Mady Mellor [Mon, 1 Jun 2015 18:50:15 +0000 (18:50 +0000)]
am
8de52276: am
3aa33b3d: Merge "Update button to BUTTON_STYLUS_PRIMARY" into mnc-dev
* commit '
8de52276a1f5faf83ea8147f0ddee74195279bba':
Update button to BUTTON_STYLUS_PRIMARY
Mady Mellor [Mon, 1 Jun 2015 18:50:09 +0000 (18:50 +0000)]
am
8c189479: am
ef24bc00: Merge "Update stylus button press recognition in View to use new MotionEvent APIs" into mnc-dev
* commit '
8c189479a02dfae2874a622dd79abcbcded0c809':
Update stylus button press recognition in View to use new MotionEvent APIs
Mady Mellor [Mon, 1 Jun 2015 18:50:04 +0000 (18:50 +0000)]
am
ed836dec: am
cac7b2b1: Merge "Update stylus button press recognition in GestureDetector to use new APIs" into mnc-dev
* commit '
ed836decd81c2b8d894bf2fd658f45a761f795cd':
Update stylus button press recognition in GestureDetector to use new APIs
Filip Gruszczynski [Mon, 1 Jun 2015 18:49:58 +0000 (18:49 +0000)]
am
6f68b90e: am
8825de17: Merge "Revert "Revert "Fix build.""" into mnc-dev
* commit '
6f68b90ebf7714a628b110a2c4c534c17d7e20d2':
Revert "Revert "Fix build.""
smain@google.com [Mon, 1 Jun 2015 18:49:53 +0000 (18:49 +0000)]
am
b42f1007: am
b3054109: am
67725e2a: am
7f6da0c3: add back the GMS and GCM reference lists to fix search suggest. mistakenly removed during: https://googleplex-android-review.git.corp.google.com/#/c/697534/1
* commit '
b42f1007b3227ba2b1b20590031585f9603c3f94':
add back the GMS and GCM reference lists to fix search suggest. mistakenly removed during: https://googleplex-android-review.git.corp.google.com/#/c/697534/1
Filip Gruszczynski [Mon, 1 Jun 2015 18:49:47 +0000 (18:49 +0000)]
am
21605b33: am
99bcc3ee: Merge "Revert "Revert "resolved conflicts for merge of
47249f2a to mnc-dev""" into mnc-dev
* commit '
21605b3395372b1ee1dd645bb8d9e50c7e7e9460':
Revert "Revert "resolved conflicts for merge of
47249f2a to mnc-dev""
Dianne Hackborn [Sat, 30 May 2015 00:58:53 +0000 (17:58 -0700)]
Update VoiceInteractionService from API review.
This may even manage to retain compatibility with existing
binaries! (For now.)
Change-Id: I3b1386287a6b9b20b57ac2e2444fd6f458837277
Wale Ogunwale [Mon, 1 Jun 2015 16:48:36 +0000 (09:48 -0700)]
Allow app to stop lockTaskMode if started by manifest attribute
It is possible lockTaskMode was started by the system process
because android:lockTaskMode is set to a locking value in the
application's manifest instead of the app calling
startLockTaskMode. In this case TaskRecord.mLockTaskUid will
be 0, so we compare the callingUid to the
TaskRecord.effectiveUid instead so the app can exit lockTaskMode.
Bug:
21464182
Change-Id: Ibca6de8e4b17051d5fcbb05cde9c8aefed7216f2
Alan Viverette [Mon, 1 Jun 2015 18:27:04 +0000 (11:27 -0700)]
ActionBar menu text should look like Button
Bug:
21560189
Change-Id: Idae6569a5b1c9e3e3ab297c4d057f37e9add9aaa
Winson Chung [Mon, 1 Jun 2015 18:23:41 +0000 (18:23 +0000)]
am
6920474b: Merge "Ensuring that we write to disk first." into mnc-dev
* commit '
6920474bac7c212dd384b6ef1134c59b73669942':
Ensuring that we write to disk first.
Winson Chung [Mon, 1 Jun 2015 18:23:37 +0000 (18:23 +0000)]
am
a74f385b: Allow long-pressing task icon to show app-info.
* commit '
a74f385ba08922c09aa812f0d6fd2903a633da01':
Allow long-pressing task icon to show app-info.
Winson Chung [Mon, 1 Jun 2015 18:19:44 +0000 (18:19 +0000)]
Merge "Ensuring that we write to disk first." into mnc-dev
Winson Chung [Fri, 29 May 2015 20:36:56 +0000 (13:36 -0700)]
Ensuring that we write to disk first.
Change-Id: I2c55db77ab6feef1b405858aac53fb0ed3370dc2
Winson Chung [Fri, 29 May 2015 23:27:00 +0000 (16:27 -0700)]
Allow long-pressing task icon to show app-info.
Bug:
17369696
Geoff Mendal [Mon, 1 Jun 2015 18:14:23 +0000 (18:14 +0000)]
am
07ec79d2: (-s ours) am
c4e5ec3f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
07ec79d269bf565becb2eb096dc28c1bb953a4be':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 18:14:18 +0000 (18:14 +0000)]
am
32b0118a: (-s ours) am
e4a9ecb2: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
32b0118ab1dd92fb02bb20e12d6c7f9f97cabf88':
Import translations. DO NOT MERGE
OSDN Git Service
