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

121746 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Prashant Malani
42db3761c9 Merge "DO NOT MERGE Change display state modification during dozing" into klp-modular-dev 2014-06-05 23:03:19 +00:00
Prashant Malani
448a4e59ad DO NOT MERGE Change display state modification during dozing 
Check that the BrightnessRamp animation has completed before updating
the display state to STATE_DOZING.

Bug: 13472578
Change-Id: Ib9751f7a987463e4df98571e846d829ec8e73b5e
Signed-off-by: Prashant Malani <pmalani@google.com>
 2014-06-05 22:25:23 +00:00
Justin Koh
89b6bf5a11 DO NOT MERGE Readd removal of notification listener limit on posting 
Listener packages are allowed to post > 50 notifications

This reverts commit 500a6b0ca68aaad6140b5af2dae94349be9f7aeb.
 2014-06-05 13:50:58 -07:00
Justin Koh
8200b667ea Merge "Revert "Add check to allow notification listener packages to post >50 notifications"" into klp-modular-dev 2014-06-05 19:03:33 +00:00
Justin Koh
500a6b0ca6 Revert "Add check to allow notification listener packages to post >50 notifications" 
Broke build.

This reverts commit 2dbd36fc7f9341ecef51c2ed96a0f21b046f5a8d.

Change-Id: I2fdf1de21b6598f85bbd94acef44e771b2df9f42
 2014-06-05 19:02:47 +00:00
Justin Koh
2be3d6f936 Merge "Add check to allow notification listener packages to post >50 notifications" into klp-modular-dev 2014-06-05 18:06:46 +00:00
Hui Lu
61c0f54733 Merge "Add interface name for proxy network type." into klp-modular-dev 2014-06-05 17:36:02 +00:00
Hui Lu
c80fa71e88 Add interface name for proxy network type. 
This will make test
android.net.cts.ConnectivityManagerTest#testRequestRouteToHost pass.
Change-Id: I5a14b6d705e87018e1e2c031aaacee533536a50b

Bug: 15320910
 2014-06-05 17:06:13 +00:00
Justin Koh
2dbd36fc7f Add check to allow notification listener packages to post >50 notifications 
Bug: 13433398
Change-Id: I77abf19982add240e1bbe8196fbe148d32884f68
 2014-06-04 21:14:26 -07:00
Craig Mautner
e34fcf8ff9 Merge "Add callback when ActivityView activities complete" into klp-modular-dev 2014-06-05 03:28:21 +00:00
Craig Mautner
d94b47f3b6 Add callback when ActivityView activities complete 
Users of ActivityViews can now be informed when there are no more
active activities in ActivityView by registering a callback.

Fixes bug 15330616.

Change-Id: I39d55bdb0db8b0a12ee751cdcb039b7fbb899c85
 2014-06-04 17:25:49 -07:00
Dave Holmes
b766edcea3 am 4e99af34: am aabfcb78: Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I\'d like to include a link to 
* commit '4e99af342b340bebcd635137966d21c59c294532':
  Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation.
 2014-06-04 23:41:49 +00:00
Dave Holmes
4e99af342b am aabfcb78: Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I\'d like to include a link to the Building 
* commit 'aabfcb78cf29e3d670831c770b9d757eb79487e4':
  Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation.
 2014-06-04 23:38:34 +00:00
