Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
257,177 Commits 3 Branches 0 Tags
3f6f5de2fa98702ec9e1a9747d803be0edf39082
Commit Graph

257177 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
3f6f5de2fa Merge "Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378 am: 7a62915c51 am: 8d8718fc53 am: 6396bf5e28" into nyc-mr1-dev-plus-aosp 2016-05-27 23:21:10 +00:00
Android Build Merger (Role)
5d2e916386 Merge "Merge "Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378 am: 7ff4ee303b" into nyc-dev am: 2b9497069d am: ffc5ae0721" into nyc-mr1-dev-plus-aosp 2016-05-27 23:20:53 +00:00
Android Build Merger (Role)
0292052c87 Merge "Merge "Revert "Finalize resource IDs for N."" into nyc-dev am: d63315e535 am: b19774bd32" into nyc-mr1-dev-plus-aosp 2016-05-27 23:20:40 +00:00
Hemal Patel
23919c37c9 Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378 am: 7a62915c51 am: 8d8718fc53 
am: 6396bf5e28

* commit '6396bf5e2840a0ad24af9854864fb405b4d8ae57':

Change-Id: I7374e089abeb3b076f8db3ff9c09b501453ee86d
 2016-05-27 23:19:54 +00:00
Hemal Patel
c7b74e5994 Merge "Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378 am: 7ff4ee303b" into nyc-dev am: 2b9497069d 
am: ffc5ae0721

* commit 'ffc5ae0721dbf57031fdc3f6f52fe6de27b71d6c':

Change-Id: Ieff0c1a358cdf11b138f1c6647a0d2f985207d83
 2016-05-27 23:19:51 +00:00
Hemal Patel
cdc8eaca8b Merge "Revert "Finalize resource IDs for N."" into nyc-dev am: d63315e535 
am: b19774bd32

* commit 'b19774bd321059c698c8a30867eb56d86097e16c':

Change-Id: I1e301f4500b46a9135a048916f063f00989dd4a9
 2016-05-27 23:19:48 +00:00
Hang Yin
b8c227aeef Merge "Code Patch for camera preview switch tests" into nyc-dev am: 5c950a8078 
am: a23ed40af7

* commit 'a23ed40af75fee6292a08da2868d65311b64b485':
  Code Patch for camera preview switch tests

Change-Id: Id0685e3a24435ca92451501f76191f63a662c502
 2016-05-27 23:18:49 +00:00
Doris Liu
ea58b67592 Merge "Copy native tree\'s property when mutate vector drawable" into nyc-dev am: fceaa60e24 
am: 8fc70289b5

* commit '8fc70289b5cf8a0f93a4dd02cf9b61243b3cda3d':
  Copy native tree's property when mutate vector drawable

Change-Id: Ie6207d610a8780ba06ae4b3941a5ac401f0f35b1
 2016-05-27 23:18:48 +00:00
Adrian Roos
f0b8f05a76 Merge "Change app crash dialog strings" into nyc-dev am: a7d66aa6b8 
am: ca89f7b69f

* commit 'ca89f7b69f5a4737105ac28133f8af3ada57e46f':
  Change app crash dialog strings

Change-Id: Id0f6be68e14214fba8acfc34a46a30e176dc2378
 2016-05-27 23:18:46 +00:00
Adrian Roos
f9048f0d47 Merge "Simplify crash dialog" into nyc-dev am: 9764fea483 
am: 20962d345a

* commit '20962d345ac294ef2000576f23d672e7f0883069':
  Simplify crash dialog

Change-Id: Id16c690ecfae4837175d78404c85fa7ce8c82f32
 2016-05-27 23:18:44 +00:00
Adrian Roos
c67191508b Merge "Fix bad one-line MessagingStyle" into nyc-dev am: 5dbb9ff674 
am: d70126ec78

* commit 'd70126ec780a30d18e65b70c3dcc29f7253352e3':
  Fix bad one-line MessagingStyle

Change-Id: Iba2e4bb6be2dcb6e1800b8863046084a3540a0f2
 2016-05-27 23:18:42 +00:00
Adrian Roos
5cdc958240 Merge "Fix IME and NavBar overlap with Direct Reply" into nyc-dev am: 2c69d1ecae 
am: 85e60d203e

* commit '85e60d203e4ec8d1c1db9ff55cdc6057a48a7812':
  Fix IME and NavBar overlap with Direct Reply

