Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
197,592 Commits 3 Branches 0 Tags
371dee33dfc287c5bbf04fccffdc373716462e88
Commit Graph

197592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Kwa
371dee33df Merge "Fix text on move notifications and toasts." 2015-06-02 14:20:36 +00:00
Abodunrinwa Toki
6c60a64760 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.
 2015-06-01 23:43:05 +00:00
Eino-Ville Talvala
e4d1343ce6 am 0c421419: am a2956f6e: am 14438d12: Merge "Camera2: Add tangential distortion coefficients" into mnc-dev 
* commit '0c4214191fa93ff3c628a8461d6bd6ef2bb54d3a':
  Camera2: Add tangential distortion coefficients
 2015-06-01 23:42:59 +00:00
Andrew Flynn
c42cce382d 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
 2015-06-01 23:42:55 +00:00
Chris Craik
e74afab776 am 48b01043: am e63136a3: am 8c1e287b: Merge "Fix RenderScript copy tracing sections" into mnc-dev 
* commit '48b01043747acab0c12122c3c7c2bbbf3d03ea28':
  Fix RenderScript copy tracing sections
 2015-06-01 23:42:47 +00:00
Abodunrinwa Toki
4af95ede5b am d9b74249: am bdd500ec: Merge "Fix FloatingToolbar look and animation for RTL." into mnc-dev 
* commit 'd9b7424923662e465fe2cf155cb7a9e6eef434c0':
  Fix FloatingToolbar look and animation for RTL.
 2015-06-01 23:22:06 +00:00
Eino-Ville Talvala
0c4214191f am a2956f6e: am 14438d12: Merge "Camera2: Add tangential distortion coefficients" into mnc-dev 
* commit 'a2956f6e059e8565a0f6d48ea3c85cc827bffdb4':
  Camera2: Add tangential distortion coefficients
 2015-06-01 23:22:00 +00:00
Andrew Flynn
174ebb1f7f am 0a44e64a: am 9d28852f: Merge "Remove separate light/dark animated vector drawables" into mnc-dev 
* commit '0a44e64a8299277f58d29bfae94bb7db6e78cb86':
  Remove separate light/dark animated vector drawables
 2015-06-01 23:21:55 +00:00
Chris Craik
48b0104374 am e63136a3: am 8c1e287b: Merge "Fix RenderScript copy tracing sections" into mnc-dev 
* commit 'e63136a36ec6e5f22d53654c85b8b3eb0b19cb27':
  Fix RenderScript copy tracing sections
 2015-06-01 23:21:50 +00:00
Joe Fernandez
43e67ff7b5 Merge "docs/ndk/reference: fix toc" 2015-06-01 22:59:19 +00:00
Johan Euphrosine
96dc8823df docs/ndk/reference: fix toc 
Change-Id: Idd5da29c25dd9d1597f253c8ba5357838c8b6c8c
 2015-06-01 15:46:44 -07:00
Geoff Mendal
be4a12c5b2 Merge "Import translations. DO NOT MERGE" 2015-06-01 22:23:52 +00:00
Abodunrinwa Toki
d9b7424923 am bdd500ec: Merge "Fix FloatingToolbar look and animation for RTL." into mnc-dev 
* commit 'bdd500ecd4ceea7d4e4a06ece08c9b9fd5d8aec5':
  Fix FloatingToolbar look and animation for RTL.
 2015-06-01 21:42:27 +00:00
Eino-Ville Talvala
a2956f6e05 am 14438d12: Merge "Camera2: Add tangential distortion coefficients" into mnc-dev 
* commit '14438d122c1e7ab88a6169bca13a35d50e76e91e':
  Camera2: Add tangential distortion coefficients
 2015-06-01 21:42:22 +00:00
Andrew Flynn
0a44e64a82 am 9d28852f: Merge "Remove separate light/dark animated vector drawables" into mnc-dev 
* commit '9d28852f6108b20266de0282f4bf858e679316b7':
  Remove separate light/dark animated vector drawables
 2015-06-01 21:42:08 +00:00
Chris Craik
e63136a36e am 8c1e287b: Merge "Fix RenderScript copy tracing sections" into mnc-dev 
* commit '8c1e287bf801d98cbaa6df904524625c3935fdd0':
  Fix RenderScript copy tracing sections
 2015-06-01 21:41:40 +00:00
Abodunrinwa Toki
bdd500ecd4 Merge "Fix FloatingToolbar look and animation for RTL." into mnc-dev 2015-06-01 21:31:20 +00:00
Eino-Ville Talvala
14438d122c Merge "Camera2: Add tangential distortion coefficients" into mnc-dev 2015-06-01 21:26:12 +00:00
Quddus Chong
2b95561db5 docs: Fixed typo for confirm credentials section in the API Overview. 
bug: 21444273

Change-Id: I01700e95227e5f7c09a5d6428877087d7ff0121a
 2015-06-01 14:16:44 -07:00
Andrew Flynn
9d28852f61 Merge "Remove separate light/dark animated vector drawables" into mnc-dev 2015-06-01 21:11:54 +00:00
Chris Craik
8c1e287bf8 Merge "Fix RenderScript copy tracing sections" into mnc-dev 2015-06-01 20:58:10 +00:00
Andrew Flynn
2fdbe12820 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
 2015-06-01 16:45:41 -04:00
Chris Tate
d0ff0c0e3e 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.
 2015-06-01 20:38:53 +00:00
John Spurlock
d021f8661e am be3650be: am 587ae867: am b0db15c6: Merge "Next alarm clock updates." into mnc-dev 
* commit 'be3650be63875a740932bd38274857dbee36a2fa':
  Next alarm clock updates.
 2015-06-01 20:38:47 +00:00
