OSDN Git Service
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
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
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
Geoff Mendal [Mon, 1 Jun 2015 22:23:42 +0000 (22:23 +0000)]
Merge "Import translations. DO NOT MERGE"
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
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
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
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
Winson Chung [Mon, 1 Jun 2015 19:05:49 +0000 (19:05 +0000)]
am
7098fae3: am
85fe74c3: am
6920474b: Merge "Ensuring that we write to disk first." into mnc-dev
* commit '
7098fae3ad514e21e03fad2fb560e49007598abd':
Ensuring that we write to disk first.
Winson Chung [Mon, 1 Jun 2015 19:05:43 +0000 (19:05 +0000)]
am
1345c7b8: am
a83faa66: am
a74f385b: Allow long-pressing task icon to show app-info.
* commit '
1345c7b8fef957f3a2e3da0a1dc5be348ff379ee':
Allow long-pressing task icon to show app-info.
Yorke Lee [Mon, 1 Jun 2015 19:05:37 +0000 (19:05 +0000)]
am
554a7366: am
4f606433: am
064fc83b: Merge "Add ability to modify default dialer via ADB" into mnc-dev
* commit '
554a7366448ecda18e4a0e529ae58345f3a505d7':
Add ability to modify default dialer via ADB
Alan Viverette [Mon, 1 Jun 2015 19:05:32 +0000 (19:05 +0000)]
am
217974cb: am
c6296a76: am
0ee2c1ae: Merge "Prevent crash when ColorStateList has unresolved attrs" into mnc-dev
* commit '
217974cbe7e7dc68d352a0d7820a170a5d5a532c':
Prevent crash when ColorStateList has unresolved attrs
Yin-Chia Yeh [Mon, 1 Jun 2015 19:05:25 +0000 (19:05 +0000)]
am
ccb8616a: am
21f55342: am
254ed616: Merge "Camera2: Add missing LEGACY available keys" into mnc-dev
* commit '
ccb8616ab382e4f33a1416ab09baa593a2af3dbd':
Camera2: Add missing LEGACY available keys
Alex Klyubin [Mon, 1 Jun 2015 19:05:18 +0000 (19:05 +0000)]
am
d022459b: am
18fa9176: am
0de6dea6: Merge "No need to specify key size when importing." into mnc-dev
* commit '
d022459bb9228658491874feda072e0733df05de':
No need to specify key size when importing.
Andres Morales [Mon, 1 Jun 2015 19:05:12 +0000 (19:05 +0000)]
am
ab21d60c: am
9250d972: am
0fddb1a6: Merge "Revert "[partition checking] re-enable bootimage/bootloader, add recovery"" into mnc-dev
* commit '
ab21d60c240fb2ef773cf4dda1ff5a4e7f4592d3':
Revert "[partition checking] re-enable bootimage/bootloader, add recovery"
Chien-Yu Chen [Mon, 1 Jun 2015 19:05:03 +0000 (19:05 +0000)]
am
e573a5e2: am
a56dee8e: am
61bae6d8: Merge "Camera2: update docs for reprocess timestamp" into mnc-dev
* commit '
e573a5e23f393f780c8015bdbac37a1646f40f6f':
Camera2: update docs for reprocess timestamp
Alan Viverette [Mon, 1 Jun 2015 19:04:57 +0000 (19:04 +0000)]
am
c820559a: am
af3134ae: am
9be801c8: Merge "Don\'t ignore explicit dividerHeight of 0 specified in XML" into mnc-dev
* commit '
c820559a916ff4bc245b7eb15a2109c00bb6f174':
Don't ignore explicit dividerHeight of 0 specified in XML
Alan Viverette [Mon, 1 Jun 2015 19:04:51 +0000 (19:04 +0000)]
am
b88314ad: am
508b6d2d: am
242b9c4e: Merge "Fix row/column order when unparcelling CollectionItemInfo" into mnc-dev
* commit '
b88314ad72669c2b91f2e5c6edf73f8ed02f0024':
Fix row/column order when unparcelling CollectionItemInfo
Stuart Scott [Mon, 1 Jun 2015 19:04:44 +0000 (19:04 +0000)]
am
c96a66dd: am
378c2cbf: am
e3e314df: Network Reset should have a lockdown like Factory Reset.
* commit '
c96a66dd03b7928e0945dc7ff0ce961d7091fc7d':
Network Reset should have a lockdown like Factory Reset.
Joe Fernandez [Mon, 1 Jun 2015 19:04:37 +0000 (19:04 +0000)]
am
7ce1850e: am
2f752f8f: am
540d0e0d: am
583b7f2c: am
9bf0e9d0: Merge "docs: Android Dashboard - June 2015 update" into mnc-preview-docs
* commit '
7ce1850e5ad45c783072bcf0ab4fd6121c4c94fb':
docs: Android Dashboard - June 2015 update
Filip Gruszczynski [Mon, 1 Jun 2015 19:04:33 +0000 (19:04 +0000)]
am
33021658: am
2e7e5c1c: am
48fe2631: resolved conflicts for merge of
a61e23f1 to mnc-dev
* commit '
330216583777ff1617d3316bd7dcb43a02061b57':
Only use outsets for full screen windows.
Mady Mellor [Mon, 1 Jun 2015 19:04:27 +0000 (19:04 +0000)]
am
fae785fc: am
8de52276: am
3aa33b3d: Merge "Update button to BUTTON_STYLUS_PRIMARY" into mnc-dev
* commit '
fae785fccf151aab7fba0daa701915f9e223fdfe':
Update button to BUTTON_STYLUS_PRIMARY
Mady Mellor [Mon, 1 Jun 2015 19:04:22 +0000 (19:04 +0000)]
am
ee8ac623: am
8c189479: am
ef24bc00: Merge "Update stylus button press recognition in View to use new MotionEvent APIs" into mnc-dev
* commit '
ee8ac623edee9352fdbf2f653af564a9df8514d2':
Update stylus button press recognition in View to use new MotionEvent APIs
Mady Mellor [Mon, 1 Jun 2015 19:04:15 +0000 (19:04 +0000)]
am
36ffd6d6: am
ed836dec: am
cac7b2b1: Merge "Update stylus button press recognition in GestureDetector to use new APIs" into mnc-dev
* commit '
36ffd6d6b68d577903a3a71f8742779379e6d54c':
Update stylus button press recognition in GestureDetector to use new APIs
Filip Gruszczynski [Mon, 1 Jun 2015 19:04:10 +0000 (19:04 +0000)]
am
201c74ef: am
6f68b90e: am
8825de17: Merge "Revert "Revert "Fix build.""" into mnc-dev
* commit '
201c74ef59d657660b2f8018091786bb63729534':
Revert "Revert "Fix build.""
smain@google.com [Mon, 1 Jun 2015 19:04:05 +0000 (19:04 +0000)]
am
3ef3a050: 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 '
3ef3a050b682f1783049815939848035f0f7e408':
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 19:03:59 +0000 (19:03 +0000)]
am
183f8fa4: am
21605b33: am
99bcc3ee: Merge "Revert "Revert "resolved conflicts for merge of
47249f2a to mnc-dev""" into mnc-dev
* commit '
183f8fa450ededc74dad717664e02ec804e8fe76':
Revert "Revert "resolved conflicts for merge of
47249f2a to 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""
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
Geoff Mendal [Mon, 1 Jun 2015 18:25:35 +0000 (18:25 +0000)]
am
1ebfbc08: (-s ours) am
07ec79d2: (-s ours) am
c4e5ec3f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
1ebfbc08c0b7a793dc46fd5c4a0397ac617930f5':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 18:25:30 +0000 (18:25 +0000)]
am
707cd546: (-s ours) am
32b0118a: (-s ours) am
e4a9ecb2: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
707cd5467053fb2bf2f5d03e1c0ec3f1299dc51c':
Import translations. DO NOT MERGE
John Spurlock [Mon, 1 Jun 2015 18:25:25 +0000 (18:25 +0000)]
am
3f359dc1: am
2b5002e6: am
a58b9a2c: Merge "Battery saver: limit notification intents to system UI." into mnc-dev
* commit '
3f359dc1c86b68bee42e232f4b8595f6b3adc565':
Battery saver: limit notification intents to system UI.
Selim Cinek [Mon, 1 Jun 2015 18:25:19 +0000 (18:25 +0000)]
am
be5bf201: am
5e5a408c: am
4bd071e5: Merge "Shortened the duration of HUNs" into mnc-dev
* commit '
be5bf201fb0c9018d7caaeeb5939db3aaf2b8ace':
Shortened the duration of HUNs
OSDN Git Service