Change-Id: I030e9b054ed62cb676223a1c1638e0da047002ed
 2016-05-27 23:16:43 +00:00
Hemal Patel
fc5427e983 Merge "Docs: Removed note in "Platform Versions" section" into mnc-io-docs am: 9dfa75ef43 am: 202017dcbf am: 8d8718fc53 
am: 2e63ef3cac

* commit '2e63ef3cac98f7062ed9b3c2b2d2436491acd0df':
  Docs: Changed GitHub samples link to point to "Google Samples" page on GitHub.

Change-Id: Ieebca04ad775d408896abf591723350ab67f23c7
 2016-05-27 23:16:40 +00:00
Hemal Patel
a76824e029 Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378 am: 7a62915c51 am: 2b9497069d 
am: 6501ac3bf9

* commit '6501ac3bf9cfd8d940d2c36ab2df72bda1cab52e':
  Docs: Removed note in "Platform Versions" section

Change-Id: Icfad7163cfd3beeab6704c033d9a4a92f893d4ed
 2016-05-27 23:16:38 +00:00
Hemal Patel
c84e814234 Merge "Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378 am: 7ff4ee303b" into nyc-dev am: d63315e535 
am: 3921ba2f61

* commit '3921ba2f614895538bf6c8dfdfad79c1e5d6a2af':
  Docs: Fixed the end-of-comment tag

Change-Id: I259fcb700f0841f92b76c8057a86c378afab74c0
 2016-05-27 23:16:34 +00:00
Akshay Thakker
904639a8f0 Merge "Revert "Finalize resource IDs for N."" into nyc-dev am: 82a8c5f246 
am: 7eb543ef2c

* commit '7eb543ef2c8ea8ce1307fd3839386b677e3013da':

Change-Id: Ie54ecaaa34938fbf84155e56f70ccc96f2ed6901
 2016-05-27 23:16:31 +00:00
Bart Sears
56e2b4a83e Merge "resolve merge conflicts of 82a8c5f to nyc-mr1-dev" into nyc-mr1-dev 
am: ffc8723d88

* commit 'ffc8723d883a09fdff5862ed01bde29c792c3c94':
  Revert "Finalize resource IDs for N."

Change-Id: Icaf17a36cf1fea5f95610fb055faf65d90021abe
 2016-05-27 23:14:57 +00:00
Hemal Patel
6396bf5e28 Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378 am: 7a62915c51 
am: 8d8718fc53

* commit '8d8718fc534325ff477036034eea058c179d1e04':
  Docs: Changed GitHub samples link to point to "Google Samples" page on GitHub.

Change-Id: I6328e016fa56e110832281a4c2e7b42cc673e3f8
 2016-05-27 23:12:18 +00:00
Hemal Patel
ffc5ae0721 Merge "Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378 am: 7ff4ee303b" into nyc-dev 
am: 2b9497069d

* commit '2b9497069dbabdd1f3fd6668c86922d52b9246fd':
  Docs: Removed note in "Platform Versions" section

Change-Id: Ib636c5df935f12b70092792796ae2a3cde995cd1
 2016-05-27 23:12:13 +00:00
Michael Wright
b19774bd32 Merge "Revert "Finalize resource IDs for N."" into nyc-dev 
am: d63315e535

* commit 'd63315e535e57eb949feb4238cc31832a76a6229':
  Docs: Fixed the end-of-comment tag

Change-Id: Icb8763a976ea1768f8dfb68875d87dcb0a53cca5
 2016-05-27 23:12:07 +00:00
Bart Sears
ffc8723d88 Merge "resolve merge conflicts of 82a8c5f to nyc-mr1-dev" into nyc-mr1-dev 2016-05-27 23:09:24 +00:00
Bart Sears
f87ee48da9 resolve merge conflicts of 82a8c5f to nyc-mr1-dev 
Change-Id: I7ba17e4b36997684d5f542900a81a03d28228a7a
 2016-05-27 16:02:22 -07:00
Makoto Onuki
451afea589 Merge "ShortcutManager: Implement get-drawable APIs" into nyc-mr1-dev 
am: 5b11a81f9f

* commit '5b11a81f9fed69b0b6e233bad4ba8636f47febf7':
  ShortcutManager: Implement get-drawable APIs