Andrew Flynn
459afc1b48 am f48de85a: am 19390a64: am 78b16987: Merge "Change colors of AVD test" into mnc-dev 
* commit 'f48de85ad8470612d1f4b60f380fb6097cbd90a5':
  Change colors of AVD test
 2015-06-01 20:38:41 +00:00
Chris Tate
5ff9d88c90 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.
 2015-06-01 20:27:42 +00:00
John Spurlock
be3650be63 am 587ae867: am b0db15c6: Merge "Next alarm clock updates." into mnc-dev 
* commit '587ae8679d425bc18771a07622279c566e590db3':
  Next alarm clock updates.
 2015-06-01 20:27:37 +00:00
Andrew Flynn
f48de85ad8 am 19390a64: am 78b16987: Merge "Change colors of AVD test" into mnc-dev 
* commit '19390a6458ed14ed35d5d7c36dbfd1c58bee1b90':
  Change colors of AVD test
 2015-06-01 20:27:32 +00:00
Chris Tate
598d143a0e 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.
 2015-06-01 20:20:54 +00:00
Raph Levien
99d3c95a17 am 590e3221: am c73314bc: am cf8b3b1c: Merge "Revert "Use getRunAdvance to position cursor"" into mnc-dev 
* commit '590e32212c8121ead4439d19062dd3c3ddfa0f92':
  Revert "Use getRunAdvance to position cursor"
 2015-06-01 20:20:18 +00:00
Jason Monk
8ea127f52a am 1fe56080: am eeee276b: am 061e2bbf: Merge "Be more careful with mAccessPoints usage" into mnc-dev 
* commit '1fe560802cf17747637a67f3924725cae7f098ab':
  Be more careful with mAccessPoints usage
 2015-06-01 20:20:12 +00:00
John Spurlock
587ae8679d am b0db15c6: Merge "Next alarm clock updates." into mnc-dev 
* commit 'b0db15c6d99ab5f9d8a7bd6a44fc097a5f61edca':
  Next alarm clock updates.
 2015-06-01 20:13:03 +00:00
Andrew Flynn
19390a6458 am 78b16987: Merge "Change colors of AVD test" into mnc-dev 
* commit '78b16987dfb044c8adbb19d2cd206a8aaeb6e850':
  Change colors of AVD test
 2015-06-01 20:12:53 +00:00
Chris Tate
88fb145324 Merge "DO NOT MERGE Fix bug regarding the comparator sorts Alarms into increasing time order." into mnc-dev 2015-06-01 20:11:57 +00:00
John Spurlock
b0db15c6d9 Merge "Next alarm clock updates." into mnc-dev 2015-06-01 20:07:40 +00:00
Raph Levien
590e32212c am c73314bc: am cf8b3b1c: Merge "Revert "Use getRunAdvance to position cursor"" into mnc-dev 
* commit 'c73314bcb18f6879bb6f9923912ab38a0c831637':
  Revert "Use getRunAdvance to position cursor"
 2015-06-01 20:06:24 +00:00
Jason Monk
1fe560802c am eeee276b: am 061e2bbf: Merge "Be more careful with mAccessPoints usage" into mnc-dev 
* commit 'eeee276b31260425098b321ddd089c6e005b6583':
  Be more careful with mAccessPoints usage
 2015-06-01 20:06:19 +00:00
Andrew Flynn
78b16987df Merge "Change colors of AVD test" into mnc-dev 2015-06-01 20:04:08 +00:00
Raph Levien
c73314bcb1 am cf8b3b1c: Merge "Revert "Use getRunAdvance to position cursor"" into mnc-dev 
* commit 'cf8b3b1c56b5aaaa8552c1bc9bb88c8a1285f99f':
  Revert "Use getRunAdvance to position cursor"
 2015-06-01 19:55:12 +00:00
Jason Monk
eeee276b31 am 061e2bbf: Merge "Be more careful with mAccessPoints usage" into mnc-dev 
* commit '061e2bbf6bdbcccd71844248be953081f2b5fe70':
  Be more careful with mAccessPoints usage
 2015-06-01 19:55:08 +00:00
Raph Levien
cf8b3b1c56 Merge "Revert "Use getRunAdvance to position cursor"" into mnc-dev 2015-06-01 19:45:43 +00:00
Jason Monk
061e2bbf6b Merge "Be more careful with mAccessPoints usage" into mnc-dev 2015-06-01 19:45:23 +00:00
Jorim Jaggi
9bf54150d5 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
 2015-06-01 19:41:55 +00:00
Filip Gruszczynski
e3e5f7dd86 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.
 2015-06-01 19:41:50 +00:00
Wale Ogunwale
a8df7a9047 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
 2015-06-01 19:41:45 +00:00
Raph Levien
5730c97480 Revert "Use getRunAdvance to position cursor" 
This reverts commit cb5499c850.

Bug: 21549197
 2015-06-01 12:40:42 -07:00
Jorim Jaggi
6c49882975 am c8d5901b: am 1e47a8e0: Merge "Cleanup Keyguard handling when turning off screen" into mnc-dev 
* commit 'c8d5901bc83814c0dab281fc108de643cdd7b09d':
  Cleanup Keyguard handling when turning off screen
 2015-06-01 19:29:19 +00:00
Filip Gruszczynski
f02ace9b9b 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.
 2015-06-01 19:29:14 +00:00
Wale Ogunwale
0f486a6e38 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
 2015-06-01 19:29:10 +00:00
Jorim Jaggi
c8d5901bc8 am 1e47a8e0: Merge "Cleanup Keyguard handling when turning off screen" into mnc-dev 
* commit '1e47a8e096fc28dcab0a55bc4f2e6b747bfb1a07':
  Cleanup Keyguard handling when turning off screen
 2015-06-01 19:18:29 +00:00