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

121774 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
e33010a261 Merge "Add NO_ANIMATION flag to ActivityView Intents." into klp-modular-dev 2014-06-11 08:41:11 +00:00
Griff Hazen
9f637d1095 Reduce notification service historical archive size to 1 for watches. 
To remove the memory footprint

Bug: 15536759
Change-Id: I081bd962fef689b5d8ed126208499d56ebf4ae38
 2014-06-10 15:31:48 -07:00
Craig Mautner
e6d80f4ce4 Add NO_ANIMATION flag to ActivityView Intents. 
Add Intent.FLAG_ACTIVITY_NO_AMINATION to all Intents passed into
ActivityView.

Fixes bug 15393526.

Change-Id: I1899a5019416109e982f0254aaba410bb1f4a38d
 2014-06-10 13:31:02 -07:00
Robert Ly
748856f2d9 am a7ddd029: am 80e84e2d: am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore 
* commit 'a7ddd0292420c2e8869e093d8bdad5cdc1f199cc':
  Add documentation for AndroidKeyStore
 2014-06-10 02:49:18 +00:00
Robert Ly
a7ddd02924 am 80e84e2d: am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore 
* commit '80e84e2db92ba190c6c517dd4c71cd12c0adb249':
  Add documentation for AndroidKeyStore
 2014-06-10 02:44:08 +00:00
Robert Ly
80e84e2db9 am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore 
* commit 'f3cecfa2185ef5622992b21da8204b8b6590ef2d':
  Add documentation for AndroidKeyStore
 2014-06-10 02:39:28 +00:00
Robert Ly
f3cecfa218 am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore 
* commit '55d525b26b716351625798675afe69c6cf43cf5a':
  Add documentation for AndroidKeyStore
 2014-06-10 02:36:10 +00:00
Robert Ly
55d525b26b am 716cc7dc: Add documentation for AndroidKeyStore 
* commit '716cc7dcac1bb9279326ab92a78a246b3a70de4e':
  Add documentation for AndroidKeyStore
 2014-06-10 02:32:29 +00:00
Justin Koh
42c53fd646 Merge "Catch OperationUnsupportedException when linkifying using WebView" into klp-modular-dev 2014-06-10 01:05:05 +00:00
Aaron Whyte
83955cb260 Catch OperationUnsupportedException when linkifying using WebView 
This fixes a CTS test for Wearable. We cannot check for FEATURE_WEBVIEW, because
there's no way to get a PackageManager from within these static methods.
Bug: 15131296

Change-Id: I7bf7564b6209f330a413ed54a94be1e07fedb30d
 2014-06-09 17:59:03 -07:00
Justin Koh
b7c39cee9e Remove WebIconDatabase calls from android.provider.Browser 
This class has been deprecated, so no need to call it.

Bug: 15088030
Change-Id: I6092a9d5f7a12cc14def0996efff7cb689935acb
 2014-06-09 17:50:34 -07:00
Amit Mahajan
3f175a3587 am e5a28d34: am 20c5ce50: Handle provisioning APN by turning off/on radio. 
* commit 'e5a28d34f662c469f85590dda28fc02eca12204b':
  Handle provisioning APN by turning off/on radio.
 2014-06-09 19:50:09 +00:00
Amit Mahajan
e5a28d34f6 am 20c5ce50: Handle provisioning APN by turning off/on radio. 
* commit '20c5ce50c456742bf912ebb915be45bfdb51487d':
  Handle provisioning APN by turning off/on radio.
 2014-06-09 19:46:01 +00:00
Justin Koh
eba8782a1f Add NPE check to getSystemWindowInsets 
Bug: 15452706
Change-Id: Ica83593eadd0155e1370dba268a9f15ad0affa7d
 2014-06-09 11:31:53 -07:00
Justin Koh
a5de8479f4 Merge "Fix Browser when running on a platform without webview" into klp-modular-dev 2014-06-09 18:29:39 +00:00
Justin Koh
b4be02088f Fix Browser when running on a platform without webview 
Fix Browser: can't access the WebIconDatabase. Added build version checks so
that the icon database isn't used on devices <= KITKAT: the entire class is
deprecated as of JB MR2 anyway, according to the comments.
Bug: 15088030

Change-Id: I4403b1a429c08abb288f5ee3bae7eb2e23303916
 2014-06-09 11:28:53 -07:00
Amit Mahajan
20c5ce50c4 Handle provisioning APN by turning off/on radio. 
The change is specific to AT&T as they want no signaling from device during provisioning.
I've tested following cases:
- expired AT&T SIM to make sure provisioning flow works as expected.
- airplane mode on/off with both active and expired AT&T SIM.
- wifi <-> mobile transitions work okay.
- LTE with Verizon SIM (basic sanity).

bug: 13190133

Change-Id: I215963174ae6000ae71d1dda693f95413f3d6e81
 2014-06-09 17:55:27 +00:00
Robert Ly
e70609c87e am 5cb18054: am e115755d: Merge "remove erroneous file" into klp-docs 
* commit '5cb180541332d652ed661559dfaa55a0fcc3751b':
  remove erroneous file
 2014-06-09 16:54:45 +00:00
Robert Ly
5cb1805413 am e115755d: Merge "remove erroneous file" into klp-docs 
* commit 'e115755d0fbd067a1996eb448cda58a14cce22d1':
  remove erroneous file
 2014-06-08 08:35:23 +00:00
Robert Ly
e115755d0f Merge "remove erroneous file" into klp-docs 2014-06-08 05:39:55 +00:00
Robert Ly
6ee94e5388 remove erroneous file 
Change-Id: Idb46777d80ee1b6286769fdceba7639877ab2388
 2014-06-07 22:38:18 -07:00
Adam Lesinski
4d9fcae202 Merge "Allow for a NoOp implementation of DrmManagerClientImpl" into klp-modular-dev 2014-06-06 21:13:16 +00:00
Michael Kolb
4bdc93d63e Merge "Remove circular mask" into klp-modular-dev 2014-06-06 15:26:17 +00:00
Vinod Krishnan
90e96db0b5 Merge "Adding a way to stub Vpn ConfirmDialog" into klp-modular-dev 2014-06-05 23:03:49 +00:00
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
Vinod Krishnan
b0e5bbb657 Adding a way to stub Vpn ConfirmDialog 
- This is needed to pass CTS tests on the wear devices
- Related CL: http://ar/479486

Bug: 15087985

Change-Id: I56673ff6085618a03ec61031e3af0f6631cb3425
 2014-06-05 15:28:50 -07: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
Michael Kolb
2e8b27e898 Remove circular mask 
Change-Id: I83b1caea100d28be2fca46dc0280b05e9b78da44
 2014-06-05 12:49:55 -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
Adam Lesinski
510ef1b537 Allow for a NoOp implementation of DrmManagerClientImpl 
Change-Id: I150b95790d5e6d3c0160637149f18f2194318de8
 2014-06-04 15:05:56 -07: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