Change-Id: If0c3279fe7374382a2f7148435b009c02e7d7e88
 2016-05-27 22:52:43 +00:00
Makoto Onuki
5b11a81f9f Merge "ShortcutManager: Implement get-drawable APIs" into nyc-mr1-dev 2016-05-27 22:48:33 +00:00
Hang Yin
a23ed40af7 Merge "Code Patch for camera preview switch tests" into nyc-dev 
am: 5c950a8078

* commit '5c950a8078e37eb9057da4aa5b3355189b675291':
  Code Patch for camera preview switch tests

Change-Id: I90e4880c7ec7d41c7b4b402b66c6e25b0006eb64
 2016-05-27 22:40:26 +00:00
Hang Yin
5c950a8078 Merge "Code Patch for camera preview switch tests" into nyc-dev 2016-05-27 22:34:47 +00:00
Doris Liu
8fc70289b5 Merge "Copy native tree\'s property when mutate vector drawable" into nyc-dev 
am: fceaa60e24

* commit 'fceaa60e249575021e41b873673e12d9b4123fbe':
  Copy native tree's property when mutate vector drawable

Change-Id: I86969033da46b58268df0ea026749f992068bc2b
 2016-05-27 22:22:14 +00:00
Doris Liu
fceaa60e24 Merge "Copy native tree's property when mutate vector drawable" into nyc-dev 2016-05-27 22:17:00 +00:00
Adrian Roos
ca89f7b69f Merge "Change app crash dialog strings" into nyc-dev 
am: a7d66aa6b8

* commit 'a7d66aa6b86865b223bd3b0d906b9a0f95e7c3b5':
  Change app crash dialog strings

Change-Id: Ib8a6a2972671b1b60b02afcda9e8b93508b98c27
 2016-05-27 22:08:23 +00:00
Adrian Roos
20962d345a Merge "Simplify crash dialog" into nyc-dev 
am: 9764fea483

* commit '9764fea48350e9148b606f8e10686e298437e440':
  Simplify crash dialog

Change-Id: I99e6f68890067cc55422ef11686bd40a6185fd1a
 2016-05-27 22:08:15 +00:00
Adrian Roos
d70126ec78 Merge "Fix bad one-line MessagingStyle" into nyc-dev 
am: 5dbb9ff674

* commit '5dbb9ff67468979214542eb6a448711d2d614cdb':
  Fix bad one-line MessagingStyle

Change-Id: I3dd2c32f3fee1e61d63da8903ae468d9e8da19c0
 2016-05-27 22:08:06 +00:00
Adrian Roos
85e60d203e Merge "Fix IME and NavBar overlap with Direct Reply" into nyc-dev 
am: 2c69d1ecae

* commit '2c69d1ecae5efff06a29bec3d73f9654b8851972':
  Fix IME and NavBar overlap with Direct Reply

Change-Id: I6a3b377cc8604561927c416b18e46eee167233c8
 2016-05-27 22:07:56 +00:00
Adrian Roos
a7d66aa6b8 Merge "Change app crash dialog strings" into nyc-dev 2016-05-27 22:03:22 +00:00
Adrian Roos
9764fea483 Merge "Simplify crash dialog" into nyc-dev 2016-05-27 22:02:45 +00:00
Adrian Roos
5dbb9ff674 Merge "Fix bad one-line MessagingStyle" into nyc-dev 2016-05-27 22:02:38 +00:00
Adrian Roos
2c69d1ecae Merge "Fix IME and NavBar overlap with Direct Reply" into nyc-dev 2016-05-27 22:02:14 +00:00
Hang Yin
39aafafa9a Code Patch for camera preview switch tests 
This cl will fix the bug: b/28982885. It enables Raw10 Size Array
only when the device support Raw10.

Change-Id: I6a7a9d47708017f71c47fb5bbb15f3e98b555af4
 2016-05-27 14:56:14 -07:00
Hemal Patel
2e63ef3cac Merge "Docs: Removed note in "Platform Versions" section" into mnc-io-docs am: 9dfa75ef43 am: 202017dcbf 
am: 8d8718fc53

* commit '8d8718fc534325ff477036034eea058c179d1e04':
  Docs: Changed GitHub samples link to point to "Google Samples" page on GitHub.

Change-Id: Ic71122b66262a62a26c043d25f45120a46c4c5cd
 2016-05-27 21:48:39 +00:00
