Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
207,521 Commits 3 Branches 0 Tags
fd166329be9fa223bb28ebfef53c73fe4bb50143
Commit Graph

18129 Commits

Author SHA1 Message Date
Adrian Roos
21be6220ee am 321293bc: am ffc758d5: am 8468ffce: am b8550d30: am fc8e923d: Merge "Fix wrong tint mode on airplane and vpn icons" into mnc-dev 
* commit '321293bc76f05d3ba9dd5866fe1a21c06b346d83':
  Fix wrong tint mode on airplane and vpn icons
 2015-07-16 01:32:11 +00:00
Adrian Roos
321293bc76 am ffc758d5: am 8468ffce: am b8550d30: am fc8e923d: Merge "Fix wrong tint mode on airplane and vpn icons" into mnc-dev 
* commit 'ffc758d565008e3a4adf42005da75d9225884245':
  Fix wrong tint mode on airplane and vpn icons
 2015-07-16 01:13:31 +00:00
Adrian Roos
ffc758d565 am 8468ffce: am b8550d30: am fc8e923d: Merge "Fix wrong tint mode on airplane and vpn icons" into mnc-dev 
* commit '8468ffce5a7b7f2434a3704e440afc0f009cf14c':
  Fix wrong tint mode on airplane and vpn icons
 2015-07-16 00:55:37 +00:00
Adrian Roos
8468ffce5a am b8550d30: am fc8e923d: Merge "Fix wrong tint mode on airplane and vpn icons" into mnc-dev 
* commit 'b8550d3036fdf49eeb551ad1e1c9d1a9d06398e2':
  Fix wrong tint mode on airplane and vpn icons
 2015-07-16 00:42:49 +00:00
Adrian Roos
b8550d3036 am fc8e923d: Merge "Fix wrong tint mode on airplane and vpn icons" into mnc-dev 
* commit 'fc8e923d5e551862fe1abaac2256925d6955ca07':
  Fix wrong tint mode on airplane and vpn icons
 2015-07-16 00:31:23 +00:00
Adrian Roos
fc8e923d5e Merge "Fix wrong tint mode on airplane and vpn icons" into mnc-dev 2015-07-16 00:27:50 +00:00
Adrian Roos
f85b668f1b am fcc17743: am 25cc5654: am c71f3a2d: am 2fc6e2b5: am 3a931d02: Merge "Show correct locked orientation on phones" into mnc-dev 
* commit 'fcc177438d7856e9dabdc24aeeb5306fa2c85d92':
  Show correct locked orientation on phones
 2015-07-15 23:32:00 +00:00
Jorim Jaggi
11840e8b91 am dd441eaa: am aa90ab55: am deb9aa8c: am 7be40aaa: am eea8be53: Adjust assist disclosure stroke width to spec 
* commit 'dd441eaacabd26e1b6438ee666a273f0c2b07c1f':
  Adjust assist disclosure stroke width to spec
 2015-07-15 23:31:02 +00:00
Felipe Leme
396753d7c1 am 7ef4daa2: am 1bcd49a9: am 2ac41a90: am d9ab0ca2: am 68fd7c79: Merge "Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created." into mnc-dev 
* commit '7ef4daa26be5000f2ccba80204b69c8058428f51':
  Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created.
 2015-07-15 23:30:43 +00:00
Adrian Roos
fcc177438d am 25cc5654: am c71f3a2d: am 2fc6e2b5: am 3a931d02: Merge "Show correct locked orientation on phones" into mnc-dev 
* commit '25cc56544ca9f62a96f42b108c8d01e0d4ed2872':
  Show correct locked orientation on phones
 2015-07-15 23:18:28 +00:00
Jorim Jaggi
dd441eaaca am aa90ab55: am deb9aa8c: am 7be40aaa: am eea8be53: Adjust assist disclosure stroke width to spec 
* commit 'aa90ab551c9ba08489feae32c71efabac51062cc':
  Adjust assist disclosure stroke width to spec
 2015-07-15 23:17:36 +00:00
Felipe Leme
7ef4daa26b am 1bcd49a9: am 2ac41a90: am d9ab0ca2: am 68fd7c79: Merge "Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created." into mnc-dev 
* commit '1bcd49a9ebae6a82d601449dd182a18948803dd9':
  Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created.
 2015-07-15 23:17:06 +00:00
Adrian Roos
25cc56544c am c71f3a2d: am 2fc6e2b5: am 3a931d02: Merge "Show correct locked orientation on phones" into mnc-dev 
* commit 'c71f3a2d4a3b3ab52be08e68646ffcb71b55066a':
  Show correct locked orientation on phones
 2015-07-15 22:57:45 +00:00
