drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
199,955 Commits 1 Branch 0 Tags
Commit Graph

199955 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
3c8a0debbf Import translations. DO NOT MERGE 
Change-Id: I6eba661705980ad16917844a08123cb49220a102
Auto-generated-cl: translation import
 2015-06-10 07:32:57 -05:00
Geoff Mendal
7098e6410f Import translations. DO NOT MERGE 
Change-Id: Ibb009dbb1ae21a98b16ee806b0e595b9f7299bd8
Auto-generated-cl: translation import
 2015-06-10 07:27:29 -05:00
Neil Fuller
8e095594a6 Merge "Stop showing long names for local timezones when it is ambiguous" into mnc-dev 2015-06-10 12:23:54 +00:00
Andrew Flynn
da9bbf7255 Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 2015-06-10 11:41:32 +00:00
Andrei Stingaceanu
1c96a94184 Merge "Completely remove ExtractActionMode from ExtractEditLayout" into mnc-dev 2015-06-10 11:19:18 +00:00
Alex Chau
f5d0813930 am 5e02c549: am ad914181: am ccfa54f4: Merge "Add strings for notification shown upon work profile deletion" into mnc-dev 
* commit '5e02c5494743bb7c693761b03c3c24dca9624d60':
  Add strings for notification shown upon work profile deletion
 2015-06-10 11:18:29 +00:00
Alex Chau
5e02c54947 am ad914181: am ccfa54f4: Merge "Add strings for notification shown upon work profile deletion" into mnc-dev 
* commit 'ad9141817fb42e1037675ee159c32a52e157782f':
  Add strings for notification shown upon work profile deletion
 2015-06-10 11:04:57 +00:00
Alex Chau
ad9141817f am ccfa54f4: Merge "Add strings for notification shown upon work profile deletion" into mnc-dev 
* commit 'ccfa54f4a226196aff49f81fa6c809ad05afccb6':
  Add strings for notification shown upon work profile deletion
 2015-06-10 10:53:42 +00:00
Alex Chau
ccfa54f4a2 Merge "Add strings for notification shown upon work profile deletion" into mnc-dev 2015-06-10 10:44:02 +00:00
Alex Chau
9c8d2b0620 Add strings for notification shown upon work profile deletion 
Bug: 18543323

Change-Id: I87713da6684044b95b2e6c38882e20fe798f8deb
 2015-06-10 11:42:14 +01:00
Chris Banes
569c6d3eb0 am 1f5714c6: am d64c5bef: am d9b0acd2: Merge "Fix location for ActionMenuItemView cheat sheet" into mnc-dev 
* commit '1f5714c610571671a36425ecb4a485c3183e6942':
  Fix location for ActionMenuItemView cheat sheet
 2015-06-10 10:11:06 +00:00
Chris Banes
1f5714c610 am d64c5bef: am d9b0acd2: Merge "Fix location for ActionMenuItemView cheat sheet" into mnc-dev 
* commit 'd64c5befd61434168b16f6eb1b722b7d3512f15a':
  Fix location for ActionMenuItemView cheat sheet
 2015-06-10 09:57:52 +00:00
Chris Banes
d64c5befd6 am d9b0acd2: Merge "Fix location for ActionMenuItemView cheat sheet" into mnc-dev 
* commit 'd9b0acd2eb8d844b9f901fc62e0de74c1a7d8430':
  Fix location for ActionMenuItemView cheat sheet
 2015-06-10 09:48:45 +00:00
Chet Haase
4ddd9257d6 Clarify docs for Animator.isStarted() 
Behavior is different than spec'd for one-shot animators, clarified
docs to reflect that.

Issue #21087798 better docs for isStarted()

Change-Id: I499a5d52cf02ef715acb6ae0635ede4328c93de8
 2015-06-10 10:42:50 +01:00
Chris Banes
d9b0acd2eb Merge "Fix location for ActionMenuItemView cheat sheet" into mnc-dev 2015-06-10 08:12:51 +00:00
Martijn Coenen
ab428b87f2 am 0c2d3d93: am b1c579df: am 706f23dd: Merge "Make peer LLCP version an int." into mnc-dev 
* commit '0c2d3d93dd2f8f0e355299188a8a77b5287b150f':
  Make peer LLCP version an int.
 2015-06-10 07:34:42 +00:00
Martijn Coenen
0c2d3d93dd am b1c579df: am 706f23dd: Merge "Make peer LLCP version an int." into mnc-dev 
* commit 'b1c579df0be37a43101f2a2c8205b2fe648c1377':
  Make peer LLCP version an int.
 2015-06-10 07:20:39 +00:00