Hemal Patel
6501ac3bf9 Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378 am: 7a62915c51 
am: 2b9497069d

* commit '2b9497069dbabdd1f3fd6668c86922d52b9246fd':
  Docs: Removed note in "Platform Versions" section

Change-Id: I172d2d3ccef84e13dbd6167c60a91f938fae0102
 2016-05-27 21:48:36 +00:00
Hemal Patel
3921ba2f61 Merge "Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378 am: 7ff4ee303b" into nyc-dev 
am: d63315e535

* commit 'd63315e535e57eb949feb4238cc31832a76a6229':
  Docs: Fixed the end-of-comment tag

Change-Id: I463b3de64c12e0619677dd5d4ecd83c74f70528e
 2016-05-27 21:45:52 +00:00
Michael Wright
7eb543ef2c Merge "Revert "Finalize resource IDs for N."" into nyc-dev 
am: 82a8c5f246

* commit '82a8c5f24653baf98a77f050f14e7256e864cbf9':
  Revert "Finalize resource IDs for N."

Change-Id: I2b1f1ba907bc2348fc24de63cfc0c195f2d313fd
 2016-05-27 21:45:48 +00:00
Hemal Patel
8d8718fc53 Merge "Docs: Removed note in "Platform Versions" section" into mnc-io-docs am: 9dfa75ef43 
am: 202017dcbf

* commit '202017dcbf35e54f8aec6f98e5e8b6fe4231f8d5':
  Docs: Changed GitHub samples link to point to "Google Samples" page on GitHub.

Change-Id: I8181c5d1679be85be720fe16fd85561a883ab4ce
 2016-05-27 21:45:46 +00:00
Hemal Patel
2b9497069d Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378 
am: 7a62915c51

* commit '7a62915c51294fcbf491fbe0f0a406ac420e2d34':
  Docs: Removed note in "Platform Versions" section

Change-Id: I4da67d6b00c0e33f6eb99b06479bafb8049f1b8b
 2016-05-27 21:45:39 +00:00
Android Build Merger (Role)
d63315e535 Merge "Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378 am: 7ff4ee303b" into nyc-dev 2016-05-27 21:42:25 +00:00
Hemal Patel
5c1cd3ec6c Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378 
am: 7ff4ee303b

* commit '7ff4ee303bca5372a925453e043375a728eb8d1d':
  Docs: Fixed the end-of-comment tag

Change-Id: I79abb2406163de3928ec9bb473e18c31aa146efa
 2016-05-27 21:41:57 +00:00
Hemal Patel
202017dcbf Merge "Docs: Changed GitHub samples link to point to "Google Samples" page on GitHub." into mnc-io-docs 
am: 50f57d1d63

* commit '50f57d1d631eb08744609f9440c935b1e8e86992':
  Docs: Changed GitHub samples link to point to "Google Samples" page on GitHub.

Change-Id: I3c60c8a347283c4f107eef0e4efe3cabd9c8795e
 2016-05-27 21:41:48 +00:00
Hemal Patel
7a62915c51 Merge "Docs: Removed note in "Platform Versions" section" into mnc-io-docs 
am: 9dfa75ef43

* commit '9dfa75ef43782c596d55de582704566afc540d06':
  Docs: Removed note in "Platform Versions" section

Change-Id: Ie09047db04155b7f37aafdc3ac6a85e390d54143
 2016-05-27 21:41:43 +00:00
Akshay Thakker
82a8c5f246 Merge "Revert "Finalize resource IDs for N."" into nyc-dev 2016-05-27 21:41:26 +00:00
Android Build Merger (Role)
696bd0e388 Merge "Merge "Purge an app\'s scheduled jobs when the whole package is disabled" into nyc-dev am: bf932b0067 am: 447e93dffc" into nyc-mr1-dev-plus-aosp 2016-05-27 21:38:19 +00:00
Chris Tate
0a48c2c8d3 Merge "Purge an app\'s scheduled jobs when the whole package is disabled" into nyc-dev am: bf932b0067 
am: 447e93dffc

* commit '447e93dffca4b957ee8abfc1e22eaf7b000c8e65':
  Purge an app's scheduled jobs when the whole package is disabled

Change-Id: Ie8fd0296ad31c326145744a58a7db3d343930d5d
 2016-05-27 21:37:57 +00:00