Jeff Sharkey
38c60b3fcb am 87ef89a2: am 38611265: am 973e7227: am 6819696c: am 539f7ac7: Merge "Give DCS permission needed to measure all users." into mnc-dev 
* commit '87ef89a2e5e7163ee24e993c20e263d35bb0b109':
  Give DCS permission needed to measure all users.
 2015-07-15 22:57:17 +00:00
Jorim Jaggi
aa90ab551c am deb9aa8c: am 7be40aaa: am eea8be53: Adjust assist disclosure stroke width to spec 
* commit 'deb9aa8cfd89c04d130758f9a82e45f77bba0431':
  Adjust assist disclosure stroke width to spec
 2015-07-15 22:56:59 +00:00
Felipe Leme
1bcd49a9eb am 2ac41a90: am d9ab0ca2: am 68fd7c79: Merge "Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created." into mnc-dev 
* commit '2ac41a902eb4e2af32ff4063dca03b656baa860f':
  Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created.
 2015-07-15 22:56:46 +00:00
Jeff Sharkey
177c9c8c14 Merge commit '3bc83eb0' into downstream 
Change-Id: Id3980b39889f28ab42284119747eb461be0a3ce5
 2015-07-15 15:54:20 -07:00
Adrian Roos
c71f3a2d4a am 2fc6e2b5: am 3a931d02: Merge "Show correct locked orientation on phones" into mnc-dev 
* commit '2fc6e2b57ddfac58ce1fbded6f8a64a0b2fc9d70':
  Show correct locked orientation on phones
 2015-07-15 22:45:53 +00:00
Jorim Jaggi
deb9aa8cfd am 7be40aaa: am eea8be53: Adjust assist disclosure stroke width to spec 
* commit '7be40aaa6b1df159962134ff8314539d2805ec43':
  Adjust assist disclosure stroke width to spec
 2015-07-15 22:45:20 +00:00
Felipe Leme
2ac41a902e am d9ab0ca2: am 68fd7c79: Merge "Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created." into mnc-dev 
* commit 'd9ab0ca287a9ab1b5af19d70cb9b13e0e16cfcba':
  Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created.
 2015-07-15 22:45:11 +00:00
Jim Miller
aa1a35ba27 am 2e56339a: am bcedcde8: am 204c2de8: am c7b0435c: resolved conflicts for merge of 1d4247c4 to mnc-dr-dev 
* commit '2e56339a4a1133e9aface1c851f1ab67cff72109':
  Improve tracking of screen on reasons.
 2015-07-15 22:40:32 +00:00
Adrian Roos
2fc6e2b57d am 3a931d02: Merge "Show correct locked orientation on phones" into mnc-dev 
* commit '3a931d028a0c43fe276b0adfdc6b87ac48dd5df3':
  Show correct locked orientation on phones
 2015-07-15 22:28:02 +00:00
Jorim Jaggi
7be40aaa6b am eea8be53: Adjust assist disclosure stroke width to spec 
* commit 'eea8be533874f279016279cd68618a6592b3dbed':
  Adjust assist disclosure stroke width to spec
 2015-07-15 22:27:07 +00:00
Felipe Leme
d9ab0ca287 am 68fd7c79: Merge "Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created." into mnc-dev 
* commit '68fd7c798d213bbe304775b13d775ee868abb448':
  Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created.
 2015-07-15 22:26:47 +00:00
Jeff Sharkey
87ef89a2e5 am 38611265: am 973e7227: am 6819696c: am 539f7ac7: Merge "Give DCS permission needed to measure all users." into mnc-dev 
* commit '38611265f0ef2830de1f6ace564f0ae7222d68e1':
  Give DCS permission needed to measure all users.
 2015-07-15 22:26:15 +00:00
Jeff Sharkey
3bc83eb0a1 am 6663f844: am b5405b45: am 350b99c0: am 483bd842: Merge "Only send EXTRA_STACK for private intent." into mnc-dev 
* commit '6663f84470d21f11dc0c280feef15e1762f9aad9':
  Only send EXTRA_STACK for private intent.
 2015-07-15 22:26:10 +00:00
Jim Miller
2e56339a4a am bcedcde8: am 204c2de8: am c7b0435c: resolved conflicts for merge of 1d4247c4 to mnc-dr-dev 
* commit 'bcedcde8093b48c3d013cc57dde42bdd17d6dcb9':
  Improve tracking of screen on reasons.
 2015-07-15 22:26:05 +00:00
Jeff Sharkey
38611265f0 am 973e7227: am 6819696c: am 539f7ac7: Merge "Give DCS permission needed to measure all users." into mnc-dev 
* commit '973e72270ccbbd44f6e83690ba32735465bb170d':
  Give DCS permission needed to measure all users.
 2015-07-15 22:11:24 +00:00