Martijn Coenen
b1c579df0b am 706f23dd: Merge "Make peer LLCP version an int." into mnc-dev 
* commit '706f23ddb9f18663d5ae70626e118e815a308c84':
  Make peer LLCP version an int.
 2015-06-10 07:08:15 +00:00
Martijn Coenen
706f23ddb9 Merge "Make peer LLCP version an int." into mnc-dev 2015-06-10 06:58:20 +00:00
Martijn Coenen
bdc34b8440 Make peer LLCP version an int. 
And split major/minor.

Bug: 21343778
Change-Id: Ie9f0ecc9172849d3b088a0c1ce6d872b2f607919
 2015-06-10 08:49:02 +02:00
Jeff Sharkey
0d7e33ec47 am d6c886f8: am f355a22d: am e687929f: Merge "Flags to select storage volume for app installs." into mnc-dev 
* commit 'd6c886f8621dc259a5bc9d64c74e983c6dc35a85':
  Flags to select storage volume for app installs.
 2015-06-10 05:21:21 +00:00
Jeff Sharkey
d6c886f862 am f355a22d: am e687929f: Merge "Flags to select storage volume for app installs." into mnc-dev 
* commit 'f355a22d1421a640bf057047b7833000acf94519':
  Flags to select storage volume for app installs.
 2015-06-10 05:07:51 +00:00
Jeff Sharkey
f355a22d14 am e687929f: Merge "Flags to select storage volume for app installs." into mnc-dev 
* commit 'e687929f33f272fff9585bd0752d85ad519bc66d':
  Flags to select storage volume for app installs.
 2015-06-10 04:56:19 +00:00
Jeff Sharkey
e687929f33 Merge "Flags to select storage volume for app installs." into mnc-dev 2015-06-10 04:43:18 +00:00
Jeff Sharkey
ab2340996a Flags to select storage volume for app installs. 
Remote callers can now provide the "--install-location" value from
the APK to help select a location, or they can explicitly force a
volume by UUID.

Bug: 21676789
Change-Id: Iefc92d770a851fc33e37edbf259fdb8df2b14ae5
 2015-06-09 21:42:22 -07:00
Yao Chen
ae9905654b am 4af09456: am 72df690c: am a0d41262: Merge "Copy lockTaskLaunchMode from target activity to its alias." into mnc-dev 
* commit '4af0945647573b7aacbd014effc9bb0353608447':
  Copy lockTaskLaunchMode from target activity to its alias.
 2015-06-10 04:02:04 +00:00
Yao Chen
4af0945647 am 72df690c: am a0d41262: Merge "Copy lockTaskLaunchMode from target activity to its alias." into mnc-dev 
* commit '72df690ce07c20ef45c7a8a60b90e0ef70a1263b':
  Copy lockTaskLaunchMode from target activity to its alias.
 2015-06-10 03:48:36 +00:00
Yao Chen
72df690ce0 am a0d41262: Merge "Copy lockTaskLaunchMode from target activity to its alias." into mnc-dev 
* commit 'a0d41262d48eb48285bb3a0e71bfc5b7b89be601':
  Copy lockTaskLaunchMode from target activity to its alias.
 2015-06-10 03:36:57 +00:00
Yao Chen
a0d41262d4 Merge "Copy lockTaskLaunchMode from target activity to its alias." into mnc-dev 2015-06-10 03:28:29 +00:00
Adrian Roos
9616eef270 am 31168493: am b4621174: am 5b7793ca: Merge "Expand scrim all the way to the right" into mnc-dev 
* commit '311684931c38292a5ed8f78ed839141c0a29e9f9':
  Expand scrim all the way to the right
 2015-06-10 02:06:01 +00:00
Svetoslav
ba338ecc2a am 54dd1e4c: am 60022334: am a1e60f1f: Merge "Use who when requesting permissions" into mnc-dev 
* commit '54dd1e4c7320e5e9466194ebb3e8cbf45ddfd336':
  Use who when requesting permissions
 2015-06-10 02:05:55 +00:00
Adrian Roos
68f0c1e338 am 6220afe8: am dcd6ef27: am 94548476: Merge "Add content description to keyguard user avatar" into mnc-dev 
* commit '6220afe8db34d1e14e50c3a6fd25546d1c84177c':
  Add content description to keyguard user avatar
 2015-06-10 02:05:50 +00:00
Adrian Roos
311684931c am b4621174: am 5b7793ca: Merge "Expand scrim all the way to the right" into mnc-dev 
* commit 'b46211746c44180a231cef40ce06e8b2a63dd0a4':
  Expand scrim all the way to the right
 2015-06-10 01:54:33 +00:00
Svetoslav
54dd1e4c73 am 60022334: am a1e60f1f: Merge "Use who when requesting permissions" into mnc-dev 
* commit '60022334b7bff4a8c985465186e7472215178819':
  Use who when requesting permissions
 2015-06-10 01:54:27 +00:00
