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

257144 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Chris Tate
b12e4e421f Merge "Purge an app\'s scheduled jobs when the whole package is disabled" into nyc-dev am: bf932b0067 
am: 64613753d6

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

Change-Id: I7557a5377b127b447af5b24ec36caf33ee926b28
 2016-05-27 21:37:53 +00:00
Hemal Patel
7ff4ee303b Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs 
am: d09caa1378

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

Change-Id: I27a07c1d00f840b34683cfb333b8b338ffe60dd3
 2016-05-27 21:37:15 +00:00
Android Build Merger (Role)
ffac575150 Merge "Merge "NotificationStackScroller: Fix scrollTo for notification groups" into nyc-dev am: e88f60b8bb am: 7aaf3aea00" into nyc-mr1-dev-plus-aosp 2016-05-27 21:34:11 +00:00
Android Build Merger (Role)
e6446f90d1 Merge "Merge "Notification: Fix bug with sliding action list" into nyc-dev am: 06fe24341c am: 389c4e67e9" into nyc-mr1-dev-plus-aosp 2016-05-27 21:34:01 +00:00
Android Build Merger (Role)
f6753c8e7d Merge "Merge "AlarmManagerService: remove legacy /dev/alarm support" am: 1f336bb051 am: 2c4b276df4 am: cac03c5cdf" into nyc-mr1-dev-plus-aosp 2016-05-27 21:33:50 +00:00
Adrian Roos
3e00cae14e Merge "NotificationStackScroller: Fix scrollTo for notification groups" into nyc-dev am: e88f60b8bb 
am: 7aaf3aea00

* commit '7aaf3aea00fec45dc298369099643150a33f71d4':
  NotificationStackScroller: Fix scrollTo for notification groups

Change-Id: I7b3db6fb59bb5084c8016f4a3cd62cafecaec6c3
 2016-05-27 21:33:16 +00:00
Adrian Roos
1ad9fa08fe Merge "Notification: Fix bug with sliding action list" into nyc-dev am: 06fe24341c 
am: 389c4e67e9

* commit '389c4e67e950899547a83ed73c3c26053bc8e8cb':
  Notification: Fix bug with sliding action list

Change-Id: I1f88be59b92aa86b9a130b21cc3ebce4afd670b7
 2016-05-27 21:33:05 +00:00
Christopher Tate
447e93dffc Merge "Purge an app\'s scheduled jobs when the whole package is disabled" into nyc-dev 
am: bf932b0067

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

Change-Id: Id2964531b7332369a30fabfaf2c9cf9167737c6b
 2016-05-27 21:33:04 +00:00
Greg Hackmann
be120aad74 Merge "AlarmManagerService: remove legacy /dev/alarm support" am: 1f336bb051 am: 2c4b276df4 
am: cac03c5cdf

* commit 'cac03c5cdfee5cb02b93654b6629c4d18018b5f6':
  AlarmManagerService: remove legacy /dev/alarm support

Change-Id: I5e2e81d2907cfb977d355683c015896259bb6c07
 2016-05-27 21:32:55 +00:00
Christopher Tate
64613753d6 Merge "Purge an app\'s scheduled jobs when the whole package is disabled" into nyc-dev 
am: bf932b0067

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

Change-Id: I2bcd03235f2a804d5784c78992276c9e055dcede
 2016-05-27 21:32:49 +00:00
Hemal Patel
50f57d1d63 Merge "Docs: Changed GitHub samples link to point to "Google Samples" page on GitHub." into mnc-io-docs 2016-05-27 21:32:25 +00:00
Hemal Patel
9dfa75ef43 Merge "Docs: Removed note in "Platform Versions" section" into mnc-io-docs 2016-05-27 21:32:05 +00:00
Hemal Patel
d09caa1378 Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs 2016-05-27 21:31:24 +00:00
Adrian Roos
d08158782c Merge "NotificationStackScroller: Fix scrollTo for notification groups" into nyc-dev am: e88f60b8bb 
am: f563836a85

* commit 'f563836a85f69a7abb7b8befe42c488dcb77ea57':
  NotificationStackScroller: Fix scrollTo for notification groups

Change-Id: I08faeaf768bda8698224045d871b7f82aa31e22b
 2016-05-27 21:31:01 +00:00
Adrian Roos
93276bd754 Merge "Notification: Fix bug with sliding action list" into nyc-dev am: 06fe24341c 
am: b35bd449a7

* commit 'b35bd449a709b1ccef0d70e3f804f938cee77c89':
  Notification: Fix bug with sliding action list

Change-Id: Ibbce96ec8af7a6e20689e45e02fb66516c1a1064
 2016-05-27 21:30:55 +00:00