Jeff Sharkey
6663f84470 am b5405b45: am 350b99c0: am 483bd842: Merge "Only send EXTRA_STACK for private intent." into mnc-dev 
* commit 'b5405b45784cebf978b6102d324a1018fe66deb6':
  Only send EXTRA_STACK for private intent.
 2015-07-15 22:11:18 +00:00
Jim Miller
bcedcde809 am 204c2de8: am c7b0435c: resolved conflicts for merge of 1d4247c4 to mnc-dr-dev 
* commit '204c2de8bb2a804991b8bbd5be9877ac1a52e150':
  Improve tracking of screen on reasons.
 2015-07-15 22:11:11 +00:00
Jeff Sharkey
973e72270c am 6819696c: am 539f7ac7: Merge "Give DCS permission needed to measure all users." into mnc-dev 
* commit '6819696c0e00ce3805de66f13ec6deda2489fd32':
  Give DCS permission needed to measure all users.
 2015-07-15 21:59:36 +00:00
Jeff Sharkey
b5405b4578 am 350b99c0: am 483bd842: Merge "Only send EXTRA_STACK for private intent." into mnc-dev 
* commit '350b99c0027902db22004ea037265349155d7c38':
  Only send EXTRA_STACK for private intent.
 2015-07-15 21:59:31 +00:00
Jim Miller
204c2de8bb am c7b0435c: resolved conflicts for merge of 1d4247c4 to mnc-dr-dev 
* commit 'c7b0435cc709c328da8e2b515ea04c8bc40d1094':
  Improve tracking of screen on reasons.
 2015-07-15 21:59:27 +00:00
Adrian Roos
3a931d028a Merge "Show correct locked orientation on phones" into mnc-dev 2015-07-15 21:56:27 +00:00
Geoff Mendal
78b6e6c742 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 21:56:27 +00:00
Geoff Mendal
4155d9f377 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 21:56:05 +00:00
Geoff Mendal
197e738157 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 21:54:09 +00:00
Geoff Mendal
6e149a2537 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 21:51:04 +00:00
Geoff Mendal
a5516e80ad Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 21:48:35 +00:00
Geoff Mendal
ff994bd31b Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 21:47:14 +00:00
James Cook
abf1e03398 Fix app shelf crash on drag with no ClipDescription 
Poorly behaved apps might start a global drag to the shelf with
a null ClipDescription. Don't crash, just ignore the drag.

Bug: 22476539
Change-Id: Ide639d08dc2f935d61a136e1902b97b06d11f385
 2015-07-15 21:46:05 +00:00
Geoff Mendal
36c103d685 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 21:44:12 +00:00
Jeff Sharkey
6819696c0e am 539f7ac7: Merge "Give DCS permission needed to measure all users." into mnc-dev 
* commit '539f7ac7a195c405987057ef34e88cfbe8eab5e8':
  Give DCS permission needed to measure all users.
 2015-07-15 21:43:55 +00:00
Jeff Sharkey
350b99c002 am 483bd842: Merge "Only send EXTRA_STACK for private intent." into mnc-dev 
* commit '483bd84280ef667e306ec7246d85423ca6b1fde7':
  Only send EXTRA_STACK for private intent.
 2015-07-15 21:43:48 +00:00
Adrian Roos
14e6ba833e Fix wrong tint mode on airplane and vpn icons 
Bug: 22399062
Change-Id: If7d0e6d4d2ace947672f9a943bb274f07736ddb0
 2015-07-15 21:40:12 +00:00
Jim Miller
c7b0435cc7 resolved conflicts for merge of 1d4247c4 to mnc-dr-dev 
Change-Id: I057c529dcd5d48e0dcf256a9d096c5d8b815892a
 2015-07-15 14:33:10 -07:00
Geoff Mendal
6289ad5d8f Import translations. DO NOT MERGE 
Change-Id: I428e579d5968139dcdf6e8e693f4d2eef182c682
Auto-generated-cl: translation import
 2015-07-15 14:19:57 -07:00
Geoff Mendal
703170645d Import translations. DO NOT MERGE 
Change-Id: I7e22afc43c9029b40ba2df53dfc10a9a688c4fd2
Auto-generated-cl: translation import
 2015-07-15 14:17:17 -07:00
Jorim Jaggi
eea8be5338 Adjust assist disclosure stroke width to spec 
Bug: 21568059
Change-Id: Ib1ddb8890715b98d36ed5827f053970a9d4a7173
 2015-07-15 21:09:47 +00:00
Geoff Mendal
32a7073d44 Import translations. DO NOT MERGE 
Change-Id: I376fa651ad29df01e4a7844a9e64508f4b163cf0
Auto-generated-cl: translation import
 2015-07-15 14:07:29 -07:00