Adrian Roos
6220afe8db am dcd6ef27: am 94548476: Merge "Add content description to keyguard user avatar" into mnc-dev 
* commit 'dcd6ef27ed0674d17fcc94de006a10c84600e9d4':
  Add content description to keyguard user avatar
 2015-06-10 01:54:22 +00:00
Adrian Roos
b46211746c am 5b7793ca: Merge "Expand scrim all the way to the right" into mnc-dev 
* commit '5b7793cacf3910a386182a9b78460934d00dfdae':
  Expand scrim all the way to the right
 2015-06-10 01:40:51 +00:00
Svetoslav
60022334b7 am a1e60f1f: Merge "Use who when requesting permissions" into mnc-dev 
* commit 'a1e60f1f45dce19f9dc15b97cbb0821ffeb54d9d':
  Use who when requesting permissions
 2015-06-10 01:40:46 +00:00
Adrian Roos
dcd6ef27ed am 94548476: Merge "Add content description to keyguard user avatar" into mnc-dev 
* commit '9454847618c3b799a0acfa0a2495cf8a120c4f26':
  Add content description to keyguard user avatar
 2015-06-10 01:40:42 +00:00
Dianne Hackborn
71bf7a381c am 3fca7b79: am 4f8fdd93: am 113769d7: Merge "Fix NPE." into mnc-dev 
* commit '3fca7b7929870be9762bc4dd5782fad64d108a34':
  Fix NPE.
 2015-06-10 01:35:01 +00:00
Lajos Molnar
64e83084bc am 831656d3: am a390a202: am 53858ced: Merge "media: hook up OnFrameRenderedListener events to framework events" into mnc-dev 
* commit '831656d32844341f6aa46f40b1ef219546dc3be4':
  media: hook up OnFrameRenderedListener events to framework events
 2015-06-10 01:34:55 +00:00
Adrian Roos
8dfe1b045b am f221e4b5: am 8aa14b59: am dbcf0a9e: Merge "ImageWallpaper: Atomically fetch display info" into mnc-dev 
* commit 'f221e4b52b0a702aeb832b98db9b336e68b0715c':
  ImageWallpaper: Atomically fetch display info
 2015-06-10 01:34:50 +00:00
Tao Bao
ebd3df9666 am 24dde3b8: am 86468ae7: am cfa9a98e: Merge "Improve the reboot-to-recovery dialogs" 
* commit '24dde3b836c2623b993aa8bbf147278e0af68943':
  Improve the reboot-to-recovery dialogs
 2015-06-10 01:34:45 +00:00
Tao Bao
480942f5f2 am 24c0de22: am 7807cc25: (-s ours) am e215b464: Merge "Wait for uncrypt to finish before rebooting" 
* commit '24c0de2205b310d185bf57d899d882139a7ecc85':
  Wait for uncrypt to finish before rebooting
 2015-06-10 01:34:40 +00:00
Adrian Roos
5b7793cacf Merge "Expand scrim all the way to the right" into mnc-dev 2015-06-10 01:29:56 +00:00
Dianne Hackborn
3fca7b7929 am 4f8fdd93: am 113769d7: Merge "Fix NPE." into mnc-dev 
* commit '4f8fdd93329e5f78a21e6eeee75f99a6c9399743':
  Fix NPE.
 2015-06-10 01:29:22 +00:00
Svetoslav
a1e60f1f45 Merge "Use who when requesting permissions" into mnc-dev 2015-06-10 01:29:21 +00:00
Lajos Molnar
831656d328 am a390a202: am 53858ced: Merge "media: hook up OnFrameRenderedListener events to framework events" into mnc-dev 
* commit 'a390a202d27834e06b8a32b0aff2399db2855733':
  media: hook up OnFrameRenderedListener events to framework events
 2015-06-10 01:29:17 +00:00
Adrian Roos
f221e4b52b am 8aa14b59: am dbcf0a9e: Merge "ImageWallpaper: Atomically fetch display info" into mnc-dev 
* commit '8aa14b59d360ad0140dae7a1e6ecdc6b11017ea5':
  ImageWallpaper: Atomically fetch display info
 2015-06-10 01:29:13 +00:00
Adrian Roos
2f2bd9a8f8 Expand scrim all the way to the right 
Fixes a bug where the scrim would not cover
the area occupied by the nav bar which looks weird
when the nav bar is hidden.

Bug: 19582019
Change-Id: I7d96ca46a41ec764984be5fe42d225cb94f53497
 2015-06-10 01:29:12 +00:00
Adrian Roos
9454847618 Merge "Add content description to keyguard user avatar" into mnc-dev 2015-06-10 01:28:31 +00:00