OSDN Git Service
Deepanshu Gupta [Tue, 2 Jun 2015 19:21:18 +0000 (19:21 +0000)]
am
604fab3c: am
d61ff1cf: am
7ef93d15: Merge "Skip warnings for some unresolved references." into mnc-dev
* commit '
604fab3c4c0440f1a3fe1620202b33882b87112d':
Skip warnings for some unresolved references.
Quddus Chong [Tue, 2 Jun 2015 19:21:10 +0000 (19:21 +0000)]
am
f64d85b4: am
e2c09c2f: am
133b107d: am
65b7485d: am
2b95561d: docs: Fixed typo for confirm credentials section in the API Overview. bug:
21444273
* commit '
f64d85b4d271cda3454aa244eb43868f7f7ecb4f':
Winson Chung [Tue, 2 Jun 2015 19:21:03 +0000 (19:21 +0000)]
am
49e76757: am
c50bb5b4: am
c85cd734: Merge "Don\'t focus view for invalid task index." into mnc-dev
* commit '
49e7675745cac3b38d2bbce18d09347e23e8515f':
Don't focus view for invalid task index.
Adam Powell [Tue, 2 Jun 2015 19:20:56 +0000 (19:20 +0000)]
am
a974b09c: am
ecb6be7d: am
dc49d5f8: Merge "Fix one-action choosers with EXTRA_INITIAL_INTENTS" into mnc-dev
* commit '
a974b09c67228d8bab3cfbe91f7e38bae0323c81':
Fix one-action choosers with EXTRA_INITIAL_INTENTS
Tyler Gunn [Tue, 2 Jun 2015 19:20:51 +0000 (19:20 +0000)]
am
00055784: am
6b725182: am
29780eec: Merge "Cleanup Video API javadoc." into mnc-dev
* commit '
0005578446f25632e2a01096f732a5b9d0aaf575':
Cleanup Video API javadoc.
Tyler Gunn [Tue, 2 Jun 2015 19:20:44 +0000 (19:20 +0000)]
am
ddd1dafd: am
2f395f32: am
0feb9c9c: Merge "IMS: Conference fixes" into mnc-dev
* commit '
ddd1dafd26ec61613003f766d515c700d9fb11f2':
IMS: Conference fixes
Dianne Hackborn [Tue, 2 Jun 2015 19:20:33 +0000 (19:20 +0000)]
am
4f57deb9: am
0d69c19d: am
9ed0c410: Merge "Update VoiceInteractionService from API review." into mnc-dev
* commit '
4f57deb99025c6d625ffb17eba92190670a26f67':
Update VoiceInteractionService from API review.
Alan Viverette [Tue, 2 Jun 2015 19:20:27 +0000 (19:20 +0000)]
am
cff4394d: am
27e104d5: am
e1c68765: Merge "ActionBar menu text should look like Button" into mnc-dev
* commit '
cff4394db1ad467f058828cd013ca29065fab1f4':
ActionBar menu text should look like Button
Raph Levien [Tue, 2 Jun 2015 19:20:21 +0000 (19:20 +0000)]
am
7689a967: am
dcab9a13: am
fb2cdc4c: Merge "Revert "Revert "Use getRunAdvance to position cursor""" into mnc-dev
* commit '
7689a967a76a8ddd827be9efd8b2b1b6c60f8648':
Revert "Revert "Use getRunAdvance to position cursor""
Alan Viverette [Tue, 2 Jun 2015 19:20:15 +0000 (19:20 +0000)]
am
9a5b45c1: am
49ceab84: am
e0e5c1cf: Merge "Clean up AbsListView constructor" into mnc-dev
* commit '
9a5b45c1e1e91f00fed6d84876a670f5278f934f':
Clean up AbsListView constructor
Robert Shih [Tue, 2 Jun 2015 19:20:09 +0000 (19:20 +0000)]
am
e7a9ba99: am
8fe47569: am
eb8a51f3: Merge "MediaPlayer: trigger onError instead of exception on stale native notifications" into mnc-dev
* commit '
e7a9ba9934a6d6ef13ca2f072a41bf342d8c4ac0':
MediaPlayer: trigger onError instead of exception on stale native notifications
Deepanshu Gupta [Tue, 2 Jun 2015 14:22:08 +0000 (14:22 +0000)]
am
d61ff1cf: am
7ef93d15: Merge "Skip warnings for some unresolved references." into mnc-dev
* commit '
d61ff1cf099c16cf38d095e6e401d92f9205b78f':
Skip warnings for some unresolved references.
Quddus Chong [Tue, 2 Jun 2015 14:22:03 +0000 (14:22 +0000)]
am
e2c09c2f: am
133b107d: am
65b7485d: am
2b95561d: docs: Fixed typo for confirm credentials section in the API Overview. bug:
21444273
* commit '
e2c09c2f975c187af3270bc36f2b92019339f74a':
docs: Fixed typo for confirm credentials section in the API Overview. bug:
21444273
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
Ben Kwa [Tue, 2 Jun 2015 14:20:35 +0000 (14:20 +0000)]
Merge "Fix text on move notifications and toasts."
Abodunrinwa Toki [Mon, 1 Jun 2015 23:43:05 +0000 (23:43 +0000)]
am
4af95ede: am
d9b74249: am
bdd500ec: Merge "Fix FloatingToolbar look and animation for RTL." into mnc-dev
* commit '
4af95ede5bec291975221eb55d9c9c492d772acd':
Fix FloatingToolbar look and animation for RTL.
Eino-Ville Talvala [Mon, 1 Jun 2015 23:42:59 +0000 (23:42 +0000)]
am
0c421419: am
a2956f6e: am
14438d12: Merge "Camera2: Add tangential distortion coefficients" into mnc-dev
* commit '
0c4214191fa93ff3c628a8461d6bd6ef2bb54d3a':
Camera2: Add tangential distortion coefficients
Andrew Flynn [Mon, 1 Jun 2015 23:42:55 +0000 (23:42 +0000)]
am
174ebb1f: am
0a44e64a: am
9d28852f: Merge "Remove separate light/dark animated vector drawables" into mnc-dev
* commit '
174ebb1f7f397077867a91f5ae8929753d6ca58a':
Remove separate light/dark animated vector drawables
Chris Craik [Mon, 1 Jun 2015 23:42:47 +0000 (23:42 +0000)]
am
48b01043: am
e63136a3: am
8c1e287b: Merge "Fix RenderScript copy tracing sections" into mnc-dev
* commit '
48b01043747acab0c12122c3c7c2bbbf3d03ea28':
Fix RenderScript copy tracing sections
Deepanshu Gupta [Mon, 1 Jun 2015 23:28:48 +0000 (23:28 +0000)]
am
7ef93d15: Merge "Skip warnings for some unresolved references." into mnc-dev
* commit '
7ef93d157344b07e17715b0fa6e69a4d97154dfa':
Skip warnings for some unresolved references.
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
Quddus Chong [Mon, 1 Jun 2015 23:21:40 +0000 (23:21 +0000)]
am
133b107d: am
65b7485d: am
2b95561d: docs: Fixed typo for confirm credentials section in the API Overview. bug:
21444273
* commit '
133b107d28649ef5a984be0acc06f53e49853b22':
docs: Fixed typo for confirm credentials section in the API Overview. bug:
21444273
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.
Deepanshu Gupta [Mon, 1 Jun 2015 23:20:03 +0000 (23:20 +0000)]
Merge "Skip warnings for some unresolved references." into mnc-dev
Quddus Chong [Mon, 1 Jun 2015 23:11:47 +0000 (23:11 +0000)]
am
65b7485d: am
2b95561d: docs: Fixed typo for confirm credentials section in the API Overview. bug:
21444273
* commit '
65b7485d64661394b61df3df7eeccd063932886e':
docs: Fixed typo for confirm credentials section in the API Overview. bug:
21444273
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
Joe Fernandez [Mon, 1 Jun 2015 22:59:17 +0000 (22:59 +0000)]
Merge "docs/ndk/reference: fix toc"
Johan Euphrosine [Mon, 1 Jun 2015 22:45:29 +0000 (15:45 -0700)]
docs/ndk/reference: fix toc
Change-Id: Idd5da29c25dd9d1597f253c8ba5357838c8b6c8c
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
Geoff Mendal [Mon, 1 Jun 2015 22:23:42 +0000 (22:23 +0000)]
Merge "Import translations. DO NOT MERGE"
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
Deepanshu Gupta [Wed, 27 May 2015 19:35:56 +0000 (12:35 -0700)]
Skip warnings for some unresolved references.
Some applications rename the newer RTL attributes to the older
attributes in order to target RTL locales, but not need to include two
attributes everywhere it's needed. For example, iosched renames
paddingStart to paddingLeft (among other attributes) for API 17 and
above. This leads to hundreds of warnings about missing attributes.
This change suppresses such warnings.
Also, skip adding unresolved attributes to the typed array. This is more
in line with the actual implementation on device, and prevents
unexpected warnings/errors/crashes later.
Change-Id: Iee616fa6295aa9731ede0cf9dcd6dd2bd1fe8f20
Raph Levien [Mon, 1 Jun 2015 21:34:47 +0000 (14:34 -0700)]
Revert "Revert "Use getRunAdvance to position cursor""
This reverts commit
5730c974800a0ffed59a041d9e249a5c42e417db.
Quddus Chong [Mon, 1 Jun 2015 21:31:23 +0000 (21:31 +0000)]
am
2b95561d: docs: Fixed typo for confirm credentials section in the API Overview. bug:
21444273
* commit '
2b95561db50426779947ad5ab680994c24d79396':
docs: Fixed typo for confirm credentials section in the API Overview. bug:
21444273
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
Quddus Chong [Mon, 1 Jun 2015 21:05:12 +0000 (14:05 -0700)]
docs: Fixed typo for confirm credentials section in the API Overview.
bug:
21444273
Change-Id: I01700e95227e5f7c09a5d6428877087d7ff0121a
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:38:53 +0000 (20:38 +0000)]
am
5ff9d88c: (-s ours) am
598d143a: am
88fb1453: Merge "DO NOT MERGE Fix bug regarding the comparator sorts Alarms into increasing time order." into mnc-dev
* commit '
5ff9d88c90079fc5250e828e943838880cc1b6d5':
DO NOT MERGE Fix bug regarding the comparator sorts Alarms into increasing time order.
John Spurlock [Mon, 1 Jun 2015 20:38:47 +0000 (20:38 +0000)]
am
be3650be: am
587ae867: am
b0db15c6: Merge "Next alarm clock updates." into mnc-dev
* commit '
be3650be63875a740932bd38274857dbee36a2fa':
Next alarm clock updates.
Andrew Flynn [Mon, 1 Jun 2015 20:38:41 +0000 (20:38 +0000)]
am
f48de85a: am
19390a64: am
78b16987: Merge "Change colors of AVD test" into mnc-dev
* commit '
f48de85ad8470612d1f4b60f380fb6097cbd90a5':
Change colors of AVD test
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.
Raph Levien [Mon, 1 Jun 2015 20:20:18 +0000 (20:20 +0000)]
am
590e3221: am
c73314bc: am
cf8b3b1c: Merge "Revert "Use getRunAdvance to position cursor"" into mnc-dev
* commit '
590e32212c8121ead4439d19062dd3c3ddfa0f92':
Revert "Use getRunAdvance to position cursor"
Jason Monk [Mon, 1 Jun 2015 20:20:12 +0000 (20:20 +0000)]
am
1fe56080: am
eeee276b: am
061e2bbf: Merge "Be more careful with mAccessPoints usage" into mnc-dev
* commit '
1fe560802cf17747637a67f3924725cae7f098ab':
Be more careful with mAccessPoints usage
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
Jorim Jaggi [Mon, 1 Jun 2015 19:41:55 +0000 (19:41 +0000)]
am
6c498829: am
c8d5901b: am
1e47a8e0: Merge "Cleanup Keyguard handling when turning off screen" into mnc-dev
* commit '
6c49882975578158048f600d3dc69040db12dc5b':
Cleanup Keyguard handling when turning off screen
Filip Gruszczynski [Mon, 1 Jun 2015 19:41:50 +0000 (19:41 +0000)]
am
f02ace9b: am
49895c6e: am
29c840eb: am
11d50c9c: am
06756f35: Dismiss or cancel in SwipeDismissLayout on screen off.
* commit '
f02ace9b9b13a51ce1561d4c2b3b47874003070d':
Dismiss or cancel in SwipeDismissLayout on screen off.
Wale Ogunwale [Mon, 1 Jun 2015 19:41:45 +0000 (19:41 +0000)]
am
0f486a6e: am
320b9534: am
4021117d: Merge "Allow app to stop lockTaskMode if started by manifest attribute" into mnc-dev
* commit '
0f486a6e380a851c4d28039c4616eb7baf39ac0d':
Allow app to stop lockTaskMode if started by manifest attribute
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
OSDN Git Service