Adrian Roos
7aaf3aea00 Merge "NotificationStackScroller: Fix scrollTo for notification groups" into nyc-dev 
am: e88f60b8bb

* commit 'e88f60b8bba7aeb6aa42f3baa78fa9a1e1767373':
  NotificationStackScroller: Fix scrollTo for notification groups

Change-Id: I27794ef734161405862eac2446b51ae81145c8a2
 2016-05-27 21:27:34 +00:00
Adrian Roos
f563836a85 Merge "NotificationStackScroller: Fix scrollTo for notification groups" into nyc-dev 
am: e88f60b8bb

* commit 'e88f60b8bba7aeb6aa42f3baa78fa9a1e1767373':
  NotificationStackScroller: Fix scrollTo for notification groups

Change-Id: I743a924db07d37fca9c63c2bb47d8eb03b500790
 2016-05-27 21:27:33 +00:00
Adrian Roos
b35bd449a7 Merge "Notification: Fix bug with sliding action list" into nyc-dev 
am: 06fe24341c

* commit '06fe24341cd07cee044527cab61345355802fa54':
  Notification: Fix bug with sliding action list

Change-Id: I40870263f8b3d25bbd7f353259fde14ae0cf63c0
 2016-05-27 21:27:32 +00:00
Adrian Roos
389c4e67e9 Merge "Notification: Fix bug with sliding action list" into nyc-dev 
am: 06fe24341c

* commit '06fe24341cd07cee044527cab61345355802fa54':
  Notification: Fix bug with sliding action list

Change-Id: Ib59010775d30fff796fc03ee9ed1881f3be0849e
 2016-05-27 21:27:31 +00:00
Chris Tate
bf932b0067 Merge "Purge an app's scheduled jobs when the whole package is disabled" into nyc-dev 2016-05-27 21:26:17 +00:00
Greg Hackmann
cac03c5cdf Merge "AlarmManagerService: remove legacy /dev/alarm support" am: 1f336bb051 
am: 2c4b276df4

* commit '2c4b276df4ea5655d41b8e239ca44ef6559e485d':
  AlarmManagerService: remove legacy /dev/alarm support

Change-Id: I4cb2036c9a06adaaf9b93bc35821106dc2144c67
 2016-05-27 21:25:54 +00:00
Android Build Merger (Role)
8f65100c07 Merge "Fix weirdness when home task forces rotation am: a6c05d5151 am: 1f1d754440" into nyc-mr1-dev-plus-aosp 2016-05-27 21:23:15 +00:00
Android Build Merger (Role)
00f5ffb929 Merge "Merge "Close IME when attaching dock stack" into nyc-dev am: c5fc6c602c am: 26dea2d518" into nyc-mr1-dev-plus-aosp 2016-05-27 21:23:01 +00:00
Android Build Merger (Role)
0316a937ce Merge "Merge "Revert commits related to wallpaper cropping" into nyc-dev am: 0b56cc2804 am: 78b9d20449" into nyc-mr1-dev-plus-aosp 2016-05-27 21:22:46 +00:00
Jorim Jaggi
af31954561 Fix weirdness when home task forces rotation am: a6c05d5151 
am: 1f1d754440

* commit '1f1d754440f075ec9e5b1708331e8ae4ed6044b1':
  Fix weirdness when home task forces rotation

Change-Id: Ib3bb20217b35e47a6d133db76ebfb3ab739890b4
 2016-05-27 21:22:16 +00:00
Jorim Jaggi
8faa43e50d Merge "Close IME when attaching dock stack" into nyc-dev am: c5fc6c602c 
am: 26dea2d518

* commit '26dea2d518dcce38eee8e4fb639d4f78baf94e8b':
  Close IME when attaching dock stack

Change-Id: I9bee0140f830548712e33e5c7774eebd8d95de71
 2016-05-27 21:22:13 +00:00
Chong Zhang
9db345cd3d Merge "Revert commits related to wallpaper cropping" into nyc-dev am: 0b56cc2804 
am: 78b9d20449

* commit '78b9d204493f4620e12b4bcd2e1ff9b19c794e9c':
  Revert commits related to wallpaper cropping

Change-Id: I4dfe9f34790c02f4d7a8bcd8bd7feb1155e70159
 2016-05-27 21:22:11 +00:00
Jorim Jaggi
9e5ec8eefe Fix weirdness when home task forces rotation am: a6c05d5151 
am: ca0e846528

* commit 'ca0e846528807fb01b21e7c241953bb3b18987c5':
  Fix weirdness when home task forces rotation

Change-Id: I759b533737dd1d400e7aa120d3184919d1082ef9
 2016-05-27 21:21:04 +00:00