Dave Holmes
aabfcb78cf Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation." into klp-docs 2014-06-04 23:35:50 +00:00
Deepanshu Gupta
905e113f97 am 03df93bc: am 5cde33a6: am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit '03df93bcb854eedc600ef0120fd238ec974c44a1':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:48:19 +00:00
Deepanshu Gupta
03df93bcb8 am 5cde33a6: am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit '5cde33a6ffd6a3be87f6622e67c3d83fb61519cb':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:45:02 +00:00
Deepanshu Gupta
5cde33a6ff am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit 'dcfba78fbb4dad6792113383b2d32eff7f2c1f88':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:41:47 +00:00
Deepanshu Gupta
dcfba78fbb am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit 'ed5ab0f01eac6686165f67fe0e9dec3bb48bbb4b':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:38:25 +00:00
Deepanshu Gupta
ed5ab0f01e am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit '022d8a9f4400dc7ec2926b133fc7151d8a5c24a3':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:34:14 +00:00
Deepanshu Gupta
022d8a9f44 am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit 'bad112f23f09f8839b4b7294439b0fe725cc2034':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:30:05 +00:00
Deepanshu Gupta
46c3beefad am 3ce1ca68: am 0ed9d498: am 328b1f92: (-s ours) am 5d3e3851: am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '3ce1ca68309231e693964824917a66f36e575fd7':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:29:11 +00:00
Deepanshu Gupta
1410489677 am e4aa3138: am a9e82914: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev 
* commit 'e4aa31382139ee2e319110fbfff402e0c6315952':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:29:06 +00:00
Deepanshu Gupta
4da5807ce0 am 88c9ca28: am d49f9b25: am 2983ee55: (-s ours) am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev 
* commit '88c9ca28effb9745d13647bd25d34b6ef53e7cb9':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:29:03 +00:00
Deepanshu Gupta
bad112f23f am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit 'c8235b8e7446c849df10ff2f897d2a3743b4934d':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:27:49 +00:00
Deepanshu Gupta
3ce1ca6830 am 0ed9d498: am 328b1f92: (-s ours) am 5d3e3851: am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '0ed9d498b740273fdbcdf51f55648c23df29accc':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:26:07 +00:00
Deepanshu Gupta
e4aa313821 am a9e82914: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev 
* commit 'a9e8291409a916186cd96b8bc557a6ac83d6b1ae':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:25:57 +00:00
Deepanshu Gupta
88c9ca28ef am d49f9b25: am 2983ee55: (-s ours) am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'd49f9b25310ac63310b0e5c7aeedca1d9e6ccda0':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:25:54 +00:00
Deepanshu Gupta
c8235b8e74 am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit 'ffcad247d0401fb529441ecc65437226c2845461':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:21:00 +00:00
Deepanshu Gupta
0ed9d498b7 am 328b1f92: (-s ours) am 5d3e3851: am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '328b1f92787bb4d793398ba6d8aa9b2025c62ca1':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:20:52 +00:00
Deepanshu Gupta
a9e8291409 Merge branch 'klp-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev 2014-06-04 20:20:51 +00:00
Deepanshu Gupta
d49f9b2531 am 2983ee55: (-s ours) am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev 
* commit '2983ee55a6d578b15b4862c9c8523bf00f7d83d5':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:20:27 +00:00
Deepanshu Gupta
ab6c61b2dd Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into klp-dev 2014-06-04 20:20:26 +00:00
Deepanshu Gupta
ffcad247d0 am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit '904b89c58465b0d0822478be514572ec752df3e8':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:17:40 +00:00
Deepanshu Gupta
328b1f9278 am 5d3e3851: am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '5d3e3851bbe1ab0b30e593b371e98f02f5ed2f5d':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:15:37 +00:00
Deepanshu Gupta
2983ee55a6 am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev 
* commit '12b657d74961ba5a6175162b7548cce4e77c9bbc':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:15:33 +00:00
Deepanshu Gupta
904b89c584 am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit '295184bc71a32a4e9418d34b2adeb0cef4b39781':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:14:52 +00:00
Deepanshu Gupta
5d3e3851bb am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'af3f96e4349f63f862de004853ba8e10e5ee51ae':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:11:23 +00:00
Deepanshu Gupta
12b657d749 am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'dade24b491c82ff0b96d025c908e7eaf1bab99ba':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:11:19 +00:00
Deepanshu Gupta
295184bc71 am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit '8782a12005e90bbd49be579fb8ede3a42a007380':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:10:55 +00:00
Deepanshu Gupta
af3f96e434 am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'e87c63e0e41cf34ef4b1ea1b06bf6a94c1f229c6':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:08:29 +00:00
Deepanshu Gupta
dade24b491 Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev 2014-06-04 20:07:44 +00:00
Deepanshu Gupta
e87c63e0e4 am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'd2dff39b587bd073fcf5c97753c8a29e16f4ef57':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 19:43:09 +00:00
Deepanshu Gupta
8782a12005 resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
Change-Id: I079d5db0d69fd1972e6754cdd1829dfd1645202d
 2014-06-04 12:43:01 -07:00
Deepanshu Gupta
d2dff39b58 am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'b1ca2a0c7fda713f5f2ebe928706dd813d87cabb':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 19:38:01 +00:00
Deepanshu Gupta
b1ca2a0c7f am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'f52fcc70541224c2d926f59461bde5a8bd6545a7':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 19:34:15 +00:00
Deepanshu Gupta
61fb578432 am 3ff08eb6: Distinguish between menus in ActionBar and popup. [DO NOT MERGE] 
* commit '3ff08eb6bf68868d4f4e872fbbf1ecaf521934a9':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 19:32:05 +00:00
Deepanshu Gupta
f52fcc7054 Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 2014-06-04 19:31:31 +00:00
Andrew Solovay
c2086e09df am 15ceb87a: am 2e10cc90: Merge "docs: Fixed error in code sample." into klp-docs 
* commit '15ceb87a07d9ad1fba4265112492e34c5cc360f5':
  docs: Fixed error in code sample.
 2014-06-04 17:40:03 +00:00
Andrew Solovay
15ceb87a07 am 2e10cc90: Merge "docs: Fixed error in code sample." into klp-docs 
* commit '2e10cc9021b1cd3d90c55038191872f29a02c3f2':
  docs: Fixed error in code sample.
 2014-06-04 17:35:45 +00:00
Andrew Solovay
2e10cc9021 Merge "docs: Fixed error in code sample." into klp-docs 2014-06-04 17:32:46 +00:00